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

Author: pdobacz

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

@@ -50,6 +50,9 @@ class EthrexExceptionMapper(ExceptionMapper):
         TransactionException.TYPE_3_TX_INVALID_BLOB_VERSIONED_HASH: (
             r"blob version not supported|Invalid blob versioned hash"
         ),
+        TransactionException.TYPE_3_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/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,91 @@
+"""Test the tx type validation for EIP-2930."""
+
+import pytest
+from execution_testing import (
+    Account,
+    Alloc,
+    Environment,
+    Fork,
+    StateTestFiller,
+    Transaction,
+    TransactionException,
+)
+from execution_testing import Opcodes as Op
+from execution_testing.forks import Berlin, Byzantium
+from requests_cache import Callable
+
+from .spec import ref_spec_2930
+
+REFERENCE_SPEC_GIT_PATH = ref_spec_2930.git_path
+REFERENCE_SPEC_VERSION = ref_spec_2930.version
+
+
+@pytest.fixture
+def eip2930_tx_validity_test(
+    state_test: StateTestFiller, pre: Alloc, fork: Fork, env: Environment
+) -> Callable[[], None]:
+    """
+    Returns a function which applies a `state_test`, where a typed transaction
+    is either valid and has an effect on state or not, depending on the fork.
+    """
+
+    def test_function() -> None:
+        valid = fork >= Berlin
+
+        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(env=env, pre=pre, post=post, tx=tx)
+
+    return test_function
+
+
+@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.exception_test
+@pytest.mark.valid_until("Istanbul")
+def test_eip2930_tx_invalid(
+    eip2930_tx_validity_test: Callable[[], None],
+) -> None:
+    """
+    Tests that an EIP-2930 tx has no effect before Berlin.
+    """
+    eip2930_tx_validity_test()
+
+
+@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.valid_from("Berlin")
+def test_eip2930_tx_valid(
+    eip2930_tx_validity_test: Callable[[], None],
+) -> None:
+    """
+    Tests that an EIP-2930 tx has an effect after Berlin.
+    """
+    eip2930_tx_validity_test()

tests/london/__init__.py

@@ -0,0 +1 @@
+"""Test cases for EVM functionality introduced in London."""

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).
+"""

tests/london/eip1559_fee_market_change/spec.py

@@ -0,0 +1,16 @@
+"""Defines EIP-1559 specification constants and functions."""
+
+from dataclasses import dataclass
+
+
+@dataclass(frozen=True)
+class ReferenceSpec:
+    """Defines the reference spec version and git path."""
+
+    git_path: str
+    version: str
+
+
+ref_spec_1559 = ReferenceSpec(
+    "EIPS/eip-1559.md", "ba6c342c23164072adb500c3136e3ae6eabff306"
+)