feat(tests): Typed txs are invalid and void before their fork (#1754)

* feat(tests): Typed txs are invalid and void before their fork

* fix(client_clis): Exception message

* fix(tests): Use parametrize_by_fork instead

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

---------

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

Author: pdobacz

docs/CHANGELOG.md

@@ -34,6 +34,7 @@ Test fixtures for use by clients are available for each release on the [Github r
 - ✨ Add tests for `modexp` and `ripemd` precompiled contracts ([#1691](https://github.com/ethereum/execution-specs/pull/1691)).
 - ✨ Add `ecrecover` precompile tests originating form `evmone` unittests ([#1685](https://github.com/ethereum/execution-specs/pull/1685)).
 - ✨ Add stack overflow tests and expand `BLOCKHASH` tests ([#1728](https://github.com/ethereum/execution-specs/pull/1728)).
+- ✨ Add tests that EIP-1559 and EIP-2930 typed txs are invalid and void before their fork ([#1754](https://github.com/ethereum/execution-specs/pull/1754)).
 
 ## [v5.3.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v5.3.0) - 2025-10-09
 

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

@@ -51,6 +51,9 @@ class EthrexExceptionMapper(ExceptionMapper):
         TransactionException.TYPE_3_TX_INVALID_BLOB_VERSIONED_HASH: (
             r"blob version not supported|Invalid blob versioned hash"
         ),
+        TransactionException.TYPE_2_TX_PRE_FORK: (
+            r"Type 2 transactions are not supported before the London fork"
+        ),
         TransactionException.TYPE_3_TX_PRE_FORK: (
             r"blob versioned hashes not supported|"
             r"Type 3 transactions are not supported before the Cancun fork"

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

@@ -350,6 +350,8 @@ class EvmoneExceptionMapper(ExceptionMapper):
         ),
         TransactionException.TYPE_4_TX_PRE_FORK: "transaction type not supported",
         TransactionException.TYPE_3_TX_PRE_FORK: "transaction type not supported",
+        TransactionException.TYPE_2_TX_PRE_FORK: "transaction type not supported",
+        TransactionException.TYPE_1_TX_PRE_FORK: "transaction type not supported",
         TransactionException.TYPE_3_TX_INVALID_BLOB_VERSIONED_HASH: "invalid blob hash version",
         TransactionException.TYPE_3_TX_BLOB_COUNT_EXCEEDED: "blob gas limit exceeded",
         TransactionException.TYPE_3_TX_ZERO_BLOBS: "empty blob hashes list",

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

@@ -195,6 +195,12 @@ class ExecutionSpecsExceptionMapper(ExceptionMapper):
         TransactionException.INSUFFICIENT_MAX_FEE_PER_GAS: (
             r"InsufficientMaxFeePerGasError|InvalidBlock"  # Temporary solution for issue #1981.
         ),
+        TransactionException.TYPE_1_TX_PRE_FORK: (
+            r"module '.*transactions' has no attribute 'AccessListTransaction'"
+        ),
+        TransactionException.TYPE_2_TX_PRE_FORK: (
+            r"'.*transactions' has no attribute 'FeeMarketTransaction'"
+        ),
         TransactionException.TYPE_3_TX_PRE_FORK: (
             r"module '.*transactions' has no attribute 'BlobTransaction'"
         ),

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

@@ -54,6 +54,12 @@ class GethExceptionMapper(ExceptionMapper):
         TransactionException.PRIORITY_GREATER_THAN_MAX_FEE_PER_GAS: (
             "max priority fee per gas higher than max fee per gas"
         ),
+        TransactionException.TYPE_1_TX_PRE_FORK: (
+            "transaction type not supported"
+        ),
+        TransactionException.TYPE_2_TX_PRE_FORK: (
+            "transaction type not supported"
+        ),
         TransactionException.TYPE_3_TX_PRE_FORK: (
             "transaction type not supported"
         ),

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

@@ -395,6 +395,12 @@ class NethermindExceptionMapper(ExceptionMapper):
         TransactionException.INSUFFICIENT_MAX_FEE_PER_BLOB_GAS: (
             "InsufficientMaxFeePerBlobGas: Not enough to cover blob gas fee"
         ),
+        TransactionException.TYPE_1_TX_PRE_FORK: (
+            "InvalidTxType: Transaction type in Custom is not supported"
+        ),
+        TransactionException.TYPE_2_TX_PRE_FORK: (
+            "InvalidTxType: Transaction type in Custom is not supported"
+        ),
         TransactionException.TYPE_3_TX_PRE_FORK: (
             "InvalidTxType: Transaction type in Custom is not supported"
         ),

packages/testing/src/execution_testing/exceptions/exceptions.py

@@ -269,6 +269,10 @@ class TransactionException(ExceptionBase):
     """
     Transaction's initcode for a contract-creating transaction is too large.
     """
+    TYPE_1_TX_PRE_FORK = auto()
+    """Transaction type 1 included before activation fork."""
+    TYPE_2_TX_PRE_FORK = auto()
+    """Transaction type 2 included before activation fork."""
     TYPE_3_TX_PRE_FORK = auto()
     """Transaction type 3 included before activation fork."""
     TYPE_3_TX_ZERO_BLOBS_PRE_FORK = auto()

packages/testing/src/execution_testing/exceptions/exceptions/transaction.py

@@ -153,6 +153,10 @@ class TransactionException(ExceptionBase):
     """
     Transaction's initcode for a contract-creating transaction is too large.
     """
+    TYPE_1_TX_PRE_FORK = auto()
+    """Transaction type 1 included before activation fork."""
+    TYPE_2_TX_PRE_FORK = auto()
+    """Transaction type 2 included before activation fork."""
     TYPE_3_TX_PRE_FORK = auto()
     """Transaction type 3 included before activation fork."""
     TYPE_3_TX_ZERO_BLOBS_PRE_FORK = auto()

tests/berlin/eip2930_access_list/test_tx_type.py

@@ -0,0 +1,73 @@
+"""Test the tx type validation for EIP-2930."""
+
+from typing import Generator
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    Fork,
+    ParameterSet,
+    StateTestFiller,
+    Transaction,
+    TransactionException,
+)
+from execution_testing import Opcodes as Op
+from execution_testing.forks import Byzantium
+
+from .spec import ref_spec_2930
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_2930.git_path
+REFERENCE_SPEC_VERSION = ref_spec_2930.version
+
+TX_TYPE = 1
+
+
+def tx_validity(fork: Fork) -> Generator[ParameterSet, None, None]:
+    """
+    Return a generator of parameters for the tx validity test.
+    """
+    valid = TX_TYPE in fork.tx_types()
+    yield pytest.param(
+        valid,
+        marks=[pytest.mark.exception_test] if not valid else [],
+        id="valid" if valid else "invalid",
+    )
+
+
+@pytest.mark.ported_from(
+    [
+        "https://github.com/ethereum/legacytests/blob/master/src/LegacyTests/Cancun/GeneralStateTestsFiller/stExample/accessListExampleFiller.yml"
+    ],
+    pr=["https://github.com/ethereum/execution-specs/pull/1754"],
+)
+@pytest.mark.parametrize_by_fork("valid", tx_validity)
+def test_eip2930_tx_validity(
+    state_test: StateTestFiller,
+    fork: Fork,
+    pre: Alloc,
+    valid: bool,
+) -> None:
+    """
+    Tests that an EIP-2930 tx is correctly rejected before fork activation.
+    """
+    account = pre.deploy_contract(
+        code=Op.SSTORE(0, 1),
+        storage={0: 0xDEADBEEF},
+    )
+    sender = pre.fund_eoa()
+
+    tx = Transaction(
+        to=account,
+        sender=sender,
+        gas_limit=100_000,
+        access_list=[],
+        protected=fork >= Byzantium,
+        error=TransactionException.TYPE_1_TX_PRE_FORK if not valid else None,
+    )
+
+    post = {account: Account(storage={0: 0xDEADBEEF if not valid else 1})}
+    if not valid:
+        post[sender] = pre[sender]  # type: ignore
+
+    state_test(pre=pre, post=post, tx=tx)

tests/london/eip1559_fee_market_change/__init__.py

@@ -0,0 +1,3 @@
+"""
+Tests for [EIP-1559: Fee market change for ETH 1.0 chain](https://eips.ethereum.org/EIPS/eip-1559).
+"""