feat(fw): use forkchoice updated version 4 for prague.

spencer-tb · Oct 31, 2024 · 2567dd1 · 2567dd1
1 parent 4548018
commit 2567dd1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/src/ethereum_test_fixtures/tests/test_blockchain.py b/src/ethereum_test_fixtures/tests/test_blockchain.py
@@ -791,7 +791,7 @@
                         ).requests_list
                     ],
                 ],
-                "forkchoiceUpdatedVersion": "3",
+                "forkchoiceUpdatedVersion": "4",
                 "newPayloadVersion": "4",
                 "validationError": "BlockException.INCORRECT_BLOCK_FORMAT"
                 "|TransactionException.INTRINSIC_GAS_TOO_LOW",
@@ -948,7 +948,7 @@
                     ],
                 ],
                 "newPayloadVersion": "4",
-                "forkchoiceUpdatedVersion": "3",
+                "forkchoiceUpdatedVersion": "4",
                 "validationError": "BlockException.INCORRECT_BLOCK_FORMAT"
                 "|TransactionException.INTRINSIC_GAS_TOO_LOW",
             },

diff --git a/src/ethereum_test_forks/forks/forks.py b/src/ethereum_test_forks/forks/forks.py
@@ -976,16 +976,6 @@ def engine_new_payload_version(
         """
         return 4
 
-    @classmethod
-    def engine_forkchoice_updated_version(
-        cls, block_number: int = 0, timestamp: int = 0
-    ) -> Optional[int]:
-        """
-        At Prague, version number of NewPayload and ForkchoiceUpdated diverge.
-        """
-        return 3
-
-
 class CancunEIP7692(  # noqa: SC200
     Cancun,
     transition_tool_name="Prague",  # Evmone enables (only) EOF at Prague