fix(specs): check chain id

packages/testing/src/execution_testing/client_clis/clis/besu.py

@@ -326,6 +326,9 @@ class BesuExceptionMapper(ExceptionMapper):
             "transaction invalid max priority fee per gas cannot be greater "
             "than max fee per gas"
         ),
+        TransactionException.INVALID_CHAINID: (
+            "transaction invalid transaction was meant for chain id"
+        ),
         TransactionException.TYPE_3_TX_INVALID_BLOB_VERSIONED_HASH: (
             "Invalid versionedHash"
         ),

packages/testing/src/execution_testing/client_clis/clis/erigon.py

@@ -53,6 +53,7 @@ class ErigonExceptionMapper(ExceptionMapper):
         TransactionException.NONCE_MISMATCH_TOO_LOW: "nonce too low",
         TransactionException.NONCE_MISMATCH_TOO_HIGH: "nonce too high",
         TransactionException.GAS_ALLOWANCE_EXCEEDED: "gas limit reached",
+        TransactionException.INVALID_CHAINID: "invalid chain id for signer",
         TransactionException.TYPE_3_TX_PRE_FORK: (
             "blob txn is not supported by signer"
         ),

packages/testing/src/execution_testing/client_clis/clis/ethrex.py

@@ -17,6 +17,9 @@ class EthrexExceptionMapper(ExceptionMapper):
         TransactionException.TYPE_3_TX_MAX_BLOB_GAS_ALLOWANCE_EXCEEDED: (
             "Exceeded MAX_BLOB_GAS_PER_BLOCK"
         ),
+        TransactionException.INVALID_CHAINID: (
+            "Transaction has invalid chain id"
+        ),
         BlockException.INVALID_DEPOSIT_EVENT_LAYOUT: (
             "Invalid deposit request layout"
         ),

packages/testing/src/execution_testing/client_clis/clis/execution_specs.py

@@ -204,6 +204,10 @@ class ExecutionSpecsExceptionMapper(ExceptionMapper):
         TransactionException.INTRINSIC_GAS_BELOW_FLOOR_GAS_COST: (
             "InsufficientTransactionGasError"
         ),
+        TransactionException.INVALID_SIGNATURE_VRS: (
+            "InvalidSignatureError('bad"
+        ),
+        TransactionException.INVALID_CHAINID: ("WrongChainId"),
         TransactionException.INITCODE_SIZE_EXCEEDED: "InitCodeTooLargeError",
         TransactionException.PRIORITY_GREATER_THAN_MAX_FEE_PER_GAS: (
             "PriorityFeeGreaterThanMaxFeeError"

packages/testing/src/execution_testing/client_clis/clis/geth.py

@@ -54,6 +54,7 @@ class GethExceptionMapper(ExceptionMapper):
         TransactionException.PRIORITY_GREATER_THAN_MAX_FEE_PER_GAS: (
             "max priority fee per gas higher than max fee per gas"
         ),
+        TransactionException.INVALID_CHAINID: "invalid chain id for signer",
         TransactionException.TYPE_1_TX_PRE_FORK: (
             "transaction type not supported"
         ),

packages/testing/src/execution_testing/client_clis/clis/nethermind.py

@@ -413,6 +413,9 @@ class NethermindExceptionMapper(ExceptionMapper):
         ),
         TransactionException.NONCE_MISMATCH_TOO_LOW: (r"nonce too low"),
         TransactionException.NONCE_MISMATCH_TOO_HIGH: (r"nonce too high"),
+        TransactionException.INVALID_CHAINID: (
+            r"InvalidTxChainId|Signature is invalid."
+        ),
         TransactionException.TYPE_3_TX_WITH_FULL_BLOBS: (
             r"Transaction \d+ is not valid"
         ),

packages/testing/src/execution_testing/client_clis/clis/reth.py

@@ -27,6 +27,7 @@ class RethExceptionMapper(ExceptionMapper):
         TransactionException.GASLIMIT_PRICE_PRODUCT_OVERFLOW: "overflow",
         TransactionException.TYPE_3_TX_CONTRACT_CREATION: "unexpected length",
         TransactionException.TYPE_3_TX_WITH_FULL_BLOBS: "unexpected list",
+        TransactionException.INVALID_CHAINID: "invalid chain ID",
         TransactionException.TYPE_3_TX_INVALID_BLOB_VERSIONED_HASH: (
             "blob version not supported"
         ),

src/ethereum/forks/amsterdam/exceptions.py

@@ -4,14 +4,28 @@
 
 from typing import TYPE_CHECKING, Final
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import U64, Uint
 
 from ethereum.exceptions import InvalidBlock, InvalidTransaction
 
 if TYPE_CHECKING:
     from .transactions import Transaction
 
 
+class WrongChainIdError(InvalidTransaction):
+    """
+    Chain identifier from a transaction does not match the executing chain. See
+    [EIP-155].
+
+    [EIP-155]: https://eips.ethereum.org/EIPS/eip-155
+    """
+
+    def __init__(self, expected: U64, actual: U64):
+        super().__init__(f"expected chain_id `{expected}` but got `{actual}`")
+        self.expected = expected
+        self.actual = actual
+
+
 class TransactionTypeError(InvalidTransaction):
     """
     Unknown [EIP-2718] transaction type byte.

src/ethereum/forks/amsterdam/fork.py

@@ -58,6 +58,7 @@
     NoBlobDataError,
     PriorityFeeGreaterThanMaxFeeError,
     TransactionTypeContractCreationError,
+    WrongChainIdError,
 )
 from .fork_types import Authorization, BlockAccessIndex, VersionedHash
 from .requests import (
@@ -86,6 +87,7 @@
     LegacyTransaction,
     SetCodeTransaction,
     Transaction,
+    chain_id,
     decode_transaction,
     encode_transaction,
     get_transaction_hash,
@@ -575,7 +577,14 @@ def check_transaction(
     if tx_blob_gas_used > blob_gas_available:
         raise BlobGasLimitExceededError("blob gas limit exceeded")
 
-    sender_address = recover_sender(block_env.chain_id, tx)
+    tx_chain_id = chain_id(tx)
+    if tx_chain_id is not None and tx_chain_id != block_env.chain_id:
+        raise WrongChainIdError(
+            expected=block_env.chain_id,
+            actual=tx_chain_id,
+        )
+
+    sender_address = recover_sender(tx)
     sender_account = get_account(tx_state, sender_address)
 
     if isinstance(tx, FeeMarketCapableTransaction):

src/ethereum/forks/amsterdam/transactions.py

@@ -735,7 +735,25 @@ def count_tokens_in_data(data: bytes) -> Uint:
     return num_zeros + num_non_zeros * Uint(4)
 
 
-def recover_sender(chain_id: U64, tx: Transaction) -> Address:
+def chain_id(tx: Transaction) -> None | U64:
+    """
+    Extract the chain identifier from a transaction. See [EIP-155].
+
+    [EIP-155]: https://eips.ethereum.org/EIPS/eip-155
+    """
+    if isinstance(tx, LegacyTransaction):
+        if tx.v == 27 or tx.v == 28:
+            return None
+
+        if tx.v < U256(35):
+            raise InvalidSignatureError("bad v")
+
+        return U64((tx.v - U256(35)) >> U256(1))
+    else:
+        return tx.chain_id
+
+
+def recover_sender(tx: Transaction) -> Address:
     """
     Extracts the sender address from a transaction.
 
@@ -762,14 +780,14 @@ def recover_sender(chain_id: U64, tx: Transaction) -> Address:
                 r, s, v - U256(27), signing_hash_pre155(tx)
             )
         else:
-            chain_id_x2 = U256(chain_id) * U256(2)
-            if v != U256(35) + chain_id_x2 and v != U256(36) + chain_id_x2:
-                raise InvalidSignatureError("bad v")
+            assert v >= U256(35), "call chain_id before recover_sender"
+            tx_chain_id = U64((v - U256(35)) >> U256(1))
+            v = (v - U256(35)) & U256(1)
             public_key = secp256k1_recover(
                 r,
                 s,
-                v - U256(35) - chain_id_x2,
-                signing_hash_155(tx, chain_id),
+                v,
+                signing_hash_155(tx, tx_chain_id),
             )
     elif isinstance(tx, AccessListTransaction):
         if tx.y_parity not in (U256(0), U256(1)):

src/ethereum/forks/arrow_glacier/exceptions.py

@@ -4,11 +4,25 @@
 
 from typing import Final
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import U64, Uint
 
 from ethereum.exceptions import InvalidTransaction
 
 
+class WrongChainIdError(InvalidTransaction):
+    """
+    Chain identifier from a transaction does not match the executing chain. See
+    [EIP-155].
+
+    [EIP-155]: https://eips.ethereum.org/EIPS/eip-155
+    """
+
+    def __init__(self, expected: U64, actual: U64):
+        super().__init__(f"expected chain_id `{expected}` but got `{actual}`")
+        self.expected = expected
+        self.actual = actual
+
+
 class TransactionTypeError(InvalidTransaction):
     """
     Unknown [EIP-2718] transaction type byte.

src/ethereum/forks/arrow_glacier/fork.py

@@ -42,6 +42,7 @@
 from .exceptions import (
     InsufficientMaxFeePerGasError,
     PriorityFeeGreaterThanMaxFeeError,
+    WrongChainIdError,
 )
 from .state_tracker import (
     BlockState,
@@ -61,6 +62,7 @@
     FeeMarketTransaction,
     LegacyTransaction,
     Transaction,
+    chain_id,
     decode_transaction,
     encode_transaction,
     get_transaction_hash,
@@ -490,7 +492,14 @@ def check_transaction(
     gas_available = block_env.block_gas_limit - block_output.block_gas_used
     if tx.gas > gas_available:
         raise GasUsedExceedsLimitError("gas used exceeds limit")
-    sender_address = recover_sender(block_env.chain_id, tx)
+    tx_chain_id = chain_id(tx)
+    if tx_chain_id is not None and tx_chain_id != block_env.chain_id:
+        raise WrongChainIdError(
+            expected=block_env.chain_id,
+            actual=tx_chain_id,
+        )
+
+    sender_address = recover_sender(tx)
     sender_account = get_account(tx_state, sender_address)
 
     if isinstance(tx, FeeMarketTransaction):

src/ethereum/forks/arrow_glacier/transactions.py

@@ -376,7 +376,25 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     return GasCosts.TX_BASE + data_cost + create_cost + access_list_cost
 
 
-def recover_sender(chain_id: U64, tx: Transaction) -> Address:
+def chain_id(tx: Transaction) -> None | U64:
+    """
+    Extract the chain identifier from a transaction. See [EIP-155].
+
+    [EIP-155]: https://eips.ethereum.org/EIPS/eip-155
+    """
+    if isinstance(tx, LegacyTransaction):
+        if tx.v == 27 or tx.v == 28:
+            return None
+
+        if tx.v < U256(35):
+            raise InvalidSignatureError("bad v")
+
+        return U64((tx.v - U256(35)) >> U256(1))
+    else:
+        return tx.chain_id
+
+
+def recover_sender(tx: Transaction) -> Address:
     """
     Extracts the sender address from a transaction.
 
@@ -403,14 +421,14 @@ def recover_sender(chain_id: U64, tx: Transaction) -> Address:
                 r, s, v - U256(27), signing_hash_pre155(tx)
             )
         else:
-            chain_id_x2 = U256(chain_id) * U256(2)
-            if v != U256(35) + chain_id_x2 and v != U256(36) + chain_id_x2:
-                raise InvalidSignatureError("bad v")
+            assert v >= U256(35), "call chain_id before recover_sender"
+            tx_chain_id = U64((v - U256(35)) >> U256(1))
+            v = (v - U256(35)) & U256(1)
             public_key = secp256k1_recover(
                 r,
                 s,
-                v - U256(35) - chain_id_x2,
-                signing_hash_155(tx, chain_id),
+                v,
+                signing_hash_155(tx, tx_chain_id),
             )
     elif isinstance(tx, AccessListTransaction):
         if tx.y_parity not in (U256(0), U256(1)):

src/ethereum/forks/berlin/exceptions.py

@@ -4,9 +4,25 @@
 
 from typing import Final
 
+from ethereum_types.numeric import U64
+
 from ethereum.exceptions import InvalidTransaction
 
 
+class WrongChainIdError(InvalidTransaction):
+    """
+    Chain identifier from a transaction does not match the executing chain. See
+    [EIP-155].
+
+    [EIP-155]: https://eips.ethereum.org/EIPS/eip-155
+    """
+
+    def __init__(self, expected: U64, actual: U64):
+        super().__init__(f"expected chain_id `{expected}` but got `{actual}`")
+        self.expected = expected
+        self.actual = actual
+
+
 class TransactionTypeError(InvalidTransaction):
     """
     Unknown [EIP-2718] transaction type byte.

src/ethereum/forks/berlin/fork.py

@@ -39,6 +39,7 @@
 from . import vm
 from .blocks import Block, Header, Log, Receipt, encode_receipt
 from .bloom import logs_bloom
+from .exceptions import WrongChainIdError
 from .state_tracker import (
     BlockState,
     TransactionState,
@@ -56,6 +57,7 @@
     AccessListTransaction,
     LegacyTransaction,
     Transaction,
+    chain_id,
     decode_transaction,
     encode_transaction,
     get_transaction_hash,
@@ -403,7 +405,14 @@ def check_transaction(
     gas_available = block_env.block_gas_limit - block_output.block_gas_used
     if tx.gas > gas_available:
         raise GasUsedExceedsLimitError("gas used exceeds limit")
-    sender_address = recover_sender(block_env.chain_id, tx)
+    tx_chain_id = chain_id(tx)
+    if tx_chain_id is not None and tx_chain_id != block_env.chain_id:
+        raise WrongChainIdError(
+            expected=block_env.chain_id,
+            actual=tx_chain_id,
+        )
+
+    sender_address = recover_sender(tx)
     sender_account = get_account(tx_state, sender_address)
 
     max_gas_fee = tx.gas * tx.gas_price

src/ethereum/forks/berlin/transactions.py

@@ -292,7 +292,25 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
     return GasCosts.TX_BASE + data_cost + create_cost + access_list_cost
 
 
-def recover_sender(chain_id: U64, tx: Transaction) -> Address:
+def chain_id(tx: Transaction) -> None | U64:
+    """
+    Extract the chain identifier from a transaction. See [EIP-155].
+
+    [EIP-155]: https://eips.ethereum.org/EIPS/eip-155
+    """
+    if isinstance(tx, LegacyTransaction):
+        if tx.v == 27 or tx.v == 28:
+            return None
+
+        if tx.v < U256(35):
+            raise InvalidSignatureError("bad v")
+
+        return U64((tx.v - U256(35)) >> U256(1))
+    else:
+        return tx.chain_id
+
+
+def recover_sender(tx: Transaction) -> Address:
     """
     Extracts the sender address from a transaction.
 
@@ -319,14 +337,14 @@ def recover_sender(chain_id: U64, tx: Transaction) -> Address:
                 r, s, v - U256(27), signing_hash_pre155(tx)
             )
         else:
-            chain_id_x2 = U256(chain_id) * U256(2)
-            if v != U256(35) + chain_id_x2 and v != U256(36) + chain_id_x2:
-                raise InvalidSignatureError("bad v")
+            assert v >= U256(35), "call chain_id before recover_sender"
+            tx_chain_id = U64((v - U256(35)) >> U256(1))
+            v = (v - U256(35)) & U256(1)
             public_key = secp256k1_recover(
                 r,
                 s,
-                v - U256(35) - chain_id_x2,
-                signing_hash_155(tx, chain_id),
+                v,
+                signing_hash_155(tx, tx_chain_id),
             )
     elif isinstance(tx, AccessListTransaction):
         if tx.y_parity not in (U256(0), U256(1)):