src/ethereum_test_tools: move fcuVersion last valid block logic to spec.

Author: spencer-tb

src/ethereum_test_tools/filling/fill.py

@@ -26,28 +26,14 @@ def fill_test(
 
     pre, genesis_rlp, genesis = test_spec.make_genesis(t8n, fork)
 
-    (blocks, head, alloc) = test_spec.make_blocks(
+    (blocks, head, alloc, fcu_version) = test_spec.make_blocks(
         t8n,
         genesis,
         pre,
         fork,
         eips=eips,
     )
 
-    fcu_version: int | None = None
-    if not test_spec.base_test_config.disable_hive:
-        last_valid_block = next(
-            (block.block_header for block in reversed(blocks) if block.expected_exception is None),
-            None,
-        )
-        fcu_version = (
-            fork.engine_forkchoice_updated_version(
-                last_valid_block.number, last_valid_block.timestamp
-            )
-            if last_valid_block
-            else None
-        )
-
     fork_name = fork.name()
     fixture = Fixture(
         blocks=blocks,

src/ethereum_test_tools/spec/base_test.py

@@ -127,7 +127,7 @@ def make_blocks(
         fork: Fork,
         chain_id: int = 1,
         eips: Optional[List[int]] = None,
-    ) -> Tuple[List[FixtureBlock], Hash, Dict[str, Any]]:
+    ) -> Tuple[List[FixtureBlock], Hash, Dict[str, Any], Optional[int]]:
         """
         Generate the blockchain that must be executed sequentially during test.
         """

src/ethereum_test_tools/spec/blockchain_test.py

@@ -264,7 +264,7 @@ def make_blocks(
         fork: Fork,
         chain_id=1,
         eips: Optional[List[int]] = None,
-    ) -> Tuple[List[FixtureBlock], Hash, Dict[str, Any]]:
+    ) -> Tuple[List[FixtureBlock], Hash, Dict[str, Any], Optional[int]]:
         """
         Create a block list from the blockchain test definition.
         Performs checks against the expected behavior of the test.
@@ -273,6 +273,9 @@ def make_blocks(
         alloc = to_json(pre)
         env = Environment.from_parent_header(genesis)
         blocks: List[FixtureBlock] = []
+        fcu_version: Optional[int] = None
+        last_valid: Optional[FixtureHeader] = None
+
         head = genesis.hash if genesis.hash is not None else Hash(0)
         for block in self.blocks:
             fixture_block, env, alloc, head = self.make_block(
@@ -286,14 +289,22 @@ def make_blocks(
                 eips=eips,
             )
             blocks.append(fixture_block)
+            if block.exception is None:
+                last_valid = fixture_block.block_header
+
+        if not self.base_test_config.disable_hive and last_valid is not None:
+            fcu_version = fork.engine_forkchoice_updated_version(
+                block_number=last_valid.number,
+                timestamp=last_valid.timestamp,
+            )
 
         try:
             verify_post_alloc(self.post, alloc)
         except Exception as e:
             print_traces(t8n.get_traces())
             raise e
 
-        return (blocks, head, alloc)
+        return (blocks, head, alloc, fcu_version)
 
 
 BlockchainTestSpec = Callable[[str], Generator[BlockchainTest, None, None]]

src/ethereum_test_tools/spec/state_test.py

@@ -127,7 +127,7 @@ def make_blocks(
         fork: Fork,
         chain_id=1,
         eips: Optional[List[int]] = None,
-    ) -> Tuple[List[FixtureBlock], Hash, Dict[str, Any]]:
+    ) -> Tuple[List[FixtureBlock], Hash, Dict[str, Any], Optional[int]]:
         """
         Create a block from the state test definition.
         Performs checks against the expected behavior of the test.
@@ -178,15 +178,18 @@ def make_blocks(
             withdrawals=env.withdrawals,
         )
 
+        # Hive specific fields
         new_payload: FixtureEngineNewPayload | None = None
+        fcu_version: int | None = None
         if not self.base_test_config.disable_hive:
             new_payload = FixtureEngineNewPayload.from_fixture_header(
                 fork=fork,
                 header=header,
                 transactions=txs,
                 withdrawals=env.withdrawals,
-                error_code=self.engine_api_error_code,
+                error_code=None,
             )
+            fcu_version = fork.engine_forkchoice_updated_version(header.number, header.timestamp)
 
         return (
             [
@@ -201,6 +204,7 @@ def make_blocks(
             ],
             header.hash,
             alloc,
+            fcu_version,
         )