Merge branch 'projects/zkevm' into projects/zkevm-bal-devnet-3

Author: jsign

packages/testing/src/execution_testing/__init__.py

@@ -67,6 +67,7 @@
     Environment,
     ExecutionWitnessCodesExpectation,
     ExecutionWitnessHeadersExpectation,
+    ExecutionWitnessStateExpectation,
     NetworkWrappedTransaction,
     Removable,
     Requests,
@@ -157,6 +158,7 @@
     "ConsolidationRequest",
     "ExecutionWitnessCodesExpectation",
     "ExecutionWitnessHeadersExpectation",
+    "ExecutionWitnessStateExpectation",
     "ExtCallGenerator",
     "DeploymentTestType",
     "DepositRequest",

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

@@ -678,7 +678,14 @@ class FixtureBlock(FixtureBlockBase):
     def without_rlp(self) -> FixtureBlockBase:
         """Return FixtureBlockBase without the RLP bytes set."""
         return FixtureBlockBase(
-            **self.model_dump(exclude={"rlp"}),
+            **self.model_dump(
+                exclude={
+                    "rlp",
+                    "execution_witness",
+                    "stateless_input_bytes",
+                    "stateless_output_bytes",
+                },
+            ),
         )
 
 
@@ -698,6 +705,9 @@ class InvalidFixtureBlock(CamelModel):
     rlp: Bytes
     expect_exception: ExceptionInstanceOrList
     rlp_decoded: FixtureBlockBase | None = Field(None, alias="rlp_decoded")
+    execution_witness: ExecutionWitness | None = None
+    stateless_input_bytes: Bytes | None = None
+    stateless_output_bytes: Bytes | None = None
 
 
 @post_state_validator()

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

@@ -732,6 +732,17 @@ def system_contracts(
         """Return list of system contracts supported by the fork."""
         pass
 
+    @classmethod
+    def execution_witness_implicit_code_addresses(
+        cls, *, block_number: int = 0, timestamp: int = 0
+    ) -> List[Address]:
+        """
+        Return addresses whose pre-state bytecodes are implicitly expected in
+        execution witnesses for block execution at this fork.
+        """
+        del block_number, timestamp
+        return []
+
     @classmethod
     @abstractmethod
     def deterministic_factory_predeploy_address(

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

@@ -2643,6 +2643,19 @@ def system_contracts(
             )
         ]
 
+    @classmethod
+    def execution_witness_implicit_code_addresses(
+        cls, *, block_number: int = 0, timestamp: int = 0
+    ) -> List[Address]:
+        """Cancun witnesses implicitly include beacon roots code."""
+        del block_number, timestamp
+        return [
+            Address(
+                0x000F3DF6D732807EF1319FB7B8BB8522D0BEAC02,
+                label="BEACON_ROOTS_ADDRESS",
+            )
+        ]
+
     @classmethod
     def pre_allocation_blockchain(
         cls, *, block_number: int = 0, timestamp: int = 0
@@ -2865,6 +2878,28 @@ def system_contracts(
             block_number=block_number, timestamp=timestamp
         )
 
+    @classmethod
+    def execution_witness_implicit_code_addresses(
+        cls, *, block_number: int = 0, timestamp: int = 0
+    ) -> List[Address]:
+        """Include tracked block-level system code."""
+        return [
+            Address(
+                0x00000961EF480EB55E80D19AD83579A64C007002,
+                label="WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS",
+            ),
+            Address(
+                0x0000BBDDC7CE488642FB579F8B00F3A590007251,
+                label="CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS",
+            ),
+            Address(
+                0x0000F90827F1C53A10CB7A02335B175320002935,
+                label="HISTORY_STORAGE_ADDRESS",
+            ),
+        ] + super(Prague, cls).execution_witness_implicit_code_addresses(
+            block_number=block_number, timestamp=timestamp
+        )
+
     @classmethod
     def max_request_type(
         cls, *, block_number: int = 0, timestamp: int = 0
@@ -3755,6 +3790,31 @@ def empty_block_bal_item_count(
         del block_number, timestamp
         return 15
 
+    @classmethod
+    def execution_witness_implicit_code_addresses(
+        cls, *, block_number: int = 0, timestamp: int = 0
+    ) -> List[Address]:
+        """Include tracked block-level system code."""
+        del block_number, timestamp
+        return [
+            Address(
+                0x000F3DF6D732807EF1319FB7B8BB8522D0BEAC02,
+                label="BEACON_ROOTS_ADDRESS",
+            ),
+            Address(
+                0x00000961EF480EB55E80D19AD83579A64C007002,
+                label="WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS",
+            ),
+            Address(
+                0x0000BBDDC7CE488642FB579F8B00F3A590007251,
+                label="CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS",
+            ),
+            Address(
+                0x0000F90827F1C53A10CB7A02335B175320002935,
+                label="HISTORY_STORAGE_ADDRESS",
+            ),
+        ]
+
     @classmethod
     def is_deployed(cls) -> bool:
         """Return True if this fork is deployed."""

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

@@ -218,6 +218,22 @@ def test_forks() -> None:
     )
 
 
+def test_amsterdam_execution_witness_implicit_code_addresses() -> None:
+    """Amsterdam exposes exactly the tracked ambient witness code addresses."""
+    addresses = [
+        address.hex()
+        for address in Amsterdam.execution_witness_implicit_code_addresses()
+    ]
+
+    assert addresses == [
+        "0x000f3df6d732807ef1319fb7b8bb8522d0beac02",
+        "0x00000961ef480eb55e80d19ad83579a64c007002",
+        "0x0000bbddc7ce488642fb579f8b00f3a590007251",
+        "0x0000f90827f1c53a10cb7a02335b175320002935",
+    ]
+    assert "0x00000000219ab540356cbb839cbe05303d7705fa" not in addresses
+
+
 class ForkInPydanticModel(BaseModel):
     """Fork in pydantic model."""
 

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

@@ -92,6 +92,7 @@
 from execution_testing.test_types.execution_witness import (
     ExecutionWitnessCodesExpectation,
     ExecutionWitnessHeadersExpectation,
+    ExecutionWitnessStateExpectation,
 )
 
 from .base import BaseTest, FillResult, OpMode, verify_result
@@ -148,6 +149,71 @@ def count_blobs(txs: List[Transaction]) -> int:
     )
 
 
+def execution_witness_implicit_codes_for_block(
+    *,
+    fork: Fork,
+    alloc: Alloc | LazyAlloc,
+    block_number: int,
+    timestamp: int,
+) -> List[Bytes]:
+    """
+    Return ambient witness bytecodes implied by block-level execution.
+
+    These codes are resolved from the effective pre-state for the block, not
+    from raw fork defaults, so test `pre` overrides are respected.
+    """
+    active_fork = fork.fork_at(block_number=block_number, timestamp=timestamp)
+    addresses = active_fork.execution_witness_implicit_code_addresses(
+        block_number=block_number,
+        timestamp=timestamp,
+    )
+    if not addresses:
+        return []
+
+    effective_alloc = alloc.get() if isinstance(alloc, LazyAlloc) else alloc
+
+    codes: List[Bytes] = []
+    seen: set[Bytes] = set()
+    for address in addresses:
+        if address not in effective_alloc:
+            continue
+        account = effective_alloc[address]
+        if account is None or len(account.code) == 0:
+            continue
+        code = Bytes(account.code)
+        if code in seen:
+            continue
+        codes.append(code)
+        seen.add(code)
+    return codes
+
+
+def with_execution_witness_implicit_codes(
+    *,
+    expectation: ExecutionWitnessCodesExpectation,
+    fork: Fork,
+    alloc: Alloc | LazyAlloc,
+    block_number: int,
+    timestamp: int,
+) -> ExecutionWitnessCodesExpectation:
+    """Return expectation copy with ambient block-level codes added."""
+    codes_present = list(expectation.codes_present)
+    seen = set(codes_present)
+
+    for code in execution_witness_implicit_codes_for_block(
+        fork=fork,
+        alloc=alloc,
+        block_number=block_number,
+        timestamp=timestamp,
+    ):
+        if code in seen:
+            continue
+        codes_present.append(code)
+        seen.add(code)
+
+    return expectation.model_copy(update={"codes_present": codes_present})
+
+
 class Header(CamelModel):
     """Header type used to describe block header properties in test specs."""
 
@@ -283,6 +349,13 @@ class Block(Header):
     If set, the execution witness codes will be verified and potentially
     modified for invalid tests.
     """
+    expected_execution_witness_state: (
+        ExecutionWitnessStateExpectation | None
+    ) = None
+    """
+    If set, the execution witness state will be verified and potentially
+    modified for invalid tests.
+    """
     expected_execution_witness_headers: (
         ExecutionWitnessHeadersExpectation | None
     ) = None
@@ -464,6 +537,9 @@ def get_fixture_block(
                     in self.expected_exception
                     else fixture_block.without_rlp()
                 ),
+                execution_witness=self.execution_witness,
+                stateless_input_bytes=self.stateless_input_bytes,
+                stateless_output_bytes=self.stateless_output_bytes,
             )
 
         return fixture_block
@@ -830,17 +906,33 @@ def generate_block_data(
                 # update the header hash
                 header.block_access_list_hash = Hash(bal.rlp.keccak256())
 
-        # If expected witness codes defined, verify against actual
+        # If expected witness state/codes defined, verify against actual
         t8n_witness = transition_tool_output.result.execution_witness
         execution_witness = t8n_witness
+        state_expectation = block.expected_execution_witness_state
+        if state_expectation is not None and execution_witness is not None:
+            state_expectation.verify_against(execution_witness)
+            execution_witness = state_expectation.modify_if_invalid_test(
+                execution_witness
+            )
+
         if (
             block.expected_execution_witness_codes is not None
-            and t8n_witness is not None
+            and execution_witness is not None
         ):
-            block.expected_execution_witness_codes.verify_against(t8n_witness)
+            effective_codes_expectation = (
+                with_execution_witness_implicit_codes(
+                    expectation=block.expected_execution_witness_codes,
+                    fork=self.fork,
+                    alloc=previous_alloc,
+                    block_number=env.number,
+                    timestamp=env.timestamp,
+                )
+            )
+            effective_codes_expectation.verify_against(execution_witness)
             execution_witness = (
                 block.expected_execution_witness_codes.modify_if_invalid_test(
-                    t8n_witness
+                    execution_witness
                 )
             )
 
@@ -892,6 +984,11 @@ def generate_block_data(
                     block.expected_block_access_list is not None
                     and block.expected_block_access_list._modifier is not None
                 )
+                and not (
+                    block.expected_execution_witness_state is not None
+                    and block.expected_execution_witness_state._modifier
+                    is not None
+                )
                 and not (
                     block.expected_execution_witness_codes is not None
                     and block.expected_execution_witness_codes._modifier

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

@@ -55,6 +55,7 @@
     Environment,
     ExecutionWitnessCodesExpectation,
     ExecutionWitnessHeadersExpectation,
+    ExecutionWitnessStateExpectation,
     Transaction,
 )
 
@@ -88,6 +89,9 @@ class StateTest(BaseTest):
     expected_execution_witness_codes: Optional[
         ExecutionWitnessCodesExpectation
     ] = None
+    expected_execution_witness_state: Optional[
+        ExecutionWitnessStateExpectation
+    ] = None
     expected_execution_witness_headers: Optional[
         ExecutionWitnessHeadersExpectation
     ] = None
@@ -326,6 +330,9 @@ def _generate_blockchain_blocks(self) -> List[Block]:
             "expected_execution_witness_codes": (
                 self.expected_execution_witness_codes
             ),
+            "expected_execution_witness_state": (
+                self.expected_execution_witness_state
+            ),
             "expected_execution_witness_headers": (
                 self.expected_execution_witness_headers
             ),

packages/testing/src/execution_testing/test_types/__init__.py

@@ -23,6 +23,7 @@
     ExecutionWitness,
     ExecutionWitnessCodesExpectation,
     ExecutionWitnessHeadersExpectation,
+    ExecutionWitnessStateExpectation,
     ExecutionWitnessValidationError,
 )
 from .helpers import (
@@ -80,6 +81,7 @@
     "ExecutionWitness",
     "ExecutionWitnessCodesExpectation",
     "ExecutionWitnessHeadersExpectation",
+    "ExecutionWitnessStateExpectation",
     "ExecutionWitnessValidationError",
     "NetworkWrappedTransaction",
     "Removable",

packages/testing/src/execution_testing/test_types/execution_witness/__init__.py

@@ -9,12 +9,14 @@
 from .expectations import (
     ExecutionWitnessCodesExpectation,
     ExecutionWitnessHeadersExpectation,
+    ExecutionWitnessStateExpectation,
 )
 from .types import ExecutionWitness
 
 __all__ = [
     "ExecutionWitness",
     "ExecutionWitnessCodesExpectation",
     "ExecutionWitnessHeadersExpectation",
+    "ExecutionWitnessStateExpectation",
     "ExecutionWitnessValidationError",
 ]