fix gas limits

Signed-off-by: Ignacio Hagopian <jsign.uy@gmail.com>

Author: jsign

tests/zkevm/test_worst_bytecode.py

@@ -27,8 +27,6 @@
 REFERENCE_SPEC_VERSION = "TODO"
 
 MAX_CONTRACT_SIZE = 24 * 1024  # TODO: This could be a fork property
-BLOCK_GAS_LIMIT = 36_000_000  # TODO: Parametrize using the (yet to be implemented) block gas limit
-# OPCODE_GAS_LIMIT = BLOCK_GAS_LIMIT  # TODO: Reduced in order to run the test in a reasonable time
 OPCODE_GAS_LIMIT = 100_000
 
 XOR_TABLE_SIZE = 256
@@ -60,7 +58,7 @@ def test_worst_bytecode_single_opcode(
     The test is performed in the last block of the test, and the entire block gas limit is
     consumed by repeated opcode executions.
     """
-    env = Environment(gas_limit=BLOCK_GAS_LIMIT)
+    env = Environment()
 
     # The initcode will take its address as a starting point to the input to the keccak
     # hash function.
@@ -131,14 +129,14 @@ def test_worst_bytecode_single_opcode(
 
     total_contracts_to_deploy = max_number_of_contract_calls
     approximate_gas_per_deployment = 4_970_000  # Obtained from evm tracing
-    contracts_deployed_per_tx = BLOCK_GAS_LIMIT // approximate_gas_per_deployment
+    contracts_deployed_per_tx = env.gas_limit // approximate_gas_per_deployment
 
     deploy_txs = []
 
     def generate_deploy_tx(contracts_to_deploy: int):
         return Transaction(
             to=factory_caller_address,
-            gas_limit=BLOCK_GAS_LIMIT,
+            gas_limit=env.gas_limit,
             gas_price=10**9,  # Bump required due to the amount of full blocks
             data=Hash(contracts_deployed_per_tx),
             sender=pre.fund_eoa(),

tests/zkevm/test_worst_compute.py

@@ -195,7 +195,7 @@ def test_worst_ecrecover(
         + Op.MSTORE(3 * 32, 0x789D1DD423D25F0772D2748D60F7E4B81BB14D086EBA8E8E8EFB6DCFF8A4AE02)
     )
 
-    attack_block = Op.STATICCALL(ECRECOVER_GAS_COST, 0x1, 0, 32 * 4, 0, 0) + Op.POP
+    attack_block = Op.POP(Op.STATICCALL(ECRECOVER_GAS_COST, 0x1, 0, 32 * 4, 0, 0))
     code = code_loop_precompile_call(calldata, attack_block)
     code_address = pre.deploy_contract(code=bytes(code))
 
@@ -218,7 +218,7 @@ def test_worst_ecrecover(
 
 def code_loop_precompile_call(calldata: Bytecode, attack_block: Bytecode):
     """Create a code loop that calls a precompile with the given calldata."""
-    # The attack contract is: JUMPDEST + [attack_block]* + PUSH0 + JUMP
+    # The attack contract is: CALLDATA_PREP + #JUMPDEST + [attack_block]* + JUMP(#)
     jumpdest = Op.JUMPDEST
     jump_back = Op.JUMP(len(calldata))
     max_iters_loop = (MAX_CODE_SIZE - len(calldata) - len(jumpdest) - len(jump_back)) // len(