chore(tests): safer workaround for EIP-6110 deposit log checks (#2233)

* chore(cli): safe solution to 6110.

* chore(docs): changelog and lint fix.

Author: spencer-tb

docs/CHANGELOG.md

@@ -32,6 +32,7 @@ Test fixtures for use by clients are available for each release on the [Github r
 
 ### 🧪 Test Cases
 
+- ✨ Add safe EIP-6110 workaround to allow Geth/Reth to pass invalid deposit request tests even thought they are out of spec ([#2177](https://github.com/ethereum/execution-spec-tests/pull/2177), [#2233](https://github.com/ethereum/execution-spec-tests/pull/2233)).
 - ✨ Add an EIP-7928 test case targeting the `SELFDESTRUCT` opcode. ([#2159](https://github.com/ethereum/execution-spec-tests/pull/2159)).
 
 ## [v5.0.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v5.0.0) - 2025-09-05

src/ethereum_clis/clis/geth.py

@@ -77,6 +77,21 @@ class GethExceptionMapper(ExceptionMapper):
         BlockException.INCORRECT_EXCESS_BLOB_GAS: "invalid excessBlobGas",
         BlockException.INVALID_VERSIONED_HASHES: "invalid number of versionedHashes",
         BlockException.INVALID_REQUESTS: "invalid requests hash",
+        BlockException.INVALID_DEPOSIT_EVENT_LAYOUT: "invalid requests hash",
+        # Geth does not validate the sizes or offsets of the deposit
+        # contract logs. As a workaround we have set
+        # INVALID_DEPOSIT_EVENT_LAYOUT equal to INVALID_REQUESTS.
+        #
+        # Although this is out of spec, it is understood that this
+        # will not cause an issue so long as the mainnet/testnet
+        # deposit contracts don't change.
+        #
+        # The offsets are checked second and the sizes are checked
+        # third within the `is_valid_deposit_event_data` function:
+        # https://eips.ethereum.org/EIPS/eip-6110#block-validity
+        #
+        # EELS definition for `is_valid_deposit_event_data`:
+        # https://github.com/ethereum/execution-specs/blob/5ddb904fa7ba27daeff423e78466744c51e8cb6a/src/ethereum/forks/prague/requests.py#L51
         BlockException.SYSTEM_CONTRACT_CALL_FAILED: "system call failed to execute:",
         BlockException.INVALID_BLOCK_HASH: "blockhash mismatch",
         BlockException.RLP_BLOCK_LIMIT_EXCEEDED: "block RLP-encoded size exceeds maximum",

src/ethereum_clis/clis/reth.py

@@ -33,6 +33,21 @@ class RethExceptionMapper(ExceptionMapper):
             "failed to decode deposit requests from receipts"
         ),
         BlockException.INVALID_REQUESTS: "mismatched block requests hash",
+        BlockException.INVALID_DEPOSIT_EVENT_LAYOUT: "mismatched block requests hash",
+        # Reth does not validate the sizes or offsets of the deposit
+        # contract logs. As a workaround we have set
+        # INVALID_DEPOSIT_EVENT_LAYOUT equal to INVALID_REQUESTS.
+        #
+        # Although this is out of spec, it is understood that this
+        # will not cause an issue so long as the mainnet/testnet
+        # deposit contracts don't change.
+        #
+        # The offsets are checked second and the sizes are checked
+        # third within the `is_valid_deposit_event_data` function:
+        # https://eips.ethereum.org/EIPS/eip-6110#block-validity
+        #
+        # EELS definition for `is_valid_deposit_event_data`:
+        # https://github.com/ethereum/execution-specs/blob/5ddb904fa7ba27daeff423e78466744c51e8cb6a/src/ethereum/forks/prague/requests.py#L51
         BlockException.INVALID_RECEIPTS_ROOT: "receipt root mismatch",
         BlockException.INVALID_STATE_ROOT: "mismatched block state root",
         BlockException.INVALID_BLOCK_HASH: "block hash mismatch",

tests/prague/eip6110_deposits/test_modified_contract.py

@@ -217,23 +217,6 @@ def test_invalid_layout(
                 txs=[tx],
                 exception=[
                     BlockException.INVALID_DEPOSIT_EVENT_LAYOUT,
-                    BlockException.INVALID_REQUESTS,
-                    # INVALID_REQUESTS is an alternative workaround for
-                    # Geth/Reth only.
-                    #
-                    # Geth/Reth do not validate the sizes or offsets of the
-                    # deposit contract logs.
-                    #
-                    # Although this is out of spec, it is understood that this
-                    # will not cause an issue so long as the mainnet/testnet
-                    # deposit contracts don't change.
-                    #
-                    # This offsets are checked second and the sizes are checked
-                    # third within the `is_valid_deposit_event_data` function:
-                    # https://eips.ethereum.org/EIPS/eip-6110#block-validity
-                    #
-                    # EELS definition for `is_valid_deposit_event_data`:
-                    # https://github.com/ethereum/execution-specs/blob/5ddb904fa7ba27daeff423e78466744c51e8cb6a/src/ethereum/forks/prague/requests.py#L51
                 ],
             ),
         ],
@@ -293,23 +276,6 @@ def test_invalid_log_length(blockchain_test: BlockchainTestFiller, pre: Alloc, s
                 txs=[tx],
                 exception=[
                     BlockException.INVALID_DEPOSIT_EVENT_LAYOUT,
-                    BlockException.INVALID_REQUESTS,
-                    # INVALID_REQUESTS is an alternative workaround for
-                    # Geth/Reth only.
-                    #
-                    # Geth/Reth do not validate the sizes or offsets of the
-                    # deposit contract logs.
-                    #
-                    # Although this is out of spec, it is understood that this
-                    # will not cause an issue so long as the mainnet/testnet
-                    # deposit contracts don't change.
-                    #
-                    # This offsets are checked second and the sizes are checked
-                    # third within the `is_valid_deposit_event_data` function:
-                    # https://eips.ethereum.org/EIPS/eip-6110#block-validity
-                    #
-                    # EELS definition for `is_valid_deposit_event_data`:
-                    # https://github.com/ethereum/execution-specs/blob/5ddb904fa7ba27daeff423e78466744c51e8cb6a/src/ethereum/forks/prague/requests.py#L51
                 ],
             ),
         ],