new(tests): EIP-7620/7873 - ensure no account gets created on failure (ethereum#1486)

* new(tests): EIP-7620/7873 - ensure no account gets created on failure

* fix(tests): EIP-7873 - remove redundant 1559-izing of txs

* Apply code review suggestions

Author: pdobacz

tests/osaka/eip7692_eof_v1/eip7620_eof_create/test_eofcreate_failures.py

@@ -23,6 +23,7 @@
     slot_call_result,
     slot_code_should_fail,
     slot_code_worked,
+    slot_counter,
     slot_create_address,
     slot_max_depth,
     slot_returndata,
@@ -87,7 +88,8 @@ def test_initcode_revert(state_test: StateTestFiller, pre: Alloc, revert: bytes)
                 slot_returndata: revert,
                 slot_code_worked: value_code_worked,
             }
-        )
+        ),
+        compute_eofcreate_address(contract_address, 0): Account.NONEXISTENT,
     }
     tx = Transaction(
         to=contract_address,
@@ -125,7 +127,8 @@ def test_initcode_aborts(
                 slot_create_address: EOFCREATE_FAILURE,
                 slot_code_worked: value_code_worked,
             }
-        )
+        ),
+        compute_eofcreate_address(contract_address, 0): Account.NONEXISTENT,
     }
     tx = Transaction(
         to=contract_address,
@@ -215,15 +218,19 @@ def test_eofcreate_deploy_sizes(
     # Storage in 0 should have the address,
     # Storage 1 is a canary of 1 to make sure it tried to execute, which also covers cases of
     #   data+code being greater than initcode_size_max, which is allowed.
+    success = target_deploy_size <= MAX_BYTECODE_SIZE
     post = {
         contract_address: Account(
             storage={
                 slot_create_address: compute_eofcreate_address(contract_address, 0)
-                if target_deploy_size <= MAX_BYTECODE_SIZE
+                if success
                 else EOFCREATE_FAILURE,
                 slot_code_worked: value_code_worked,
             }
-        )
+        ),
+        compute_eofcreate_address(contract_address, 0): Account()
+        if success
+        else Account.NONEXISTENT,
     }
     tx = Transaction(
         to=contract_address,
@@ -304,15 +311,19 @@ def test_auxdata_size_failures(state_test: StateTestFiller, pre: Alloc, auxdata_
 
     # Storage in 0 will have address in first test, 0 in all other cases indicating failure
     # Storage 1 in 1 is a canary to see if EOFCREATE opcode halted
+    success = deployed_container_size <= MAX_BYTECODE_SIZE
     post = {
         contract_address: Account(
             storage={
                 slot_create_address: compute_eofcreate_address(contract_address, 0)
-                if deployed_container_size <= MAX_BYTECODE_SIZE
+                if success
                 else 0,
                 slot_code_worked: value_code_worked,
             }
-        )
+        ),
+        compute_eofcreate_address(contract_address, 0): Account()
+        if success
+        else Account.NONEXISTENT,
     }
 
     tx = Transaction(
@@ -615,7 +626,8 @@ def test_static_flag_eofcreate(
                 else LEGACY_CALL_FAILURE,
                 slot_code_worked: value_code_worked,
             }
-        )
+        ),
+        compute_eofcreate_address(contract_address, 0): Account.NONEXISTENT,
     }
     tx = Transaction(
         to=calling_address,
@@ -765,7 +777,8 @@ def test_reentrant_eofcreate(
     initcontainer = Container(
         sections=[
             Section.Code(
-                Op.CALLDATALOAD(0)
+                Op.SSTORE(slot_counter, Op.ADD(Op.SLOAD(slot_counter), 1))
+                + Op.CALLDATALOAD(0)
                 + Op.RJUMPI[len(reenter_code)]
                 + reenter_code
                 + Op.RETURNCODE[0](0, 0)
@@ -796,13 +809,17 @@ def test_reentrant_eofcreate(
     # inicode marked (!).
     # Storage in 0 should have the address from the outer EOFCREATE.
     # Storage in 1 should have 0 from the inner EOFCREATE.
+    # For the created contract storage in `slot_counter` should be 1 as initcode executes only once
     post = {
         contract_address: Account(
             storage={
                 0: compute_eofcreate_address(contract_address, 0),
                 1: 0,
             }
-        )
+        ),
+        compute_eofcreate_address(contract_address, 0): Account(
+            nonce=1, code=smallest_runtime_subcontainer, storage={slot_counter: 1}
+        ),
     }
     tx = Transaction(
         to=contract_address,

tests/osaka/eip7692_eof_v1/eip7873_tx_create/test_txcreate.py

@@ -57,8 +57,6 @@ def test_simple_txcreate(state_test: StateTestFiller, pre: Alloc, tx_initcode_co
     tx = Transaction(
         to=contract_address,
         gas_limit=10_000_000,
-        max_priority_fee_per_gas=10,
-        max_fee_per_gas=10,
         sender=sender,
         initcodes=[smallest_initcode_subcontainer] * tx_initcode_count,
     )
@@ -104,8 +102,6 @@ def test_txcreate_then_dataload(
     tx = Transaction(
         to=contract_address,
         gas_limit=10_000_000,
-        max_priority_fee_per_gas=10,
-        max_fee_per_gas=10,
         sender=sender,
         initcodes=[small_auxdata_container],
     )
@@ -156,8 +152,6 @@ def test_txcreate_then_call(state_test: StateTestFiller, pre: Alloc, evm_code_ty
     tx = Transaction(
         to=contract_address,
         gas_limit=10_000_000,
-        max_priority_fee_per_gas=10,
-        max_fee_per_gas=10,
         sender=sender,
         initcodes=[callable_contract_initcode],
     )
@@ -224,8 +218,6 @@ def test_auxdata_variations(state_test: StateTestFiller, pre: Alloc, auxdata_byt
     tx = Transaction(
         to=contract_address,
         gas_limit=10_000_000,
-        max_priority_fee_per_gas=10,
-        max_fee_per_gas=10,
         sender=sender,
         initcodes=[initcode_subcontainer],
     )
@@ -282,8 +274,6 @@ def test_calldata(state_test: StateTestFiller, pre: Alloc):
     tx = Transaction(
         to=contract_address,
         gas_limit=10_000_000,
-        max_priority_fee_per_gas=10,
-        max_fee_per_gas=10,
         sender=sender,
         initcodes=[initcode_subcontainer],
     )
@@ -382,8 +372,6 @@ def test_txcreate_in_initcode(
     tx = Transaction(
         to=contract_address,
         gas_limit=10_000_000,
-        max_priority_fee_per_gas=10,
-        max_fee_per_gas=10,
         sender=sender,
         initcodes=[nested_initcode_subcontainer, smallest_initcode_subcontainer],
     )
@@ -445,8 +433,6 @@ def test_return_data_cleared(
     tx = Transaction(
         to=contract_address,
         gas_limit=10_000_000,
-        max_priority_fee_per_gas=10,
-        max_fee_per_gas=10,
         sender=sender,
         initcodes=[smallest_initcode_subcontainer],
     )
@@ -495,8 +481,6 @@ def test_address_collision(
     tx = Transaction(
         to=contract_address,
         gas_limit=300_000_000_000,
-        max_priority_fee_per_gas=10,
-        max_fee_per_gas=10,
         sender=sender,
         initcodes=[smallest_initcode_subcontainer],
     )
@@ -546,8 +530,6 @@ def test_txcreate_revert_eof_returndata(
     tx = Transaction(
         to=contract_address,
         gas_limit=1_000_000,
-        max_priority_fee_per_gas=10,
-        max_fee_per_gas=10,
         sender=sender,
         initcodes=[code_reverts_with_calldata],
         # Simplest possible valid EOF container, which is going to be
@@ -603,8 +585,6 @@ def test_txcreate_context(
         to=factory_address,
         gas_limit=200_000,
         value=value,
-        max_priority_fee_per_gas=10,
-        max_fee_per_gas=10,
         initcodes=[initcode],
     )
 
@@ -688,8 +668,6 @@ def test_txcreate_memory_context(
         to=contract_address,
         gas_limit=200_000,
         sender=pre.fund_eoa(),
-        max_priority_fee_per_gas=10,
-        max_fee_per_gas=10,
         initcodes=[initcontainer],
     )
     state_test(env=env, pre=pre, post=post, tx=tx)