fix(tests): Remove BAL checks in osaka; opt for eip7928 branch

- Remove BAL-specific checks in Osaka so we have a cleaner implementation
  of Amsterdam when re-creating. This was a remnant of working on tests
  and specs separately but then merging the repos together implementation
  ``forks/osaka`` as the base branch.

Author: fselmo

docs/CHANGELOG.md

@@ -13,6 +13,7 @@ Test fixtures for use by clients are available for each release on the [Github r
 #### `fill`
 
 - 🐞 Allow `evmone` to fill Prague and Osaka blockchain tests (mainly modified deposit contract tests) ([#1689](https://github.com/ethereum/execution-specs/pull/1689))
+- 🐞 Turn off Block-Level Access List related checks when filling tests for Amsterdam ([#1737](https://github.com/ethereum/execution-specs/pull/1737))
 
 #### `consume`
 

packages/testing/src/execution_testing/fixtures/blockchain.py

@@ -199,9 +199,6 @@ class FixtureHeader(CamelModel):
     requests_hash: (
         Annotated[Hash, HeaderForkRequirement("requests")] | None
     ) = Field(None)
-    block_access_list_hash: (
-        Annotated[Hash, HeaderForkRequirement("bal_hash")] | None
-    ) = Field(None, alias="blockAccessListHash")
 
     fork: Fork | None = Field(None, exclude=True)
 
@@ -286,11 +283,6 @@ def genesis(cls, fork: Fork, env: Environment, state_root: Hash) -> Self:
             "requests_hash": Requests()
             if fork.header_requests_required(block_number=0, timestamp=0)
             else None,
-            "block_access_list_hash": (
-                BlockAccessList().rlp_hash
-                if fork.header_bal_hash_required(block_number=0, timestamp=0)
-                else None
-            ),
             "fork": fork,
         }
         return cls(**environment_values, **extras)
@@ -416,14 +408,6 @@ def from_fixture_header(
             "Invalid header for engine_newPayload"
         )
 
-        if fork.engine_execution_payload_block_access_list(
-            block_number=header.number, timestamp=header.timestamp
-        ):
-            if block_access_list is None:
-                raise ValueError(
-                    f"`block_access_list` is required in engine `ExecutionPayload` for >={fork}."
-                )
-
         execution_payload = FixtureExecutionPayload.from_fixture_header(
             header=header,
             transactions=transactions,

packages/testing/src/execution_testing/forks/base_fork.py

@@ -345,14 +345,6 @@ def header_requests_required(
         """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
@@ -718,17 +710,6 @@ def engine_new_payload_target_blobs_per_block(
         """
         pass
 
-    @classmethod
-    @abstractmethod
-    def engine_execution_payload_block_access_list(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """
-        Return `True` if the engine api version requires execution payload to
-        include a `block_access_list`.
-        """
-        pass
-
     @classmethod
     @abstractmethod
     def engine_payload_attribute_target_blobs_per_block(

packages/testing/src/execution_testing/forks/forks/forks.py

@@ -443,14 +443,6 @@ def header_requests_required(
         del block_number, timestamp
         return False
 
-    @classmethod
-    def header_bal_hash_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """At genesis, header must not contain block access list hash."""
-        del block_number, timestamp
-        return False
-
     @classmethod
     def engine_new_payload_version(
         cls, *, block_number: int = 0, timestamp: int = 0
@@ -491,14 +483,6 @@ def engine_new_payload_requests(
         del block_number, timestamp
         return False
 
-    @classmethod
-    def engine_execution_payload_block_access_list(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """At genesis, payloads do not have block access list."""
-        del block_number, timestamp
-        return False
-
     @classmethod
     def engine_new_payload_target_blobs_per_block(
         cls,
@@ -2456,16 +2440,6 @@ class BPO5(BPO4, bpo_fork=True):
 class Amsterdam(Osaka):
     """Amsterdam fork."""
 
-    @classmethod
-    def header_bal_hash_required(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """
-        From Amsterdam, header must contain block access list hash (EIP-7928).
-        """
-        del block_number, timestamp
-        return True
-
     @classmethod
     def is_deployed(cls) -> bool:
         """Return True if this fork is deployed."""
@@ -2479,17 +2453,6 @@ def engine_new_payload_version(
         del block_number, timestamp
         return 5
 
-    @classmethod
-    def engine_execution_payload_block_access_list(
-        cls, *, block_number: int = 0, timestamp: int = 0
-    ) -> bool:
-        """
-        From Amsterdam, engine execution payload includes `block_access_list`
-        as a parameter.
-        """
-        del block_number, timestamp
-        return True
-
 
 class EOFv1(Prague, solc_name="cancun"):
     """EOF fork."""

packages/testing/src/execution_testing/specs/blockchain.py

@@ -685,24 +685,6 @@ def generate_block_data(
             )
             requests_list = block.requests
 
-        if self.fork.header_bal_hash_required(
-            block_number=header.number, timestamp=header.timestamp
-        ):
-            assert (
-                transition_tool_output.result.block_access_list is not None
-            ), (
-                "Block access list is required for this block but was not provided "
-                "by the transition tool"
-            )
-
-            rlp = transition_tool_output.result.block_access_list.rlp
-            computed_bal_hash = Hash(rlp.keccak256())
-            assert computed_bal_hash == header.block_access_list_hash, (
-                "Block access list hash in header does not match the "
-                f"computed hash from BAL: {header.block_access_list_hash} "
-                f"!= {computed_bal_hash}"
-            )
-
         if block.rlp_modifier is not None:
             # Modify any parameter specified in the `rlp_modifier` after
             # transition tool processing.
@@ -711,23 +693,6 @@ def generate_block_data(
                 self.fork
             )  # Deleted during `apply` because `exclude=True`
 
-        # Process block access list - apply transformer if present for invalid
-        # tests
-        t8n_bal = transition_tool_output.result.block_access_list
-        bal = t8n_bal
-        if (
-            block.expected_block_access_list is not None
-            and t8n_bal is not None
-        ):
-            block.expected_block_access_list.verify_against(t8n_bal)
-
-            bal = block.expected_block_access_list.modify_if_invalid_test(
-                t8n_bal
-            )
-            if bal != t8n_bal:
-                # If the BAL was modified, update the header hash
-                header.block_access_list_hash = Hash(bal.rlp.keccak256())
-
         built_block = BuiltBlock(
             header=header,
             alloc=transition_tool_output.alloc,
@@ -740,7 +705,7 @@ def generate_block_data(
             expected_exception=block.exception,
             engine_api_error_code=block.engine_api_error_code,
             fork=self.fork,
-            block_access_list=bal,
+            block_access_list=None,
         )
 
         try: