feature: Add engine API forkchoice updated information in fixtures

src/ethereum_test_forks/base_fork.py

@@ -174,6 +174,16 @@ def engine_new_payload_beacon_root(cls, block_number: int = 0, timestamp: int =
         """
         pass
 
+    @classmethod
+    @abstractmethod
+    def engine_forkchoice_updated_version(
+        cls, block_number: int = 0, timestamp: int = 0
+    ) -> Optional[int]:
+        """
+        Returns `None` if the forks canonical chain cannot be set using the forkchoice method.
+        """
+        pass
+
     # Meta information about the fork
     @classmethod
     def name(cls) -> str:

src/ethereum_test_forks/forks/forks.py

@@ -91,6 +91,15 @@ def engine_new_payload_beacon_root(cls, block_number: int = 0, timestamp: int =
         """
         return False
 
+    @classmethod
+    def engine_forkchoice_updated_version(
+        cls, block_number: int = 0, timestamp: int = 0
+    ) -> Optional[int]:
+        """
+        At genesis, forkchoice updates cannot be sent through the engine API.
+        """
+        return cls.engine_new_payload_version(block_number, timestamp)
+
     @classmethod
     def get_reward(cls, block_number: int = 0, timestamp: int = 0) -> int:
         """

src/ethereum_test_tools/common/types.py

@@ -2707,6 +2707,11 @@ class Fixture:
             to_json=True,
         ),
     )
+    fcu_version: Optional[int] = field(
+        json_encoder=JSONEncoder.Field(
+            name="engineFcuVersion",
+        ),
+    )
     genesis: FixtureHeader = field(
         json_encoder=JSONEncoder.Field(
             name="genesisBlockHeader",

src/ethereum_test_tools/filling/fill.py

@@ -34,6 +34,20 @@ def fill_test(
         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,
@@ -45,6 +59,7 @@ def fill_test(
         post_state=alloc_to_accounts(alloc),
         seal_engine=engine,
         name=test_spec.tag,
+        fcu_version=fcu_version,
     )
     fixture.fill_info(t8n, spec)
 

whitelist.txt

@@ -84,6 +84,7 @@ extcodesize
 fn
 fname
 forkchoice
+fcu
 formatOnSave
 formatter
 fromhex