fix(tests): Rebase updates

Author: marioevz

tests/benchmark/stateful/bloatnet/depth_benchmarks/test_deep_branch.py

@@ -29,13 +29,14 @@
 
 import pytest
 from execution_testing import (
-    DETERMINISTIC_DEPLOYMENT_CONTRACT_ADDRESS,
+    DETERMINISTIC_FACTORY_ADDRESS,
     EOA,
     Account,
     Address,
     Alloc,
     Block,
     BlockchainTestFiller,
+    Bytecode,
     Bytes,
     Fork,
     Hash,
@@ -143,46 +144,51 @@ def load(cls, storage_depth: int, account_depth: int) -> Self:
         return cls.model_validate_json(get_mined_asset(json_filename))
 
 
-ATTACK_ORCHESTRATOR_BYTECODE = (
-    # - Prepare CREATE2 Address Keccak, Mem[0:85]
-    # Mem[0:21] = 0xff + DETERMINISTIC_DEPLOYMENT_CONTRACT_ADDRESS
-    Op.MSTORE(
-        0,
-        Hash(
-            b"\xff" + DETERMINISTIC_DEPLOYMENT_CONTRACT_ADDRESS,
-            right_padding=True,
-        ),
-    )
-    # Mem[21:53] = salt (Batch start)
-    + Op.MSTORE(1 + 20, Op.CALLDATALOAD(32))
-    # Mem[53:85] = Initcode hash
-    + Op.MSTORE(1 + 20 + 32, Op.CALLDATALOAD(96))
-    # - Prepare ERC20 Calldata, Mem[85:121]
-    # Mem[85:89] = 0x64dd891a (ABI `attack(uint256)`)
-    + Op.MSTORE(
-        1 + 20 + 32 + 32,
-        Hash(bytes.fromhex("64dd891a"), right_padding=True),
+def attack_orchestrator_bytecode(fork: Fork) -> Bytecode:
+    """
+    Return the bytecode of the attack orchestrator, depending on the fork.
+    """
+    factory_address = (
+        fork.deterministic_factory_predeploy_address()
+        or DETERMINISTIC_FACTORY_ADDRESS
     )
-    # Mem[89:121] = value
-    + Op.MSTORE(1 + 20 + 32 + 32 + 4, Op.CALLDATALOAD(0))
-    + While(
-        body=Op.POP(
-            Op.CALL(
-                address=Op.AND(2 ** (20 * 8) - 1, Op.SHA3(0, 85)),
-                args_offset=1 + 20 + 32 + 32,
-                args_size=4 + 32,
+    return (
+        # - Prepare CREATE2 Address Keccak, Mem[0:85]
+        # Mem[0:21] = 0xff + DETERMINISTIC_FACTORY_ADDRESS
+        Op.MSTORE(
+            0,
+            Hash(
+                b"\xff" + factory_address,
+                right_padding=True,
+            ),
+        )
+        # Mem[21:53] = salt (Batch start)
+        + Op.MSTORE(1 + 20, Op.CALLDATALOAD(32))
+        # Mem[53:85] = Initcode hash
+        + Op.MSTORE(1 + 20 + 32, Op.CALLDATALOAD(96))
+        # - Prepare ERC20 Calldata, Mem[85:121]
+        # Mem[85:89] = 0x64dd891a (ABI `attack(uint256)`)
+        + Op.MSTORE(
+            1 + 20 + 32 + 32,
+            Hash(bytes.fromhex("64dd891a"), right_padding=True),
+        )
+        # Mem[89:121] = value
+        + Op.MSTORE(1 + 20 + 32 + 32 + 4, Op.CALLDATALOAD(0))
+        + While(
+            body=Op.POP(
+                Op.CALL(
+                    address=Op.AND(2 ** (20 * 8) - 1, Op.SHA3(0, 85)),
+                    args_offset=1 + 20 + 32 + 32,
+                    args_size=4 + 32,
+                )
             )
+            # Increment salt in memory by one
+            + Op.MSTORE(1 + 20, Op.ADD(1, Op.MLOAD(1 + 20))),
+            # Check that current salt is less than or equal to batch end
+            condition=Op.LT(Op.MLOAD(1 + 20), Op.ADD(1, Op.CALLDATALOAD(64))),
         )
-        # Increment salt in memory by one
-        + Op.MSTORE(1 + 20, Op.ADD(1, Op.MLOAD(1 + 20))),
-        # Check that current salt is less than or equal to batch end
-        condition=Op.LT(Op.MLOAD(1 + 20), Op.ADD(1, Op.CALLDATALOAD(64))),
+        + Op.STOP
     )
-    + Op.STOP
-)
-ATTACK_ORCHESTRATOR_ADDRESS = compute_deterministic_create2_address(
-    Hash(0), Initcode(deploy_code=ATTACK_ORCHESTRATOR_BYTECODE)
-)
 
 
 class Attack(BaseModel):
@@ -285,8 +291,13 @@ def calculate_tx_gas_limit(self, fork: Fork) -> int:
 
     def generate_transaction(self, fork: Fork, sender: EOA) -> Transaction:
         """Generate the transaction to perform the attack."""
+        attack_orchestrator_address = compute_deterministic_create2_address(
+            salt=Hash(0),
+            initcode=Initcode(deploy_code=attack_orchestrator_bytecode(fork)),
+            fork=fork,
+        )
         return Transaction(
-            to=ATTACK_ORCHESTRATOR_ADDRESS,
+            to=attack_orchestrator_address,
             gas_limit=self.calculate_tx_gas_limit(fork),
             sender=sender,
             data=self.calldata(),
@@ -357,11 +368,7 @@ def test_worst_depth_stateroot_recomp(
 
     # Deploy orchestrator to deterministic address
     orchestrator_address = pre.deterministic_deploy_contract(
-        deploy_code=ATTACK_ORCHESTRATOR_BYTECODE
-    )
-    assert orchestrator_address == ATTACK_ORCHESTRATOR_ADDRESS, (
-        f"Orchestrator address mismatch: {orchestrator_address} != "
-        f"{ATTACK_ORCHESTRATOR_ADDRESS}"
+        deploy_code=attack_orchestrator_bytecode(fork)
     )
     print(f"  Orchestrator will be deployed at: {orchestrator_address}")