chore(forks|tests): temp squashed commit for release.

Author: spencer-tb

docs/CHANGELOG.md

@@ -75,6 +75,8 @@ Users can select any of the artifacts depending on their testing needs for their
 - ✨ [EIP-7934](https://eips.ethereum.org/EIPS/eip-7934): Add test cases for the block RLP max limit of 10MiB ([#1730](https://github.com/ethereum/execution-spec-tests/pull/1730)).
 - ✨ [EIP-7939](https://eips.ethereum.org/EIPS/eip-7939) Add count leading zeros (CLZ) opcode tests for Osaka ([#1733](https://github.com/ethereum/execution-spec-tests/pull/1733)).
 - ✨ [EIP-7918](https://eips.ethereum.org/EIPS/eip-7918): Blob base fee bounded by execution cost test cases (initial), includes some adjustments to [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844) tests ([#1685](https://github.com/ethereum/execution-spec-tests/pull/1685)).
+- ✨ [EIP-7907](https://eips.ethereum.org/EIPS/eip-7907): Initial meter contract code size and increase limit tests cases ([#1777](https://github.com/ethereum/execution-spec-tests/pull/1777)).
+- 🔀 [EIP-3860](https://eips.ethereum.org/EIPS/eip-3860) tests cases updated for [EIP-7907](https://eips.ethereum.org/EIPS/eip-7907) ([#1777](https://github.com/ethereum/execution-spec-tests/pull/1777)).
 
 ## [v4.5.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v4.5.0) - 2025-05-14
 

src/ethereum_test_tools/code/generators.py

@@ -149,7 +149,7 @@ class CodeGasMeasure(Bytecode):
     To be considered when subtracting the value of the previous GAS operation,
     and to be popped at the end of the execution.
     """
-    sstore_key: int | Bytes
+    sstore_key: int | Bytes | Bytecode
     """
     Storage key to save the gas used.
     """
@@ -160,7 +160,7 @@ def __new__(
         code: Bytecode,
         overhead_cost: int = 0,
         extra_stack_items: int = 0,
-        sstore_key: int | Bytes = 0,
+        sstore_key: int | Bytes | Bytecode = 0,
         stop: bool = True,
     ):
         """Assemble the bytecode that measures gas usage."""

tests/osaka/eip7907_meter_contract_code_size/__init__.py

@@ -0,0 +1 @@
+"""Cross-client EIP-7907 Tests."""

tests/osaka/eip7907_meter_contract_code_size/conftest.py

@@ -0,0 +1,54 @@
+"""Fixtures for EIP-7907 meter contract code size tests."""
+
+import pytest
+
+from ethereum_test_forks import Fork
+from ethereum_test_tools import (
+    Address,
+    Alloc,
+    Bytecode,
+)
+from ethereum_test_tools.vm.opcode import Opcodes as Op
+from ethereum_test_types import Environment
+
+from .helpers import create_large_contract
+
+
+@pytest.fixture
+def env() -> Environment:
+    """Environment fixture with sufficient gas limit for large contract tests."""
+    return Environment(gas_limit=30_000_000)
+
+
+@pytest.fixture
+def large_contract_code() -> Bytecode:
+    """Return the default large contract code."""
+    return Op.STOP
+
+
+@pytest.fixture
+def large_contract_size(fork: Fork) -> int:
+    """Return the minimum contract size that triggers the large contract access gas."""
+    large_contract_size = fork.large_contract_size()
+    if large_contract_size is None:
+        return fork.max_code_size()
+    else:
+        return large_contract_size + 1
+
+
+@pytest.fixture
+def large_contract_bytecode(
+    large_contract_size: int,
+    large_contract_code: Bytecode | None,
+) -> bytes:
+    """Return the default large contract code."""
+    return create_large_contract(size=large_contract_size, prefix=large_contract_code)
+
+
+@pytest.fixture
+def large_contract_address(
+    pre: Alloc,
+    large_contract_bytecode: bytes,
+) -> Address:
+    """Create a large contract address."""
+    return pre.deploy_contract(large_contract_bytecode)

tests/osaka/eip7907_meter_contract_code_size/helpers.py

@@ -0,0 +1,15 @@
+"""Helper functions for the EIP-7907 meter contract code size tests."""
+
+from ethereum_test_tools import Bytecode
+
+
+def create_large_contract(
+    *,
+    size: int,
+    padding_byte: bytes = b"\0",
+    prefix: Bytecode | None = None,
+) -> bytes:
+    """Create a large contract with the given size and prefix."""
+    if prefix is None:
+        prefix = Bytecode()
+    return bytes(prefix + padding_byte * (size - len(prefix)))

tests/osaka/eip7907_meter_contract_code_size/spec.py

@@ -0,0 +1,28 @@
+"""Defines EIP-7907 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_7907 = ReferenceSpec("EIPS/eip-7907.md", "d758026fc3bd5ac21b652e73d244dee803b1fe44")
+
+
+@dataclass(frozen=True)
+class Spec:
+    """
+    Reference constants from EIP-7907 specification.
+
+    Note: Tests should use fork methods for actual values, not these constants directly.
+    """
+
+    MAX_CODE_SIZE = 0x40000
+    MAX_INIT_CODE_SIZE = 0x80000
+    LARGE_CONTRACT_THRESHOLD = 0x6000
+    GAS_INIT_CODE_WORD_COST = 2