chore(cli): reth/geth 6110 exception mapper (#2271)

* chore(cli): reth 6110 exception mapper.

* chore(cli): lint me baby one more time.

* chore(cli): bump geth 6110 as well.

* Update src/ethereum_clis/clis/reth.py

---------

Co-authored-by: Mario Vega <[email protected]>

Author: spencer-tb

src/ethereum_clis/clis/geth.py

@@ -72,26 +72,10 @@ class GethExceptionMapper(ExceptionMapper):
         TransactionException.INITCODE_SIZE_EXCEEDED: "max initcode size exceeded",
         TransactionException.NONCE_MISMATCH_TOO_LOW: "nonce too low",
         TransactionException.NONCE_MISMATCH_TOO_HIGH: "nonce too high",
-        BlockException.INVALID_DEPOSIT_EVENT_LAYOUT: "unable to parse deposit data",
         BlockException.INCORRECT_BLOB_GAS_USED: "blob gas used mismatch",
         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",
@@ -107,6 +91,23 @@ class GethExceptionMapper(ExceptionMapper):
             r"blob gas used \d+ exceeds maximum allowance \d+"
         ),
         BlockException.INVALID_GAS_USED_ABOVE_LIMIT: r"invalid gasUsed: have \d+, gasLimit \d+",
+        BlockException.INVALID_DEPOSIT_EVENT_LAYOUT: (
+            r"invalid requests hash|failed to parse deposit logs"
+        ),
+        # 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
     }
 
 

src/ethereum_clis/clis/reth.py

@@ -33,21 +33,6 @@ 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",