fix(tests): Update legacy creation tx rules (ethereum#1492)

Author: pdobacz

src/ethereum_clis/clis/evmone.py

@@ -80,7 +80,6 @@ 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,10 +327,6 @@ 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.

tests/osaka/eip7692_eof_v1/eip7873_tx_create/test_creation_tx.py

@@ -3,7 +3,6 @@
 import pytest
 
 from ethereum_test_base_types.base_types import Address, Bytes
-from ethereum_test_exceptions.exceptions import TransactionException
 from ethereum_test_tools import (
     Account,
     Alloc,
@@ -13,6 +12,7 @@
 )
 from ethereum_test_tools.code.generators import Initcode as LegacyInitcode
 from ethereum_test_types.eof.v1 import Container
+from ethereum_test_types.types import TransactionReceipt
 from tests.prague.eip7702_set_code_tx.spec import Spec
 
 from .. import EOF_FORK_NAME
@@ -22,7 +22,7 @@
 )
 
 REFERENCE_SPEC_GIT_PATH = "EIPS/eip-7873.md"
-REFERENCE_SPEC_VERSION = "1115fe6110fcc0efc823fb7f8f5cd86c42173efe"
+REFERENCE_SPEC_VERSION = "23d96ceff8f0690432ab91089ae257f08f32340f"
 
 pytestmark = pytest.mark.valid_from(EOF_FORK_NAME)
 
@@ -77,53 +77,6 @@ def test_legacy_create_tx_legacy_initcode_eof_bytecode(
     )
 
 
-@pytest.mark.with_all_contract_creating_tx_types(selector=lambda tx_type: tx_type != 6)
-@pytest.mark.parametrize(
-    "initcode",
-    [
-        Bytes("0xEF00"),
-        Bytes("0xEF0001"),
-        smallest_runtime_subcontainer,
-        smallest_initcode_subcontainer,
-    ],
-)
-@pytest.mark.exception_test
-def test_legacy_create_tx_eof_initcode(
-    state_test: StateTestFiller,
-    pre: Alloc,
-    tx_type: int,
-    initcode: Bytes | Container,
-):
-    """
-    Test that a legacy contract creation tx with EOF initcode (or anything starting with
-    `0xEF00` in data) is invalid.
-    """
-    env = Environment()
-    sender = pre.fund_eoa()
-
-    tx = Transaction(
-        ty=tx_type,
-        sender=sender,
-        to=None,
-        gas_limit=100_000,
-        data=initcode,
-        error=TransactionException.EOF_CREATION_TRANSACTION,
-    )
-
-    destination_contract_address = tx.created_contract
-
-    post = {
-        destination_contract_address: Account.NONEXISTENT,
-    }
-
-    state_test(
-        env=env,
-        pre=pre,
-        post=post,
-        tx=tx,
-    )
-
-
 @pytest.mark.with_all_contract_creating_tx_types(selector=lambda tx_type: tx_type != 6)
 @pytest.mark.parametrize(
     "initcode",
@@ -133,6 +86,10 @@ def test_legacy_create_tx_eof_initcode(
         Bytes("0xEF0101"),
         Spec.delegation_designation(Address(0xAA)),
         Bytes("0xEF02"),
+        Bytes("0xEF00"),
+        Bytes("0xEF0001"),
+        smallest_runtime_subcontainer,
+        smallest_initcode_subcontainer,
     ],
 )
 def test_legacy_create_tx_prefix_initcode(
@@ -143,25 +100,25 @@ def test_legacy_create_tx_prefix_initcode(
 ):
     """
     Test that a legacy contract creation tx behaves as it did before EIP-7873 for
-    initcode stating with `EF`, but not falling into the special case of `EF00`.
+    initcode stating with `EF`.
     The transaction should be valid but fail on executing of the first byte `EF`.
     """
     env = Environment()
     sender = pre.fund_eoa()
+    gas_limit = 100_000
 
     tx = Transaction(
         ty=tx_type,
         sender=sender,
         to=None,
-        gas_limit=100_000,
+        gas_limit=gas_limit,
         data=initcode,
+        expected_receipt=TransactionReceipt(gas_used=gas_limit),
     )
 
     destination_contract_address = tx.created_contract
 
-    post = {
-        destination_contract_address: Account.NONEXISTENT,
-    }
+    post = {destination_contract_address: Account.NONEXISTENT, sender: Account(nonce=1)}
 
     state_test(
         env=env,