feat(tools,forks): Extend EEST to support EIP-7928 payload

src/ethereum_test_fixtures/blockchain.py

@@ -160,6 +160,7 @@ class FixtureHeader(CamelModel):
         None
     )
     requests_hash: Annotated[Hash, HeaderForkRequirement("requests")] | None = Field(None)
+    bal_hash: Annotated[Hash, HeaderForkRequirement("bal_hash")] | None = Field(None)
 
     fork: Fork | None = Field(None, exclude=True)
 
@@ -243,6 +244,7 @@ def genesis(cls, fork: Fork, env: Environment, state_root: Hash) -> "FixtureHead
             ),
             parent_beacon_block_root=env.parent_beacon_block_root,
             requests_hash=Requests() if fork.header_requests_required(0, 0) else None,
+            bal_hash=Hash(0) if fork.header_bal_hash_required(0, 0) else None,
             fork=fork,
         )
 
@@ -272,6 +274,7 @@ class FixtureExecutionPayload(CamelModel):
 
     transactions: List[Bytes]
     withdrawals: List[Withdrawal] | None = None
+    block_access_list: Bytes | None = Field(None)
 
     @classmethod
     def from_fixture_header(
@@ -300,9 +303,18 @@ def from_fixture_header(
     List[Bytes],
 ]
 
+EngineNewPayloadV5Parameters = Tuple[
+    FixtureExecutionPayload,
+    List[Hash],
+    Hash,
+    List[Bytes],
+    Bytes,  # block_access_list
+]
+
 # Important: We check EngineNewPayloadV3Parameters first as it has more fields, and pydantic
 # has a weird behavior when the smaller tuple is checked first.
 EngineNewPayloadParameters = Union[
+    EngineNewPayloadV5Parameters,
     EngineNewPayloadV4Parameters,
     EngineNewPayloadV3Parameters,
     EngineNewPayloadV1Parameters,
@@ -342,6 +354,7 @@ def from_fixture_header(
         transactions: List[Transaction],
         withdrawals: List[Withdrawal] | None,
         requests: List[Bytes] | None,
+        block_access_list: Bytes | None = None,
         **kwargs,
     ) -> "FixtureEngineNewPayload":
         """Create `FixtureEngineNewPayload` from a `FixtureHeader`."""
@@ -374,6 +387,10 @@ def from_fixture_header(
             if requests is None:
                 raise ValueError(f"Requests are required for ${fork}.")
             params.append(requests)
+        if fork.engine_new_payload_block_access_list(header.number, header.timestamp):
+            if block_access_list is None:
+                raise ValueError(f"Block access list is required for ${fork}.")
+            params.append(block_access_list)
 
         payload_params: EngineNewPayloadParameters = cast(
             EngineNewPayloadParameters,
@@ -420,6 +437,9 @@ class FixtureBlockBase(CamelModel):
     txs: List[FixtureTransaction] = Field(default_factory=list, alias="transactions")
     ommers: List[FixtureHeader] = Field(default_factory=list, alias="uncleHeaders")
     withdrawals: List[FixtureWithdrawal] | None = None
+    block_access_list: Bytes | None = Field(
+        None, description="Serialized EIP-7928 Block Access Lists"
+    )
 
     @computed_field(alias="blocknumber")  # type: ignore[misc]
     @cached_property

src/ethereum_test_forks/base_fork.py

@@ -216,6 +216,12 @@ def header_requests_required(cls, block_number: int = 0, timestamp: int = 0) ->
         """Return true if the header must contain beacon chain requests."""
         pass
 
+    @classmethod
+    @abstractmethod
+    def header_bal_hash_required(cls, block_number: int = 0, timestamp: int = 0) -> bool:
+        """Return true if the header must contain block access list hash."""
+        pass
+
     # Gas related abstract methods
 
     @classmethod
@@ -422,6 +428,14 @@ def engine_new_payload_requests(cls, block_number: int = 0, timestamp: int = 0)
         """Return true if the engine api version requires new payload calls to include requests."""
         pass
 
+    @classmethod
+    @abstractmethod
+    def engine_new_payload_block_access_list(
+        cls, block_number: int = 0, timestamp: int = 0
+    ) -> bool:
+        """Return true if the engine api version requires block access list."""
+        pass
+
     @classmethod
     @abstractmethod
     def engine_new_payload_target_blobs_per_block(

src/ethereum_test_forks/forks/forks.py

@@ -294,6 +294,13 @@ def engine_new_payload_requests(cls, block_number: int = 0, timestamp: int = 0)
         """At genesis, payloads do not have requests."""
         return False
 
+    @classmethod
+    def engine_new_payload_block_access_list(
+        cls, block_number: int = 0, timestamp: int = 0
+    ) -> bool:
+        """At genesis, payloads do not have block access list."""
+        return False
+
     @classmethod
     def engine_new_payload_target_blobs_per_block(
         cls,
@@ -1473,3 +1480,26 @@ def is_deployed(cls) -> bool:
     def solc_min_version(cls) -> Version:
         """Return minimum version of solc that supports this fork."""
         return Version.parse("1.0.0")  # set a high version; currently unknown
+
+
+class BlockAccessLists(Prague):
+    """A development fork for Block Access Lists."""
+
+    @classmethod
+    def header_bal_hash_required(cls, block_number: int = 0, timestamp: int = 0) -> bool:
+        """Hash of the block access list is required starting from this fork."""
+        return True
+
+    @classmethod
+    def engine_new_payload_block_access_list(
+        cls, block_number: int = 0, timestamp: int = 0
+    ) -> bool:
+        """From BlockAccessLists, new payloads include the block access list as a parameter."""
+        return True
+
+    @classmethod
+    def engine_new_payload_version(
+        cls, block_number: int = 0, timestamp: int = 0
+    ) -> Optional[int]:
+        """From BlockAccessLists, new payload calls must use version 5."""
+        return 5

src/ethereum_test_specs/blockchain.py

@@ -121,6 +121,7 @@ class Header(CamelModel):
     excess_blob_gas: Removable | HexNumber | None = None
     parent_beacon_block_root: Removable | Hash | None = None
     requests_hash: Removable | Hash | None = None
+    bal_hash: Removable | Hash | None = None
 
     REMOVE_FIELD: ClassVar[Removable] = Removable()
     """
@@ -240,6 +241,10 @@ class Block(Header):
     """
     Post state for verification after block execution in BlockchainTest
     """
+    block_access_list: Bytes | None = Field(None)
+    """
+        EIP-7928: Block-level access list (serialized).
+    """
 
     def set_environment(self, env: Environment) -> Environment:
         """
@@ -269,6 +274,14 @@ def set_environment(self, env: Environment) -> Environment:
             new_env_values["blob_gas_used"] = self.blob_gas_used
         if not isinstance(self.parent_beacon_block_root, Removable):
             new_env_values["parent_beacon_block_root"] = self.parent_beacon_block_root
+        if not isinstance(self.bal_hash, Removable) and self.block_access_list is not None:
+            new_env_values["bal_hash"] = self.block_access_list.keccak256()
+            new_env_values["block_access_list"] = self.block_access_list
+        if (
+            not isinstance(self.block_access_list, Removable)
+            and self.block_access_list is not None
+        ):
+            new_env_values["block_access_list"] = self.block_access_list
         """
         These values are required, but they depend on the previous environment,
         so they can be calculated here.
@@ -308,6 +321,7 @@ class BuiltBlock(CamelModel):
     expected_exception: BLOCK_EXCEPTION_TYPE = None
     engine_api_error_code: EngineAPIError | None = None
     fork: Fork
+    block_access_list: Bytes
 
     def get_fixture_block(self) -> FixtureBlock | InvalidFixtureBlock:
         """Get a FixtureBlockBase from the built block."""
@@ -319,6 +333,7 @@ def get_fixture_block(self) -> FixtureBlock | InvalidFixtureBlock:
                 if self.withdrawals is not None
                 else None
             ),
+            block_access_list=self.block_access_list,
             fork=self.fork,
         ).with_rlp(txs=self.txs)
 
@@ -347,6 +362,7 @@ def get_fixture_engine_new_payload(self) -> FixtureEngineNewPayload:
             transactions=self.txs,
             withdrawals=self.withdrawals,
             requests=self.requests,
+            block_access_list=self.block_access_list,
             validation_error=self.expected_exception,
             error_code=self.engine_api_error_code,
         )
@@ -574,6 +590,7 @@ def generate_block_data(
             expected_exception=block.exception,
             engine_api_error_code=block.engine_api_error_code,
             fork=fork,
+            block_access_list=block.block_access_list,
         )
 
         try:

src/ethereum_test_types/block_types.py

@@ -114,6 +114,10 @@ class Environment(EnvironmentGeneric[ZeroPaddedHexNumber]):
     withdrawals: List[Withdrawal] | None = Field(None)
     extra_data: Bytes = Field(Bytes(b"\x00"), exclude=True)
 
+    # EIP-7928: Block-level access lists
+    bal_hash: Hash | None = Field(None)
+    block_access_list: Bytes | None = Field(None)
+
     @computed_field  # type: ignore[misc]
     @cached_property
     def parent_hash(self) -> Hash | None:

tests/unscheduled/eip7928_block_level_access_lists/spec.py

@@ -2,6 +2,9 @@
 
 from dataclasses import dataclass
 
+ACTIVATION_FORK_NAME = "BlockAccessLists"
+"""The fork name for EIP-7928 activation."""
+
 
 @dataclass(frozen=True)
 class ReferenceSpec: