EOFCREATE and RETURNCONTRACT implementation by gumb0 · Pull Request #553 · ipsilon/evmone

gumb0 · 2023-02-06T14:51:01Z

TODO:

Validate CREATE3 to not allow it with truncated containers (currently implemented as run-time check, but should be done at validation, but requires parsing subcontainers before CREATE3 validation)
Fix some commented out tests
~~[ ] Optimization to replace validation recursion with iteration~~ created separate issue EOF: Nested container validation without recursion #794
More transition tests and unit tests
Merge EVMC changes
Update state tests

lib/evmone/eof.cpp

lib/evmone/instructions.hpp

axic · 2023-02-06T17:22:12Z

lib/evmone/instructions_traits.hpp

    table[EVMC_CANCUN][OP_DUPN] = 3;
    table[EVMC_CANCUN][OP_SWAPN] = 3;
+    table[EVMC_CANCUN][OP_CREATE3] = 32000;
+    table[EVMC_CANCUN][OP_RETURNCONTRACT] = 0;


To think about this: probably neither of these prices are good?

codecov · 2023-02-16T15:39:21Z

Codecov Report

Attention: Patch coverage is 98.82729% with 11 lines in your changes are missing coverage. Please review.

Project coverage is 98.25%. Comparing base (24a3214) to head (6e697e7).

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #553      +/-   ##
==========================================
+ Coverage   98.17%   98.25%   +0.08%     
==========================================
  Files         129      129              
  Lines       13767    14644     +877     
==========================================
+ Hits        13516    14389     +873     
- Misses        251      255       +4

Flag	Coverage Δ
statetests	`29.35% <7.70%> (-1.70%)`	⬇️
statetests-silkpre	`19.86% <3.61%> (-1.22%)`	⬇️
unittests	`93.79% <98.82%> (+0.36%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files	Coverage Δ
lib/evmone/advanced_instructions.cpp	`100.00% <ø> (ø)`
lib/evmone/baseline.cpp	`100.00% <100.00%> (ø)`
lib/evmone/baseline_instruction_table.cpp	`100.00% <ø> (ø)`
lib/evmone/eof.hpp	`100.00% <100.00%> (ø)`
lib/evmone/execution_state.hpp	`96.22% <ø> (ø)`
lib/evmone/instructions.hpp	`100.00% <100.00%> (ø)`
test/state/host.cpp	`98.14% <100.00%> (+1.36%)`	⬆️
test/state/host.hpp	`100.00% <ø> (ø)`
test/state/state.cpp	`100.00% <100.00%> (ø)`
test/unittests/eof_validation.cpp	`94.28% <100.00%> (+0.34%)`	⬆️
... and 8 more

gumb0 · 2023-06-23T14:25:48Z

lib/evmone/instructions.hpp

+    const auto& offset = stack[0];
+    const auto& size = stack[1];
+
+    if (state.msg->kind != EVMC_CREATE3)


In case we end up allowing EOF creation transactions with empty to (as opposed to relying only on transaction to Creator Contract), this will have to be adjusted to allow RETURNCONTRACT in the context of creation transaction.

lib/evmone/instructions_calls.cpp

pdobacz · 2023-10-26T09:07:44Z

[ ] Fix some commented out tests

They have been fixed and uncommented in eof-create4 (I think all of them relied on CREATE4), can tick that one off.

gumb0 · 2023-12-04T15:48:44Z

Rebased.

gumb0 · 2023-12-19T11:43:08Z

Rebased and reworked subcontainers and truncated data support in bytecode.hpp

gumb0 · 2024-01-15T12:02:03Z

Rebased and squashed.

gumb0 · 2024-01-16T11:21:49Z

test/unittests/state_transition_eof_test.cpp

Moved to eof_create4 branch

lib/evmone/eof.cpp

pdobacz

Very nice, I appreciate the very thorough testing. Just a few nitpicks left, but pls someone else review and give a stamp too.

Late thought: do we have a test that a CREATE3-RETURNCONTRACT-ed contract can be successfully called, for example DATALOAD ing from the dynamic aux data part. To ensure that the deployment process doesn't garble the EOF container in any way.

pdobacz · 2024-02-07T10:42:21Z

lib/evmone/eof.hpp


+    /// Size of the data section.
+    /// In case of deploy container it is the minimal data size of the container that will be
+    /// deployed, taking into account part of data appended at deploy-time (aux_data). In this case


Suggested change

/// deployed, taking into account part of data appended at deploy-time (aux_data). In this case

/// deployed, taking into account part of data appended at deploy-time (static_aux_data). In this case

pdobacz · 2024-02-07T11:04:36Z

test/unittests/evm_eof_test.cpp

+    EXPECT_STATUS(EVMC_UNDEFINED_INSTRUCTION);
+}
+
+TEST_P(evm, returncontract_not_int_initcode)


Suggested change

TEST_P(evm, returncontract_not_int_initcode)

TEST_P(evm, returncontract_not_in_initcode)

pdobacz · 2024-02-07T11:09:08Z

test/unittests/state_tx_test.cpp

+    EXPECT_EQ(std::get<std::error_code>(validate_transaction(acc, bi, tx, EVMC_PRAGUE, 60000,
+                                            BlockInfo::MAX_BLOB_GAS_PER_BLOCK))
+                  .message(),
+        "EOF in creation transaction");


Suggested change

"EOF in creation transaction");

"EOF initcode in creation transaction");

to be more specific? Can also be "in creation transaction data"

gumb0 · 2024-02-27T15:19:34Z

Late thought: do we have a test that a CREATE3-RETURNCONTRACT-ed contract can be successfully called, for example DATALOAD ing from the dynamic aux data part. To ensure that the deployment process doesn't garble the EOF container in any way.

Added such test.

gumb0 · 2024-03-04T14:19:59Z

Renamed CREATE3 to EOFCREATE.

gumb0 · 2024-03-27T15:01:40Z

Not sure yet what happened to the coverage now, it was almost everything covered some time ago 😞

gumb0 · 2024-03-27T15:43:40Z

Not sure yet what happened to the coverage now, it was almost everything covered some time ago 😞

Seems to be beacause blockchain-tests job is segfaulting.

gumb0 · 2024-04-12T13:48:33Z

Rebased.

Co-authored-by: pdobacz <5735525+pdobacz@users.noreply.github.com>

Also support EOFCREATE and EOF with containers in bytecode helper. Co-authored-by: pdobacz <5735525+pdobacz@users.noreply.github.com>

…tions

gumb0 force-pushed the eof-create3 branch 2 times, most recently from 1e9a68a to 17dd8f8 Compare February 6, 2023 14:52

gumb0 changed the base branch from master to eof February 6, 2023 14:52

gumb0 force-pushed the eof-create3 branch 6 times, most recently from e5b5a78 to 8b25057 Compare February 6, 2023 15:41

axic reviewed Feb 6, 2023

View reviewed changes

lib/evmone/eof.cpp Outdated Show resolved Hide resolved

axic reviewed Feb 6, 2023

View reviewed changes

lib/evmone/instructions.hpp Outdated Show resolved Hide resolved

axic reviewed Feb 6, 2023

View reviewed changes

lib/evmone/instructions.hpp Outdated Show resolved Hide resolved

axic reviewed Feb 6, 2023

View reviewed changes

gumb0 force-pushed the eof-create3 branch 4 times, most recently from 82013aa to f8f095b Compare February 8, 2023 11:13

rodiazet force-pushed the eof branch 2 times, most recently from 219821b to 3987c3d Compare February 13, 2023 14:33

gumb0 force-pushed the eof-create3 branch 8 times, most recently from 860b84f to b4b4aa0 Compare February 15, 2023 18:31

axic force-pushed the eof branch 2 times, most recently from 91b770f to ef94b4e Compare February 17, 2023 17:37

gumb0 commented Jun 23, 2023

View reviewed changes

gumb0 commented Sep 11, 2023

View reviewed changes

lib/evmone/instructions_calls.cpp Show resolved Hide resolved

gumb0 mentioned this pull request Dec 4, 2023

EOF: CREATE3 with alternative header format (CONTAINER_TYPES section) #723

Closed

4 tasks

gumb0 commented Jan 16, 2024

View reviewed changes

test/unittests/state_transition_eof_test.cpp Outdated

Copy link
Copy Markdown

Member Author

gumb0 Jan 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to eof_create4 branch

hugo-dc reviewed Feb 1, 2024

View reviewed changes

lib/evmone/eof.cpp Show resolved Hide resolved

pdobacz approved these changes Feb 7, 2024

View reviewed changes

gumb0 mentioned this pull request Feb 27, 2024

Disable EOF↔Legacy cross-creation #825

Merged

gumb0 mentioned this pull request Mar 14, 2024

EOF: TXCREATE instruction #702

Merged

pdobacz mentioned this pull request Mar 21, 2024

Add EOF examples in tests #844

Merged

pdobacz approved these changes Apr 15, 2024

View reviewed changes

gumb0 and others added 11 commits April 16, 2024 10:40

EOFCREATE and RETURNCONTRACT implementations

be6cb06

Co-authored-by: pdobacz <5735525+pdobacz@users.noreply.github.com>

Forbid RETURN and STOP in EOFCREATE context

254a982

Allow deploying EOF code from EOFCREATE

46f04a9

Add tests for embedded container validation and for EOFCREATE execution

2b192ef

Also support EOFCREATE and EOF with containers in bytecode helper. Co-authored-by: pdobacz <5735525+pdobacz@users.noreply.github.com>

Add EOFCREATE state transition tests

1d824ed

Add EOFCREATE and RETURNCONTRACT instruction validation tests

1ff843f

Add embedded container tests for read_valid_eof1_header()

e42590b

Add test with calling a EOFCREATE-deployed contract and DATA* instruc…

b0528d6

…tions

Update state tests

65437b6

Increase stack allowance

2656062

Add test for initcode-mode non-transitiveness

6e697e7

	/// deployed, taking into account part of data appended at deploy-time (aux_data). In this case
	/// deployed, taking into account part of data appended at deploy-time (static_aux_data). In this case

	TEST_P(evm, returncontract_not_int_initcode)
	TEST_P(evm, returncontract_not_in_initcode)

	"EOF in creation transaction");
	"EOF initcode in creation transaction");

Conversation

gumb0 commented Feb 6, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

axic Feb 6, 2023

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Feb 16, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

gumb0 Jun 23, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

pdobacz commented Oct 26, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gumb0 commented Dec 4, 2023

Uh oh!

gumb0 commented Dec 19, 2023

Uh oh!

gumb0 commented Jan 15, 2024

Uh oh!

gumb0 Jan 16, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

pdobacz left a comment

Choose a reason for hiding this comment

Uh oh!

pdobacz Feb 7, 2024

Choose a reason for hiding this comment

Uh oh!

pdobacz Feb 7, 2024

Choose a reason for hiding this comment

Uh oh!

pdobacz Feb 7, 2024

Choose a reason for hiding this comment

Uh oh!

gumb0 commented Feb 27, 2024

Uh oh!

gumb0 commented Mar 4, 2024

Uh oh!

gumb0 commented Mar 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gumb0 commented Mar 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gumb0 commented Apr 12, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

gumb0 commented Feb 6, 2023 •

edited

Loading

codecov bot commented Feb 16, 2023 •

edited

Loading

pdobacz commented Oct 26, 2023 •

edited

Loading

gumb0 commented Mar 27, 2024 •

edited

Loading

gumb0 commented Mar 27, 2024 •

edited

Loading