new(tests): EIP-7873 TXCREATE execution tests - 1st batch (#1413)

* fix(tests): Fix existing tests for eof-devnet-1 TXCREATE change

* new(tests): EIP-7873 TXCREATE execution tests - 1st batch

* new(tests): Allow TXCREATE in legacy (#7)

* fix(fw): expose Container.hash property

* Apply code review suggestion - import helpers

* fix(fw): Include initcodes field

Co-authored-by: spencer-tb <spencer.taylor-brown@ethereum.org>

* fix(tests): adjust EIP-7873 test to new container size

---------

Co-authored-by: spencer-tb <spencer.taylor-brown@ethereum.org>

Author: pdobacz

src/ethereum_test_fixtures/blockchain.py

@@ -321,6 +321,7 @@ class FixtureTransaction(TransactionFixtureConverter, TransactionGeneric[ZeroPad
     """Representation of an Ethereum transaction within a test Fixture."""
 
     authorization_list: List[FixtureAuthorizationTuple] | None = None
+    initcodes: List[Bytes] | None = None
 
     @classmethod
     def from_transaction(cls, tx: Transaction) -> "FixtureTransaction":

src/ethereum_test_fixtures/state.py

@@ -43,6 +43,7 @@ class FixtureTransaction(TransactionFixtureConverter):
     data: List[Bytes]
     access_lists: List[List[AccessList] | None] | None = None
     authorization_list: List[FixtureAuthorizationTuple] | None = None
+    initcodes: List[Bytes] | None = None
     max_fee_per_blob_gas: ZeroPaddedHexNumber | None = None
     blob_versioned_hashes: Sequence[Hash] | None = None
     sender: Address | None = None

src/ethereum_test_types/eof/v1/__init__.py

@@ -12,7 +12,7 @@
     to_string_ser_schema,
 )
 
-from ethereum_test_base_types import Bytes
+from ethereum_test_base_types import Bytes, Hash
 from ethereum_test_base_types.conversions import BytesConvertible
 from ethereum_test_base_types.pydantic import CopyValidateModel
 from ethereum_test_exceptions.exceptions import EOFExceptionInstanceOrList
@@ -468,6 +468,11 @@ def Init(  # noqa: N802
             ],
         )
 
+    @cached_property
+    def hash(self) -> Hash:
+        """Returns hash of the container bytecode."""
+        return Bytes(self.bytecode).keccak256()
+
     def __bytes__(self) -> bytes:
         """Return bytecode of the container."""
         return self.bytecode

src/ethereum_test_types/types.py

@@ -669,6 +669,8 @@ class Transaction(
 
     authorization_list: List[AuthorizationTuple] | None = None
 
+    initcodes: List[Bytes] | None = None
+
     secret_key: Hash | None = None
     error: List[TransactionException] | TransactionException | None = Field(None, exclude=True)
 
@@ -710,7 +712,9 @@ def model_post_init(self, __context):
 
         if "ty" not in self.model_fields_set:
             # Try to deduce transaction type from included fields
-            if self.authorization_list is not None:
+            if self.initcodes is not None:
+                self.ty = 6
+            elif self.authorization_list is not None:
                 self.ty = 4
             elif self.max_fee_per_blob_gas is not None or self.blob_versioned_hashes is not None:
                 self.ty = 3
@@ -758,6 +762,11 @@ def model_post_init(self, __context):
         if self.ty != 4:
             assert self.authorization_list is None, "authorization_list must be None"
 
+        if self.ty == 6 and self.initcodes is None:
+            self.initcodes = []
+        if self.ty != 6:
+            assert self.initcodes is None, "initcodes must be None"
+
         if "nonce" not in self.model_fields_set and self.sender is not None:
             self.nonce = HexNumber(self.sender.get_nonce())
 
@@ -911,7 +920,21 @@ def get_rlp_signing_fields(self) -> List[str]:
         the transaction type.
         """
         field_list: List[str]
-        if self.ty == 4:
+        if self.ty == 6:
+            # EIP-7873: https://eips.ethereum.org/EIPS/eip-7873
+            field_list = [
+                "chain_id",
+                "nonce",
+                "max_priority_fee_per_gas",
+                "max_fee_per_gas",
+                "gas_limit",
+                "to",
+                "value",
+                "data",
+                "access_list",
+                "initcodes",
+            ]
+        elif self.ty == 4:
             # EIP-7702: https://eips.ethereum.org/EIPS/eip-7702
             field_list = [
                 "chain_id",

src/ethereum_test_vm/opcode.py

@@ -5117,6 +5117,35 @@ class Opcodes(Opcode, Enum):
 
     """
 
+    TXCREATE = Opcode(
+        0xED,
+        popped_stack_items=5,
+        pushed_stack_items=1,
+        kwargs=["tx_initcode_hash", "salt", "input_offset", "input_size", "value"],
+    )
+    """
+    !!! Note: This opcode is under development
+
+    TXCREATE (tx_initcode_hash, salt, input_offset, input_size, value)
+    ----
+
+    Description
+    ----
+
+    Inputs
+    ----
+
+    Outputs
+    ----
+
+    Fork
+    ----
+
+    Gas
+    ----
+
+    """
+
     RETURNCODE = Opcode(
         0xEE,
         popped_stack_items=2,
@@ -5869,7 +5898,6 @@ class UndefinedOpcodes(Opcode, Enum):
     OPCODE_E9 = Opcode(0xE9)
     OPCODE_EA = Opcode(0xEA)
     OPCODE_EB = Opcode(0xEB)
-    OPCODE_ED = Opcode(0xED)
     OPCODE_EF = Opcode(0xEF)
     OPCODE_F6 = Opcode(0xF6)
     OPCODE_FC = Opcode(0xFC)

tests/osaka/eip7692_eof_v1/eip3540_eof_v1/opcodes.py

@@ -31,6 +31,9 @@
     Op.DATACOPY,
     # EIP-7620 EOF Create and Return Contract operation
     Op.EOFCREATE,
+    # EIP-7873 TXCREATE and InitcodeTransaction
+    Op.TXCREATE,
+    # EIP-7620 EOF Create and Return Contract operation
     Op.RETURNCODE,
     # Non-deprecated Legacy Opcodes
     Op.STOP,

tests/osaka/eip7692_eof_v1/eip3540_eof_v1/test_opcodes_in_legacy.py

@@ -48,6 +48,7 @@
     pytest.param(Op.DATASIZE, id="DATASIZE"),
     pytest.param(Op.DATACOPY(0, 0, 32), id="DATACOPY"),
     pytest.param(Op.EOFCREATE[0](0, 0, 0, 0), id="EOFCREATE"),
+    # pytest.param(Op.TXCREATE(0, 0, 0, 0, 0), id="TXCREATE"), not EOF-only anymore
     pytest.param(Op.RETURNCODE[0], id="RETURNCODE"),
 ]
 

tests/osaka/eip7692_eof_v1/eip7873_tx_create/__init__.py

@@ -0,0 +1,4 @@
+"""
+abstract: Test cases for
+[EIP-7873: TXCREATE and InitcodeTransaction](https://eips.ethereum.org/EIPS/eip-7873).
+"""  # noqa: E501

tests/osaka/eip7692_eof_v1/eip7873_tx_create/spec.py

@@ -0,0 +1,3 @@
+"""EOF V1 Constants used throughout all tests."""
+
+TXCREATE_FAILURE = 0