fix(tests,fw): Remove EIP-7698 EOF creation txs (#1451)

* fix(tests): Remove/Move EIP-7698 tests

* fix(fw): add EOF_CREATION_TRANSACTION exception

* fix(tests): EIP-7069 to not use EOF creation tx

* fix(fw): eof_state_test not to use EOF creation tx

* fix(fw): ...test_from_eof_test not to use EOF creation tx

* fix(docs): misc remove mentions of EOF creation tx

* fix(tests): allow variants of validation exceptions

* review  comments

* Mark `test_legacy_create_tx_eof_initcode` with `xfail`

* changelog

---------

Co-authored-by: Mario Vega <[email protected]>

Author: pdobacz

docs/CHANGELOG.md

@@ -53,6 +53,7 @@ This feature can be disabled by using `--disable-strict-exception-matching` for
 - ✨ [EIP-7251](https://eips.ethereum.org/EIPS/eip-7251): Remove pytest skips for consolidation request cases ([#1449](https://github.com/ethereum/execution-spec-tests/pull/1449)).
 - ✨ [EIP-7002](https://eips.ethereum.org/EIPS/eip-7002), [EIP-7251](https://eips.ethereum.org/EIPS/eip-7251): Add cases to verify behavior of contracts missing at fork ([#1394](https://github.com/ethereum/execution-spec-tests/pull/1394)).
 - ✨ [EIP-7002](https://eips.ethereum.org/EIPS/eip-7002), [EIP-7251](https://eips.ethereum.org/EIPS/eip-7251): Add cases to verify behavior of system contract errors invalidating a block ([#1394](https://github.com/ethereum/execution-spec-tests/pull/1394)).
+- 🔀 Remove [EIP-7698](https://eips.ethereum.org/EIPS/eip-7698): EIP has been removed and the tests related to it have also been removed, while preserving a subset of the tests to verify that functionality is removed in clients ([#1451](https://github.com/ethereum/execution-spec-tests/pull/1451)).
 
 ### 📋 Misc
 

src/ethereum_clis/clis/evmone.py

@@ -80,6 +80,7 @@ class EvmoneExceptionMapper(ExceptionMapper):
         ),
         TransactionException.NONCE_MISMATCH_TOO_LOW: "nonce too low",
         TransactionException.NONCE_MISMATCH_TOO_HIGH: "nonce too high",
+        TransactionException.EOF_CREATION_TRANSACTION: "EOF initcode in creation transaction",
         # TODO EVMONE needs to differentiate when the section is missing in the header or body
         EOFException.MISSING_STOP_OPCODE: "err: no_terminating_instruction",
         EOFException.MISSING_CODE_HEADER: "err: code_section_missing",

src/ethereum_test_exceptions/exceptions.py

@@ -327,6 +327,10 @@ class TransactionException(ExceptionBase):
     """
     Transaction's initcode for a contract-creating transaction is too large.
     """
+    EOF_CREATION_TRANSACTION = auto()
+    """
+    Creation transaction (to: nil) contains EOF initcode
+    """
     TYPE_3_TX_PRE_FORK = auto()
     """
     Transaction type 3 included before activation fork.

src/ethereum_test_specs/eof.py

@@ -29,6 +29,7 @@
 from ethereum_test_forks import Fork
 from ethereum_test_types import EOA, Alloc, Environment, Transaction
 from ethereum_test_types.eof.v1 import Container, ContainerKind, Section, SectionKind
+from ethereum_test_types.helpers import compute_eofcreate_address
 from ethereum_test_vm import Opcodes as Op
 
 from .base import BaseTest
@@ -384,6 +385,7 @@ def generate_eof_contract_create_transaction(self) -> Transaction:
         """Generate a transaction that creates a contract."""
         assert self.sender is not None, "sender must be set to generate a StateTest."
         assert self.post is not None, "post must be set to generate a StateTest."
+        assert self.pre is not None, "pre must be set to generate a StateTest."
 
         initcode: Container
         deployed_container: Container | Bytes | None = None
@@ -420,17 +422,23 @@ def generate_eof_contract_create_transaction(self) -> Transaction:
             )
             deployed_container = self.container
 
+        factory_address = self.pre.deploy_contract(
+            Op.TXCREATE(tx_initcode_hash=initcode.hash) + Op.STOP
+        )
+
         tx = Transaction(
             sender=self.sender,
-            to=None,
+            to=factory_address,
             gas_limit=10_000_000,
-            data=initcode,
+            max_priority_fee_per_gas=10,
+            max_fee_per_gas=10,
+            initcodes=[initcode],
         )
 
         if self.expect_exception is not None or deployed_container is None:
-            self.post[tx.created_contract] = None
+            self.post[compute_eofcreate_address(factory_address, 0)] = None
         else:
-            self.post[tx.created_contract] = Account(
+            self.post[compute_eofcreate_address(factory_address, 0)] = Account(
                 code=deployed_container,
             )
         return tx
@@ -548,26 +556,39 @@ def model_post_init(self, __context):
         if self.post is None:
             self.post = Alloc()
 
-        if self.expect_exception is not None:  # Invalid EOF
-            self.to = None  # Make EIP-7698 create transaction
-            self.data = Bytes(
-                bytes(self.container) + self.data
-            )  # by concatenating container and tx data.
+        if self.expect_exception is not None and self.container_kind == ContainerKind.RUNTIME:
+            # Invalid EOF runtime code
+            initcode = Container.Init(deploy_container=self.container)
+            self.to = self.pre.deploy_contract(
+                Op.TXCREATE(tx_initcode_hash=initcode.hash) + Op.STOP
+            )
+            self.initcodes = [initcode]
+
+            # Run transaction model validation
+            Transaction.model_post_init(self, __context)
+
+            self.post[compute_eofcreate_address(self.to, 0)] = None  # Expect failure.
+        elif self.expect_exception is not None and self.container_kind == ContainerKind.INITCODE:
+            # Invalid EOF initcode
+            self.to = self.pre.deploy_contract(
+                Op.TXCREATE(tx_initcode_hash=self.container.hash) + Op.STOP
+            )
+            self.initcodes = [self.container]
 
             # Run transaction model validation
             Transaction.model_post_init(self, __context)
 
-            self.post[self.created_contract] = None  # Expect failure.
+            self.post[compute_eofcreate_address(self.to, 0)] = None  # Expect failure.
         elif self.container_kind == ContainerKind.INITCODE:
-            self.to = None  # Make EIP-7698 create transaction
-            self.data = Bytes(
-                bytes(self.container) + self.data
-            )  # by concatenating container and tx data.
+            self.to = self.pre.deploy_contract(
+                Op.TXCREATE(tx_initcode_hash=self.container.hash) + Op.STOP
+            )
+            self.initcodes = [self.container]
 
             # Run transaction model validation
             Transaction.model_post_init(self, __context)
 
-            self.post[self.created_contract] = self.container_post  # Successful.
+            self.post[compute_eofcreate_address(self.to, 0)] = self.container_post
         else:
             self.to = self.pre.deploy_contract(code=self.container)
 

tests/osaka/eip7692_eof_v1/__init__.py

@@ -12,7 +12,7 @@
     * [EIP-7069: Revamped CALL instructions](https://eips.ethereum.org/EIPS/eip-7069).
     * [EIP-7480: EOF - Data section access instructions](https://eips.ethereum.org/EIPS/eip-7480).
     * [EIP-7620: EOF Contract Creation](https://eips.ethereum.org/EIPS/eip-7620).
-    * [EIP-7698: EOF - Creation transaction](https://eips.ethereum.org/EIPS/eip-7698).
+    * [EIP-7873: EOF - TXCREATE and InitcodeTransaction type](https://eips.ethereum.org/EIPS/eip-7873).
 
 ## Devnet Specifications
 

tests/osaka/eip7692_eof_v1/eip3540_eof_v1/test_container_validation.py

@@ -426,7 +426,10 @@ def test_valid_containers(
             # EOF code containing type section size (Size 1)
             name="EOF1I4750_0003",
             raw_bytes="ef00010100010200010001ff00000000800000fe",
-            validity_error=EOFException.INVALID_TYPE_SECTION_SIZE,
+            validity_error=[
+                EOFException.INVALID_TYPE_SECTION_SIZE,
+                EOFException.INVALID_SECTION_BODIES_SIZE,
+            ],
         ),
         Container(
             # EOF code containing type section size (Size 8 - 1 Code section)

tests/osaka/eip7692_eof_v1/eip3540_eof_v1/test_section_size.py

@@ -71,7 +71,10 @@ def __str__(self) -> str:
             id="type_size_zero",
         ),
         pytest.param(
-            SectionKind.TYPE, SectionSize.UNDERSIZE, EOFException.INVALID_TYPE_SECTION_SIZE
+            SectionKind.TYPE,
+            SectionSize.UNDERSIZE,
+            [EOFException.INVALID_SECTION_BODIES_SIZE, EOFException.INVALID_TYPE_SECTION_SIZE],
+            id="type_size_undersize",
         ),
         pytest.param(
             SectionKind.TYPE, SectionSize.OVERSIZE, EOFException.INVALID_SECTION_BODIES_SIZE

tests/osaka/eip7692_eof_v1/eip7069_extcall/test_calls.py

@@ -14,10 +14,10 @@
     StateTestFiller,
     Storage,
     Transaction,
-    compute_create_address,
 )
 from ethereum_test_tools.vm.opcode import Opcodes as Op
 from ethereum_test_types.eof.v1 import Container, Section
+from ethereum_test_types.helpers import compute_eofcreate_address
 from ethereum_test_vm.bytecode import Bytecode
 from ethereum_test_vm.evm_types import EVMCodeType
 
@@ -1168,13 +1168,18 @@ def test_extdelegate_call_targets(
                 Section.Container(Container.Code(Op.STOP)),
             ]
         )
+        initcode_hash = caller_contract.hash
+        factory_address = pre.deploy_contract(
+            code=Op.TXCREATE(tx_initcode_hash=initcode_hash) + Op.STOP,
+        )
         tx = Transaction(
             sender=sender,
-            to=None,
+            to=factory_address,
             data=caller_contract,
             gas_limit=4_000_000,
+            initcodes=[caller_contract],
         )
-        calling_contract_address = tx.created_contract
+        calling_contract_address = compute_eofcreate_address(factory_address, 0)
     else:
         # Normal call from existing contract
         caller_contract = Container.Code(
@@ -1196,14 +1201,9 @@ def test_extdelegate_call_targets(
         if target_account_type == TargetAccountType.EOF_CONTRACT_INVALID
         else EXTCALL_REVERT,
     }
-    storage_address = (
-        compute_create_address(address=sender, nonce=0)
-        if call_from_initcode
-        else calling_contract_address
-    )
 
     post = {
-        storage_address: Account(storage=calling_storage),
+        calling_contract_address: Account(storage=calling_storage),
     }
 
     state_test(