fix(tests): Fix test_worst_selfdestruct_created (#1741)

* fix(tests): test_worst_selfdestruct_created

* fix: test_worst_selfdestruct_existing

* Update tests/zkevm/test_worst_stateful_opcodes.py

Author: marioevz

tests/zkevm/test_worst_stateful_opcodes.py

@@ -504,6 +504,23 @@ def test_worst_selfdestruct_existing(
     ) + Op.RETURN(0, Op.EXTCODESIZE(selfdestructable_contract_addr))
     initcode_address = pre.deploy_contract(code=initcode)
 
+    # Calculate the number of contracts that can be deployed with the available gas.
+    gas_costs = fork.gas_costs()
+    intrinsic_gas_cost_calc = fork.transaction_intrinsic_cost_calculator()
+    loop_cost = (
+        gas_costs.G_KECCAK_256  # KECCAK static cost
+        + math.ceil(85 / 32) * gas_costs.G_KECCAK_256_WORD  # KECCAK dynamic cost for CREATE2
+        + gas_costs.G_VERY_LOW * 3  # ~MSTOREs+ADDs
+        + gas_costs.G_COLD_ACCOUNT_ACCESS  # CALL to self-destructing contract
+        + gas_costs.G_SELF_DESTRUCT
+        + 63  # ~Gluing opcodes
+    )
+    final_storage_gas = (
+        gas_costs.G_STORAGE_RESET + gas_costs.G_COLD_SLOAD + (gas_costs.G_VERY_LOW * 2)
+    )
+    base_costs = intrinsic_gas_cost_calc() + (gas_costs.G_VERY_LOW * 4) + final_storage_gas
+    num_contracts = (attack_gas_limit - base_costs) // loop_cost
+
     # Create a factory that deployes a new SELFDESTRUCT contract instance pre-funded depending on
     # the value_bearing parameter. We use CREATE2 so the caller contract can easily reproduce
     # the addresses in a loop for CALLs.
@@ -526,29 +543,16 @@ def test_worst_selfdestruct_existing(
         + Op.SSTORE(0, Op.ADD(Op.SLOAD(0), 1))
         + Op.RETURN(0, 32)
     )
-    factory_address = pre.deploy_contract(code=factory_code, balance=10**18)
+
+    required_balance = num_contracts if value_bearing else 0  # 1 wei per contract
+    factory_address = pre.deploy_contract(code=factory_code, balance=required_balance)
 
     factory_caller_code = Op.CALLDATALOAD(0) + While(
         body=Op.POP(Op.CALL(address=factory_address)),
         condition=Op.PUSH1(1) + Op.SWAP1 + Op.SUB + Op.DUP1 + Op.ISZERO + Op.ISZERO,
     )
     factory_caller_address = pre.deploy_contract(code=factory_caller_code)
 
-    gas_costs = fork.gas_costs()
-    intrinsic_gas_cost_calc = fork.transaction_intrinsic_cost_calculator()
-    loop_cost = (
-        gas_costs.G_KECCAK_256  # KECCAK static cost
-        + math.ceil(85 / 32) * gas_costs.G_KECCAK_256_WORD  # KECCAK dynamic cost for CREATE2
-        + gas_costs.G_VERY_LOW * 3  # ~MSTOREs+ADDs
-        + gas_costs.G_COLD_ACCOUNT_ACCESS  # CALL to self-destructing contract
-        + gas_costs.G_SELF_DESTRUCT
-        + 30  # ~Gluing opcodes
-    )
-    num_contracts = (
-        # Base available gas = GAS_LIMIT - intrinsic - (out of loop MSTOREs)
-        attack_gas_limit - intrinsic_gas_cost_calc() - gas_costs.G_VERY_LOW * 4
-    ) // loop_cost
-
     contracts_deployment_tx = Transaction(
         to=factory_caller_address,
         gas_limit=env.gas_limit,
@@ -568,9 +572,9 @@ def test_worst_selfdestruct_existing(
         + While(
             body=Op.POP(Op.CALL(address=Op.SHA3(32 - 20 - 1, 85)))
             + Op.MSTORE(32, Op.ADD(Op.MLOAD(32), 1)),
-            # Stop before we run out of gas for the whole tx execution.
-            # The value was found by trial-error rounded to the next 1000 multiple.
-            condition=Op.GT(Op.GAS, 12_000),
+            # Only loop if we have enough gas to cover another iteration plus the
+            # final storage gas.
+            condition=Op.GT(Op.GAS, final_storage_gas + loop_cost),
         )
         + Op.SSTORE(0, 42)  # Done for successful tx execution assertion below.
     )
@@ -581,12 +585,12 @@ def test_worst_selfdestruct_existing(
     opcode_tx = Transaction(
         to=code_addr,
         gas_limit=attack_gas_limit,
-        gas_price=10,
         sender=pre.fund_eoa(),
     )
 
     post = {
-        code_addr: Account(storage={0: 42})  # Check for successful execution.
+        factory_address: Account(storage={0: num_contracts}),
+        code_addr: Account(storage={0: 42}),  # Check for successful execution.
     }
     deployed_contract_addresses = []
     for i in range(num_contracts):
@@ -616,6 +620,7 @@ def test_worst_selfdestruct_created(
     state_test: StateTestFiller,
     pre: Alloc,
     value_bearing: bool,
+    fork: Fork,
 ):
     """
     Test running a block with as many SELFDESTRUCTs as possible for deployed contracts in
@@ -625,7 +630,11 @@ def test_worst_selfdestruct_created(
     pre.fund_address(env.fee_recipient, 1)
 
     # SELFDESTRUCT(COINBASE) contract deployment
-    initcode = Op.MSTORE8(0, 0x41) + Op.MSTORE8(1, 0xFF) + Op.RETURN(0, 2)
+    initcode = (
+        Op.MSTORE8(0, Op.COINBASE.int()) + Op.MSTORE8(1, Op.SELFDESTRUCT.int()) + Op.RETURN(0, 2)
+    )
+    gas_costs = fork.gas_costs()
+    create_gas = gas_costs.G_CREATE + 20_000
     code = (
         Op.MSTORE(0, initcode.hex())
         + While(
@@ -640,7 +649,7 @@ def test_worst_selfdestruct_created(
             ),
             # Stop before we run out of gas for the whole tx execution.
             # The value was found by trial-error rounded to the next 1000 multiple.
-            condition=Op.GT(Op.GAS, 10_000),
+            condition=Op.GT(Op.GAS, create_gas),
         )
         + Op.SSTORE(0, 42)  # Done for successful tx execution assertion below.
     )
@@ -668,12 +677,15 @@ def test_worst_selfdestruct_initcode(
     state_test: StateTestFiller,
     pre: Alloc,
     value_bearing: bool,
+    fork: Fork,
 ):
     """Test running a block with as many SELFDESTRUCTs as possible executed in initcode."""
     env = Environment()
     pre.fund_address(env.fee_recipient, 1)
 
     initcode = Op.SELFDESTRUCT(Op.COINBASE)
+    gas_costs = fork.gas_costs()
+    create_gas = gas_costs.G_CREATE + 20_000
     code = (
         Op.MSTORE(0, initcode.hex())
         + While(
@@ -686,7 +698,7 @@ def test_worst_selfdestruct_initcode(
             ),
             # Stop before we run out of gas for the whole tx execution.
             # The value was found by trial-error rounded to the next 1000 multiple.
-            condition=Op.GT(Op.GAS, 12_000),
+            condition=Op.GT(Op.GAS, create_gas),
         )
         + Op.SSTORE(0, 42)  # Done for successful tx execution assertion below.
     )