fix(fw,tests): Fixes to EOF

docs/CHANGELOG.md

@@ -16,6 +16,7 @@ Test fixtures for use by clients are available for each release on the [Github r
 - ✨ Add Macro enum that represents byte sequence of Op instructions ([#457](https://github.com/ethereum/execution-spec-tests/pull/457))
 - ✨ Number of parameters used to call opcodes (to generate bytecode) is now checked ([#492](https://github.com/ethereum/execution-spec-tests/pull/492)).
 - ✨ Libraries have been refactored to use `pydantic` for type checking in most test types ([#486](https://github.com/ethereum/execution-spec-tests/pull/486), [#501](https://github.com/ethereum/execution-spec-tests/pull/501), [#508](https://github.com/ethereum/execution-spec-tests/pull/508)).
+- ✨ Opcodes are now subscriptable and it's used to define the data portion of the opcode: `Op.PUSH1(1) == Op.PUSH1[1]  == b"\x60\x01"` ([#513](https://github.com/ethereum/execution-spec-tests/pull/513))
 
 ### 🔧 EVM Tools
 

src/ethereum_test_tools/common/helpers.py

@@ -71,22 +71,17 @@ def copy_opcode_cost(length: int) -> int:
     return 3 + (ceiling_division(length, 32) * 3) + cost_memory_bytes(length, 0)
 
 
-def compute_create3_address(address: str | int, salt: int, init_container: bytes) -> str:
+def compute_create3_address(
+    address: FixedSizeBytesConvertible,
+    salt: FixedSizeBytesConvertible,
+    init_container: BytesConvertible,
+) -> Address:
     """
-    Compute address of the resulting contract created using the `CREATE2`
+    Compute address of the resulting contract created using the `CREATE3`
     opcode.
     """
-    ff = bytes([0xFF])
-    if type(address) is str:
-        if address.startswith("0x"):
-            address = address[2:]
-        address_bytes = bytes.fromhex(address)
-    elif type(address) is int:
-        address_bytes = address.to_bytes(length=20, byteorder="big")
-    salt_bytes = salt.to_bytes(length=32, byteorder="big")
-    initcode_hash = keccak256(init_container)
-    hash = keccak256(ff + address_bytes + salt_bytes + initcode_hash)
-    return "0x" + hash[-20:].hex()
+    hash = keccak256(b"\xff" + Address(address) + Hash(salt) + keccak256(Bytes(init_container)))
+    return Address(hash[-20:])
 
 
 def eip_2028_transaction_data_cost(data: BytesConvertible) -> int:

src/ethereum_test_tools/eof/constants.py

@@ -2,16 +2,20 @@
 EVM Object Format generic constants.
 Applicable to all EOF versions.
 """
-EOF_MAGIC = bytes([0])
+EOF_MAGIC = b"\xef\x00"
 """
 The second byte found on every EOF formatted contract, which was chosen to
 avoid clashes with three contracts which were deployed on Mainnet.
 """
-EOF_HEADER_TERMINATOR = bytes([0])
+EOF_HEADER_TERMINATOR = b"\x00"
 """
 Byte that terminates the header of the EOF format.
 """
 LATEST_EOF_VERSION = 1
 """
 Latest existing EOF version.
 """
+VERSION_BYTE_LENGTH = 1
+"""
+Length of the version byte.
+"""