feat(tests): additional tests for header validation rules

pdobacz · pdobacz · commit e6e34cf28aea · 2025-10-29T16:01:26.000+01:00
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -25,6 +25,7 @@ Test fixtures for use by clients are available for each release on the [Github r
 - 🐞 Fix BALs opcode OOG test vectors by updating the Amsterdam commit hash in specs and validating appropriately on the testing side ([#2293](https://github.com/ethereum/execution-spec-tests/pull/2293)).
 - ✨ Fix test vector for BALs SSTORE with OOG by pointing to updated specs; add new boundary conditions cases for SSTORE w/ OOG ([#2297](https://github.com/ethereum/execution-spec-tests/pull/2297)).
 - ✨ Expand cases to test *CALL opcodes causing OOG ([#1703](https://github.com/ethereum/execution-specs/pull/1703)).
+- ✨ Add a test case for base fee in block check after London ([#1702](https://github.com/ethereum/execution-specs/pull/1702))
 
 ## [v5.3.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v5.3.0) - 2025-10-09
 
diff --git a/packages/testing/src/execution_testing/client_clis/clis/besu.py b/packages/testing/src/execution_testing/client_clis/clis/besu.py
@@ -272,6 +272,11 @@ class BesuExceptionMapper(ExceptionMapper):
             "Payload BlobGasUsed does not match calculated BlobGasUsed"
         ),
         BlockException.INVALID_GAS_USED_ABOVE_LIMIT: "Header validation failed (FULL)",
+        BlockException.INVALID_GASLIMIT: "Header validation failed (FULL)",
+        BlockException.EXTRA_DATA_TOO_BIG: "Header validation failed (FULL)",
+        BlockException.INVALID_BLOCK_NUMBER: "Header validation failed (FULL)",
+        BlockException.INVALID_BASEFEE_PER_GAS: "Header validation failed (FULL)",
+        BlockException.INVALID_BLOCK_TIMESTAMP_OLDER_THAN_PARENT: "block timestamp not greater than parent",
     }
     mapping_regex = {
         BlockException.INVALID_REQUESTS: (
diff --git a/packages/testing/src/execution_testing/client_clis/clis/erigon.py b/packages/testing/src/execution_testing/client_clis/clis/erigon.py
@@ -46,6 +46,11 @@ class ErigonExceptionMapper(ExceptionMapper):
         BlockException.INVALID_REQUESTS: "invalid requests root hash in header",
         BlockException.INVALID_BLOCK_HASH: "invalid block hash",
         BlockException.RLP_BLOCK_LIMIT_EXCEEDED: "block exceeds max rlp size",
+        BlockException.INVALID_BASEFEE_PER_GAS: "invalid block: invalid baseFee",
+        BlockException.INVALID_BLOCK_TIMESTAMP_OLDER_THAN_PARENT: "invalid block: timestamp older than parent",
+        BlockException.INVALID_BLOCK_NUMBER: "invalid block number",
+        BlockException.EXTRA_DATA_TOO_BIG: "invalid block: extra-data longer than 32 bytes",
+        BlockException.INVALID_GASLIMIT: "invalid block: invalid gas limit",
     }
     mapping_regex = {
         TransactionException.GAS_LIMIT_EXCEEDS_MAXIMUM: (
diff --git a/packages/testing/src/execution_testing/client_clis/clis/ethrex.py b/packages/testing/src/execution_testing/client_clis/clis/ethrex.py
@@ -28,6 +28,7 @@ class EthrexExceptionMapper(ExceptionMapper):
         ),
         BlockException.INVALID_GAS_USED: "Gas used doesn't match value in header",
         BlockException.INCORRECT_BLOB_GAS_USED: "Blob gas used doesn't match value in header",
+        BlockException.INVALID_BASEFEE_PER_GAS: "Base fee per gas is incorrect",
     }
     mapping_regex = {
         TransactionException.PRIORITY_GREATER_THAN_MAX_FEE_PER_GAS: (
diff --git a/packages/testing/src/execution_testing/client_clis/clis/geth.py b/packages/testing/src/execution_testing/client_clis/clis/geth.py
@@ -87,6 +87,14 @@ class GethExceptionMapper(ExceptionMapper):
         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",
+        BlockException.INVALID_BAL_EXTRA_ACCOUNT: "BAL change not reported in computed",
+        BlockException.INVALID_BAL_MISSING_ACCOUNT: "additional mutations compared to BAL",
+        BlockException.INVALID_BLOCK_ACCESS_LIST: "unequal",
+        BlockException.INVALID_BASEFEE_PER_GAS: "invalid baseFee",
+        BlockException.INVALID_BLOCK_TIMESTAMP_OLDER_THAN_PARENT: "invalid timestamp",
+        BlockException.INVALID_GASLIMIT: "invalid gas limit",
+        BlockException.INVALID_BLOCK_NUMBER: "invalid block number",
+        BlockException.EXTRA_DATA_TOO_BIG: "invalid extradata length",
     }
     mapping_regex: ClassVar[Dict[ExceptionBase, str]] = {
         TransactionException.TYPE_3_TX_MAX_BLOB_GAS_ALLOWANCE_EXCEEDED: (
diff --git a/packages/testing/src/execution_testing/client_clis/clis/nethermind.py b/packages/testing/src/execution_testing/client_clis/clis/nethermind.py
@@ -425,6 +425,11 @@ class NethermindExceptionMapper(ExceptionMapper):
         BlockException.INVALID_DEPOSIT_EVENT_LAYOUT: (
             "DepositsInvalid: Invalid deposit event layout:"
         ),
+        BlockException.INVALID_BASEFEE_PER_GAS: "InvalidBaseFeePerGas: Does not match calculated",
+        BlockException.INVALID_BLOCK_TIMESTAMP_OLDER_THAN_PARENT: "InvalidTimestamp: Timestamp in header cannot be lower than ancestor",
+        BlockException.INVALID_BLOCK_NUMBER: "InvalidBlockNumber: Block number does not match the parent",
+        BlockException.EXTRA_DATA_TOO_BIG: "InvalidExtraData: Extra data in header is not valid",
+        BlockException.INVALID_GASLIMIT: "InvalidGasLimit: Gas limit is not correct",
     }
     mapping_regex = {
         TransactionException.INSUFFICIENT_ACCOUNT_FUNDS: (
diff --git a/packages/testing/src/execution_testing/client_clis/clis/nimbus.py b/packages/testing/src/execution_testing/client_clis/clis/nimbus.py
@@ -108,5 +108,11 @@ class NimbusExceptionMapper(ExceptionMapper):
             # TODO:
             "ExceededBlockSizeLimit: Exceeded block size limit"
         ),
+        BlockException.INVALID_BASEFEE_PER_GAS: "invalid baseFee",
+        BlockException.INVALID_BLOCK_NUMBER: "Blocks must be numbered consecutively",
+        BlockException.INVALID_BLOCK_TIMESTAMP_OLDER_THAN_PARENT: "Invalid timestamp",
+        BlockException.INVALID_GASLIMIT: "invalid gas limit",
+        BlockException.INVALID_GAS_USED_ABOVE_LIMIT: "gasUsed should be non negative and smaller or equal gasLimit",
+        BlockException.INVALID_BLOCK_HASH: "blockhash mismatch",
     }
     mapping_regex: ClassVar[Dict[ExceptionBase, str]] = {}
diff --git a/packages/testing/src/execution_testing/client_clis/clis/reth.py b/packages/testing/src/execution_testing/client_clis/clis/reth.py
@@ -39,6 +39,8 @@ class RethExceptionMapper(ExceptionMapper):
         BlockException.INVALID_BLOCK_HASH: "block hash mismatch",
         BlockException.INVALID_GAS_USED: "block gas used mismatch",
         BlockException.RLP_BLOCK_LIMIT_EXCEEDED: "block is too large: ",
+        BlockException.INVALID_BASEFEE_PER_GAS: "block base fee mismatch",
+        BlockException.EXTRA_DATA_TOO_BIG: "invalid payload extra data",
     }
     mapping_regex = {
         TransactionException.NONCE_MISMATCH_TOO_LOW: r"nonce \d+ too low, expected \d+",
@@ -88,4 +90,11 @@ class RethExceptionMapper(ExceptionMapper):
         BlockException.INCORRECT_BLOCK_FORMAT: (
             r"Block's access list is invalid."
         ),
+        BlockException.INVALID_GASLIMIT: (r"child gas_limit \d+ max .* is .*"),
+        BlockException.INVALID_BLOCK_TIMESTAMP_OLDER_THAN_PARENT: (
+            r"block timestamp \d+ is in the past compared to the parent timestamp \d+"
+        ),
+        BlockException.INVALID_BLOCK_NUMBER: (
+            r"block number \d+ does not match parent block number \d+"
+        ),
     }
diff --git a/tests/london/__init__.py b/tests/london/__init__.py
@@ -0,0 +1 @@
+"""Test cases for EVM functionality introduced in London."""
diff --git a/tests/london/validation/__init__.py b/tests/london/validation/__init__.py
@@ -0,0 +1,3 @@
+"""
+Test for validation rules that apply for all forks starting from London.
+"""
diff --git a/tests/london/validation/test_header.py b/tests/london/validation/test_header.py
@@ -0,0 +1,38 @@
+"""Test the validations applying after London."""
+
+import pytest
+from execution_testing.base_types.composite_types import Alloc
+from execution_testing.exceptions.exceptions.block import BlockException
+from execution_testing.specs.blockchain import (
+    Block,
+    BlockchainTestFiller,
+    Header,
+)
+
+
+@pytest.mark.valid_from("London")
+@pytest.mark.exception_test
+@pytest.mark.parametrize(
+    "field,invalid_value,exception",
+    [
+        ("base_fee_per_gas", 1, BlockException.INVALID_BASEFEE_PER_GAS),
+    ],
+)
+def test_invalid_header(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    field: str,
+    invalid_value: int,
+    exception: BlockException | list[BlockException],
+) -> None:
+    """
+    Tests that a block with an invalid header (e.g. base_fee_per_gas) is
+    rejected.
+    """
+    invalid_fields = {field: invalid_value}
+
+    block = Block(
+        txs=[], rlp_modifier=Header(**invalid_fields), exception=exception
+    )
+
+    blockchain_test(pre=pre, post={}, blocks=[block])

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ class EthrexExceptionMapper(ExceptionMapper):`
`28`	`28`	`),`
`29`	`29`	`BlockException.INVALID_GAS_USED: "Gas used doesn't match value in header",`
`30`	`30`	`BlockException.INCORRECT_BLOB_GAS_USED: "Blob gas used doesn't match value in header",`
	`31`	`+ BlockException.INVALID_BASEFEE_PER_GAS: "Base fee per gas is incorrect",`
`31`	`32`	`}`
`32`	`33`	`mapping_regex = {`
`33`	`34`	`TransactionException.PRIORITY_GREATER_THAN_MAX_FEE_PER_GAS: (`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+"""Test cases for EVM functionality introduced in London."""`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+"""`
	`2`	`+Test for validation rules that apply for all forks starting from London.`
	`3`	`+"""`