From 2567dd1801bc2bf1a131fc78c29b2920b99ff52c Mon Sep 17 00:00:00 2001 From: spencer-tb Date: Thu, 31 Oct 2024 12:55:39 +0700 Subject: [PATCH] feat(fw): use forkchoice updated version 4 for prague. --- src/ethereum_test_fixtures/tests/test_blockchain.py | 4 ++-- src/ethereum_test_forks/forks/forks.py | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/ethereum_test_fixtures/tests/test_blockchain.py b/src/ethereum_test_fixtures/tests/test_blockchain.py index f9c5898e12..b10e04fd81 100644 --- 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 index e885bbd137..67599a448c 100644 --- 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