Review fixes

Author: marioevz

fillers/eips/eip3651.py

@@ -10,6 +10,7 @@
     CodeGasMeasure,
     Environment,
     StateTest,
+    TestAddress,
     Transaction,
     Yul,
     is_fork,
@@ -106,9 +107,7 @@ def test_warm_coinbase_call_out_of_gas(fork):
     )
 
     pre = {
-        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": Account(
-            balance=1000000000000000000000
-        ),
+        TestAddress: Account(balance=1000000000000000000000),
         "0xcccccccccccccccccccccccccccccccccccccccc": Account(
             code=caller_code
         ),
@@ -304,9 +303,7 @@ def test_warm_coinbase_gas_usage(fork):
     for opcode in gas_measured_opcodes:
         measure_address = to_address(0x100)
         pre = {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": Account(
-                balance=1000000000000000000000
-            ),
+            TestAddress: Account(balance=1000000000000000000000),
             measure_address: Account(
                 code=gas_measured_opcodes[opcode],
             ),

fillers/eips/eip3855.py

@@ -9,6 +9,7 @@
     CodeGasMeasure,
     Environment,
     StateTest,
+    TestAddress,
     Transaction,
     Yul,
     test_from,
@@ -24,23 +25,23 @@ def test_push0(fork):
     env = Environment()
 
     pre = {
-        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": Account(
-            balance=1000000000000000000000
-        ),
+        TestAddress: Account(balance=1000000000000000000000),
     }
 
     post = {}
 
+    code_address = to_address(0x100)
+
     # Entry point for all test cases this address
     tx = Transaction(
-        to=to_address(0x100),
+        to=code_address,
         gas_limit=100000,
     )
 
     """
     Test case 1: Simple PUSH0 as key to SSTORE
     """
-    pre[to_address(0x100)] = Account(
+    pre[code_address] = Account(
         code=bytes(
             [
                 0x60,  # PUSH1
@@ -51,7 +52,7 @@ def test_push0(fork):
         ),
     )
 
-    post[to_address(0x100)] = Account(
+    post[code_address] = Account(
         storage={
             0x00: 0x01,
         }
@@ -65,7 +66,7 @@ def test_push0(fork):
     Test case 2: Fill stack with PUSH0, then OR all values and save using
     SSTORE
     """
-    pre[to_address(0x100)] = Account(
+    pre[code_address] = Account(
         code=bytes(
             [
                 0x5F,  # PUSH0
@@ -88,7 +89,7 @@ def test_push0(fork):
         ),
     )
 
-    post[to_address(0x100)] = Account(
+    post[code_address] = Account(
         storage={
             0x00: 0x01,
         }
@@ -101,7 +102,7 @@ def test_push0(fork):
     """
     Test case 3: Stack overflow by using PUSH0 1025 times
     """
-    pre[to_address(0x100)] = Account(
+    pre[code_address] = Account(
         code=Yul("{ sstore(0, 1) }")
         + bytes(
             [
@@ -111,7 +112,7 @@ def test_push0(fork):
         ),
     )
 
-    post[to_address(0x100)] = Account(
+    post[code_address] = Account(
         storage={
             0x00: 0x00,
         }
@@ -124,7 +125,7 @@ def test_push0(fork):
     """
     Test case 4: Update already existing storage value
     """
-    pre[to_address(0x100)] = Account(
+    pre[code_address] = Account(
         code=bytes(
             [
                 0x60,  # PUSH1
@@ -143,7 +144,7 @@ def test_push0(fork):
         },
     )
 
-    post[to_address(0x100)] = Account(
+    post[code_address] = Account(
         storage={
             0x00: 0x02,
             0x01: 0x00,
@@ -158,7 +159,7 @@ def test_push0(fork):
     Test case 5: PUSH0 during staticcall
     """
 
-    pre[to_address(0x100)] = Account(
+    pre[code_address] = Account(
         code=Yul(
             """
             {
@@ -185,7 +186,7 @@ def test_push0(fork):
             ]
         ),
     )
-    post[to_address(0x100)] = Account(
+    post[code_address] = Account(
         storage={
             0x00: 0x01,
             0x01: 0xFF,
@@ -201,7 +202,7 @@ def test_push0(fork):
     """
     Test case 6: Jump to a JUMPDEST next to a PUSH0, must succeed.
     """
-    pre[to_address(0x100)] = Account(
+    pre[code_address] = Account(
         code=bytes(
             [
                 0x60,  # PUSH1
@@ -218,7 +219,7 @@ def test_push0(fork):
         ),
     )
 
-    post[to_address(0x100)] = Account(
+    post[code_address] = Account(
         storage={
             0x00: 0x01,
         }
@@ -231,7 +232,7 @@ def test_push0(fork):
     """
     Test case 7: PUSH0 gas cost
     """
-    pre[to_address(0x100)] = Account(
+    pre[code_address] = Account(
         code=CodeGasMeasure(
             code=bytes(
                 [
@@ -242,7 +243,7 @@ def test_push0(fork):
         ),
     )
 
-    post[to_address(0x100)] = Account(
+    post[code_address] = Account(
         storage={
             0x00: 0x02,
         }

fillers/eips/eip3860.py

@@ -30,15 +30,15 @@
 General constants used for testing purposes
 """
 
-MAX_INITCODE_SIZE = 0xC000
-INITCODE_WORD_COST = 0x02
-KECCAK_WORD_COST = 0x06
+MAX_INITCODE_SIZE = 49152
+INITCODE_WORD_COST = 2
+KECCAK_WORD_COST = 6
 INITCODE_RESULTING_DEPLOYED_CODE = bytes([0x00])
 
-BASE_TRANSACTION_GAS = 0x5208
-CREATE_CONTRACT_BASE_GAS = 0x7D00
-GAS_OPCODE_GAS = 0x02
-PUSH_DUP_OPCODE_GAS = 0x03
+BASE_TRANSACTION_GAS = 21000
+CREATE_CONTRACT_BASE_GAS = 32000
+GAS_OPCODE_GAS = 2
+PUSH_DUP_OPCODE_GAS = 3
 
 """
 Helper functions
@@ -86,9 +86,8 @@ def calculate_create_tx_execution_cost(
     eip_3860_active: bool,
 ) -> int:
     """
-    Calculates the minimum total execution gas cost of a transaction that
-    contains initcode and creates a contract for the contract to be
-    successfully deployed
+    Calculates the total execution gas cost of a transaction that
+    contains initcode and creates a contract
     """
     cost = calculate_create_tx_intrinsic_cost(
         initcode=initcode, eip_3860_active=eip_3860_active