fix(tests): minor fixes and updates for eip7843 (#2057)

* fix(tests): minor updates to eip-7843 following #2007

* fix: account for slotnum in genesis creation

* fix: append slot_number in fixture_loader.py

Author: fselmo

packages/testing/src/execution_testing/fixtures/blockchain.py

@@ -384,7 +384,9 @@ def genesis(cls, fork: Fork, env: Environment, state_root: Hash) -> Self:
             ),
             "slot_number": (
                 0
-                if fork.header_slot_number_required(block_number=0, timestamp=0)
+                if fork.header_slot_number_required(
+                    block_number=0, timestamp=0
+                )
                 else None
             ),
             "fork": fork,

packages/testing/src/execution_testing/specs/blockchain.py

@@ -762,7 +762,8 @@ def generate_block_data(
             if bal != t8n_bal and self.fork.header_bal_hash_required(
                 block_number=int(env.number), timestamp=int(env.timestamp)
             ):
-                # If the BAL was modified and the fork requires it, update the header hash
+                # If the BAL was modified and the fork requires it,
+                # update the header hash
                 header.block_access_list_hash = Hash(bal.rlp.keccak256())
 
         built_block = BuiltBlock(

packages/testing/src/execution_testing/vm/opcodes.py

@@ -2246,7 +2246,7 @@ class Opcodes(Opcode, Enum):
 
     Fork
     ----
-    TBD
+    Amsterdam
 
     Gas
     ----

src/ethereum/genesis.py

@@ -262,6 +262,9 @@ def add_genesis_block(
     if has_field(hardfork.Header, "block_access_list_hash"):
         fields["block_access_list_hash"] = keccak256(rlp.encode([]))
 
+    if has_field(hardfork.Header, "slot_number"):
+        fields["slot_number"] = U64(0)
+
     genesis_header = hardfork.Header(**fields)
 
     block_fields = {

src/ethereum_spec_tools/evm_tools/loaders/fixture_loader.py

@@ -200,4 +200,8 @@ def json_to_header(self, raw: Any) -> Any:
             bal_hash = hex_to_bytes32(raw.get("blockAccessListHash"))
             parameters.append(bal_hash)
 
+        if "slotNumber" in raw:
+            slot_number = hex_to_u64(raw.get("slotNumber"))
+            parameters.append(slot_number)
+
         return self.fork.Header(*parameters)

tests/amsterdam/eip7843_slotnum/spec.py

@@ -13,7 +13,7 @@ class ReferenceSpec:
 
 ref_spec_7843 = ReferenceSpec(
     git_path="EIPS/eip-7843.md",
-    version="8140e7f3a1c93249e9e9ee5ab5281396341306ec",
+    version="6bc5d6b7acbc016a79fa573f98975093b5c2ca52",
 )
 
 

tests/osaka/eip7934_block_rlp_limit/test_max_block_rlp_size.py

@@ -45,7 +45,7 @@
 
 
 HEADER_TIMESTAMP = 123456789
-EXTRA_DATA_AT_LIMIT = b"\x00\x00\x00"
+EXTRA_DATA_AT_LIMIT = b"\x00\x00\x00\x00"
 BLOCK_GAS_LIMIT = 100_000_000