fix: merge fixes

Carsons-Eels · Carsons-Eels · commit 9e812cc68885 · 2026-04-20T13:45:10.000+02:00
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7928.py b/packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7928.py
@@ -36,7 +36,7 @@ def gas_costs(cls) -> GasCosts:
         """
         return replace(
             super(EIP7928, cls).gas_costs(),
-            GAS_BLOCK_ACCESS_LIST_ITEM=2000,
+            BLOCK_ACCESS_LIST_ITEM=2000,
         )
 
     @classmethod
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/berlin/eip_2930.py b/packages/testing/src/execution_testing/forks/forks/eips/berlin/eip_2930.py
@@ -55,11 +55,9 @@ def fn(
             )
             if access_list is not None:
                 for access in access_list:
-                    intrinsic_cost += gas_costs.GAS_TX_ACCESS_LIST_ADDRESS
+                    intrinsic_cost += gas_costs.TX_ACCESS_LIST_ADDRESS
                     for _ in access.storage_keys:
-                        intrinsic_cost += (
-                            gas_costs.GAS_TX_ACCESS_LIST_STORAGE_KEY
-                        )
+                        intrinsic_cost += gas_costs.TX_ACCESS_LIST_STORAGE_KEY
             return intrinsic_cost
 
         return fn
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_196.py b/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_196.py
@@ -30,6 +30,6 @@ def gas_costs(cls) -> GasCosts:
         """Set gas costs for BN254 addition and multiplication."""
         return replace(
             super(EIP196, cls).gas_costs(),
-            GAS_PRECOMPILE_ECADD=500,
-            GAS_PRECOMPILE_ECMUL=40_000,
+            PRECOMPILE_ECADD=500,
+            PRECOMPILE_ECMUL=40_000,
         )
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_197.py b/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_197.py
@@ -29,6 +29,6 @@ def gas_costs(cls) -> GasCosts:
         """Set gas costs for BN254 pairing check."""
         return replace(
             super(EIP197, cls).gas_costs(),
-            GAS_PRECOMPILE_ECPAIRING_BASE=100_000,
-            GAS_PRECOMPILE_ECPAIRING_PER_POINT=80_000,
+            PRECOMPILE_ECPAIRING_BASE=100_000,
+            PRECOMPILE_ECPAIRING_PER_POINT=80_000,
         )
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_211.py b/packages/testing/src/execution_testing/forks/forks/eips/byzantium/eip_211.py
@@ -24,9 +24,9 @@ def opcode_gas_map(
         base_map = super(EIP211, cls).opcode_gas_map()
         return {
             **base_map,
-            Opcodes.RETURNDATASIZE: gas_costs.GAS_BASE,
+            Opcodes.RETURNDATASIZE: gas_costs.BASE,
             Opcodes.RETURNDATACOPY: cls._with_memory_expansion(
-                cls._with_data_copy(gas_costs.GAS_VERY_LOW, gas_costs),
+                cls._with_data_copy(gas_costs.VERY_LOW, gas_costs),
                 memory_expansion_calculator,
             ),
         }
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_1153.py b/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_1153.py
@@ -26,8 +26,8 @@ def opcode_gas_map(
         base_map = super(EIP1153, cls).opcode_gas_map()
         return {
             **base_map,
-            Opcodes.TLOAD: gas_costs.GAS_WARM_SLOAD,
-            Opcodes.TSTORE: gas_costs.GAS_WARM_SLOAD,
+            Opcodes.TLOAD: gas_costs.WARM_SLOAD,
+            Opcodes.TSTORE: gas_costs.WARM_SLOAD,
         }
 
     @classmethod
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_4844.py b/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_4844.py
@@ -189,7 +189,7 @@ def gas_costs(cls) -> GasCosts:
         """On Cancun, the point evaluation precompile gas cost is set."""
         return replace(
             super(EIP4844, cls).gas_costs(),
-            GAS_PRECOMPILE_POINT_EVALUATION=50_000,
+            PRECOMPILE_POINT_EVALUATION=50_000,
         )
 
     @classmethod
@@ -208,7 +208,7 @@ def opcode_gas_map(
         base_map = super(EIP4844, cls).opcode_gas_map()
 
         # Add Cancun-specific opcodes
-        return {**base_map, Opcodes.BLOBHASH: gas_costs.GAS_VERY_LOW}
+        return {**base_map, Opcodes.BLOBHASH: gas_costs.VERY_LOW}
 
     @classmethod
     def valid_opcodes(cls) -> List[Opcodes]:
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_5656.py b/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_5656.py
@@ -27,7 +27,7 @@ def opcode_gas_map(
         return {
             **base_map,
             Opcodes.MCOPY: cls._with_memory_expansion(
-                cls._with_data_copy(gas_costs.GAS_VERY_LOW, gas_costs),
+                cls._with_data_copy(gas_costs.VERY_LOW, gas_costs),
                 memory_expansion_calculator,
             ),
         }
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_7516.py b/packages/testing/src/execution_testing/forks/forks/eips/cancun/eip_7516.py
@@ -29,7 +29,7 @@ def opcode_gas_map(
         # Add Cancun-specific opcodes
         return {
             **base_map,
-            Opcodes.BLOBBASEFEE: gas_costs.GAS_BASE,
+            Opcodes.BLOBBASEFEE: gas_costs.BASE,
         }
 
     @classmethod
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/constantinople/eip_1014.py b/packages/testing/src/execution_testing/forks/forks/eips/constantinople/eip_1014.py
@@ -26,9 +26,9 @@ def _calculate_create2_gas(
 
         init_code_size = metadata["init_code_size"]
         init_code_words = (init_code_size + 31) // 32
-        hash_gas = gas_costs.GAS_KECCAK256_PER_WORD * init_code_words
+        hash_gas = gas_costs.OPCODE_KECCACK256_PER_WORD * init_code_words
 
-        return gas_costs.GAS_CREATE + hash_gas
+        return gas_costs.OPCODE_CREATE_BASE + hash_gas
 
     @classmethod
     def create_opcodes(cls) -> List[Opcodes]:
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/constantinople/eip_145.py b/packages/testing/src/execution_testing/forks/forks/eips/constantinople/eip_145.py
@@ -25,9 +25,9 @@ def opcode_gas_map(
         base_map = super(EIP145, cls).opcode_gas_map()
         return {
             **base_map,
-            Opcodes.SHL: gas_costs.GAS_VERY_LOW,
-            Opcodes.SHR: gas_costs.GAS_VERY_LOW,
-            Opcodes.SAR: gas_costs.GAS_VERY_LOW,
+            Opcodes.SHL: gas_costs.VERY_LOW,
+            Opcodes.SHR: gas_costs.VERY_LOW,
+            Opcodes.SAR: gas_costs.VERY_LOW,
         }
 
     @classmethod
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/homestead/eip_2.py b/packages/testing/src/execution_testing/forks/forks/eips/homestead/eip_2.py
@@ -43,7 +43,7 @@ def fn(
                 authorization_list_or_count=authorization_list_or_count,
             )
             if contract_creation:
-                intrinsic_cost += gas_costs.GAS_TX_CREATE
+                intrinsic_cost += gas_costs.TX_CREATE
             return intrinsic_cost
 
         return fn
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_1108.py b/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_1108.py
@@ -18,8 +18,8 @@ def gas_costs(cls) -> GasCosts:
         """Reduce BN254 precompile gas costs."""
         return replace(
             super(EIP1108, cls).gas_costs(),
-            GAS_PRECOMPILE_ECADD=150,
-            GAS_PRECOMPILE_ECMUL=6000,
-            GAS_PRECOMPILE_ECPAIRING_BASE=45_000,
-            GAS_PRECOMPILE_ECPAIRING_PER_POINT=34_000,
+            PRECOMPILE_ECADD=150,
+            PRECOMPILE_ECMUL=6000,
+            PRECOMPILE_ECPAIRING_BASE=45_000,
+            PRECOMPILE_ECPAIRING_PER_POINT=34_000,
         )
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_1344.py b/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_1344.py
@@ -24,7 +24,7 @@ def opcode_gas_map(
         """Add CHAINID opcode gas cost."""
         gas_costs = cls.gas_costs()
         base_map = super(EIP1344, cls).opcode_gas_map()
-        return {**base_map, Opcodes.CHAINID: gas_costs.GAS_BASE}
+        return {**base_map, Opcodes.CHAINID: gas_costs.BASE}
 
     @classmethod
     def valid_opcodes(cls) -> List[Opcodes]:
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_152.py b/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_152.py
@@ -28,5 +28,5 @@ def gas_costs(cls) -> GasCosts:
         """Set BLAKE2F per-round gas cost."""
         return replace(
             super(EIP152, cls).gas_costs(),
-            GAS_PRECOMPILE_BLAKE2F_PER_ROUND=1,
+            PRECOMPILE_BLAKE2F_PER_ROUND=1,
         )
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_1884.py b/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_1884.py
@@ -23,7 +23,7 @@ def opcode_gas_map(
         """Add SELFBALANCE opcode gas cost."""
         gas_costs = cls.gas_costs()
         base_map = super(EIP1884, cls).opcode_gas_map()
-        return {**base_map, Opcodes.SELFBALANCE: gas_costs.GAS_LOW}
+        return {**base_map, Opcodes.SELFBALANCE: gas_costs.LOW}
 
     @classmethod
     def valid_opcodes(cls) -> List[Opcodes]:
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_2028.py b/packages/testing/src/execution_testing/forks/forks/eips/istanbul/eip_2028.py
@@ -20,5 +20,5 @@ def gas_costs(cls) -> GasCosts:
         """Reduce non-zero calldata byte gas cost to 16."""
         return replace(
             super(EIP2028, cls).gas_costs(),
-            GAS_TX_DATA_PER_NON_ZERO=16,
+            TX_DATA_PER_NON_ZERO=16,
         )
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/london/eip_3198.py b/packages/testing/src/execution_testing/forks/forks/eips/london/eip_3198.py
@@ -24,7 +24,7 @@ def opcode_gas_map(
         """Add BASEFEE opcode gas cost."""
         gas_costs = cls.gas_costs()
         base_map = super(EIP3198, cls).opcode_gas_map()
-        return {**base_map, Opcodes.BASEFEE: gas_costs.GAS_BASE}
+        return {**base_map, Opcodes.BASEFEE: gas_costs.BASE}
 
     @classmethod
     def valid_opcodes(cls) -> List[Opcodes]:
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7939.py b/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7939.py
@@ -25,7 +25,7 @@ def opcode_gas_map(
         base_map = super(EIP7939, cls).opcode_gas_map()
         return {
             **base_map,
-            Opcodes.CLZ: gas_costs.GAS_LOW,
+            Opcodes.CLZ: gas_costs.LOW,
         }
 
     @classmethod
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7951.py b/packages/testing/src/execution_testing/forks/forks/eips/osaka/eip_7951.py
@@ -35,5 +35,5 @@ def gas_costs(cls) -> GasCosts:
         """Set the P256VERIFY precompile gas cost."""
         return replace(
             super(EIP7951, cls).gas_costs(),
-            GAS_PRECOMPILE_P256VERIFY=6_900,
+            PRECOMPILE_P256VERIFY=6_900,
         )
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_2537.py b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_2537.py
@@ -47,12 +47,12 @@ def gas_costs(cls) -> GasCosts:
         """Add gas costs for BLS12-381 precompiles."""
         return replace(
             super(EIP2537, cls).gas_costs(),
-            GAS_PRECOMPILE_BLS_G1ADD=375,
-            GAS_PRECOMPILE_BLS_G1MUL=12_000,
-            GAS_PRECOMPILE_BLS_G1MAP=5_500,
-            GAS_PRECOMPILE_BLS_G2ADD=600,
-            GAS_PRECOMPILE_BLS_G2MUL=22_500,
-            GAS_PRECOMPILE_BLS_G2MAP=23_800,
-            GAS_PRECOMPILE_BLS_PAIRING_BASE=37_700,
-            GAS_PRECOMPILE_BLS_PAIRING_PER_PAIR=32_600,
+            PRECOMPILE_BLS_G1ADD=375,
+            PRECOMPILE_BLS_G1MUL=12_000,
+            PRECOMPILE_BLS_G1MAP=5_500,
+            PRECOMPILE_BLS_G2ADD=600,
+            PRECOMPILE_BLS_G2MUL=22_500,
+            PRECOMPILE_BLS_G2MAP=23_800,
+            PRECOMPILE_BLS_PAIRING_BASE=37_700,
+            PRECOMPILE_BLS_PAIRING_PER_PAIR=32_600,
         )
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7623.py b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7623.py
@@ -29,8 +29,8 @@ def gas_costs(cls) -> GasCosts:
         """Add standard and floor token costs for calldata."""
         return replace(
             super(EIP7623, cls).gas_costs(),
-            GAS_TX_DATA_TOKEN_STANDARD=4,
-            GAS_TX_DATA_TOKEN_FLOOR=10,
+            TX_DATA_TOKEN_STANDARD=4,
+            TX_DATA_TOKEN_FLOOR=10,
         )
 
     @classmethod
@@ -47,8 +47,8 @@ def fn(*, data: BytesConvertible, floor: bool = False) -> int:
             num_non_zeros = len(raw) - num_zeros
             tokens = num_zeros + num_non_zeros * 4
             if floor:
-                return tokens * gas_costs.GAS_TX_DATA_TOKEN_FLOOR
-            return tokens * gas_costs.GAS_TX_DATA_TOKEN_STANDARD
+                return tokens * gas_costs.TX_DATA_TOKEN_FLOOR
+            return tokens * gas_costs.TX_DATA_TOKEN_STANDARD
 
         return fn
 
@@ -65,7 +65,7 @@ def transaction_data_floor_cost_calculator(
         def fn(*, data: BytesConvertible) -> int:
             return (
                 calldata_gas_calculator(data=data, floor=True)
-                + gas_costs.GAS_TX_BASE
+                + gas_costs.TX_BASE
             )
 
         return fn
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7702.py b/packages/testing/src/execution_testing/forks/forks/eips/prague/eip_7702.py
@@ -33,7 +33,7 @@ def gas_costs(cls) -> GasCosts:
         """Add gas costs for authorization operations."""
         return replace(
             super(EIP7702, cls).gas_costs(),
-            GAS_AUTH_PER_EMPTY_ACCOUNT=25_000,
+            AUTH_PER_EMPTY_ACCOUNT=25_000,
             REFUND_AUTH_PER_EXISTING_ACCOUNT=12_500,
         )
 
@@ -50,9 +50,9 @@ def _calculate_call_gas(
 
         if metadata["delegated_address"] or metadata["delegated_address_warm"]:
             if metadata["delegated_address_warm"]:
-                base_cost += gas_costs.GAS_WARM_ACCESS
+                base_cost += gas_costs.WARM_ACCESS
             else:
-                base_cost += gas_costs.GAS_COLD_ACCOUNT_ACCESS
+                base_cost += gas_costs.COLD_ACCOUNT_ACCESS
 
         return base_cost
 
@@ -89,7 +89,7 @@ def fn(
                     )
                 intrinsic_cost += (
                     authorization_list_or_count
-                    * gas_costs.GAS_AUTH_PER_EMPTY_ACCOUNT
+                    * gas_costs.AUTH_PER_EMPTY_ACCOUNT
                 )
 
             return intrinsic_cost
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/shanghai/eip_3855.py b/packages/testing/src/execution_testing/forks/forks/eips/shanghai/eip_3855.py
@@ -26,7 +26,7 @@ def opcode_gas_map(
         base_map = super(EIP3855, cls).opcode_gas_map()
         return {
             **base_map,
-            Opcodes.PUSH0: gas_costs.GAS_BASE,
+            Opcodes.PUSH0: gas_costs.BASE,
         }
 
     @classmethod
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/shanghai/eip_3860.py b/packages/testing/src/execution_testing/forks/forks/eips/shanghai/eip_3860.py
@@ -36,7 +36,7 @@ def _calculate_create_gas(
 
         init_code_size = metadata["init_code_size"]
         init_code_words = (init_code_size + 31) // 32
-        init_code_gas = gas_costs.GAS_CODE_INIT_PER_WORD * init_code_words
+        init_code_gas = gas_costs.CODE_INIT_PER_WORD * init_code_words
 
         return base_cost + init_code_gas
 
@@ -55,6 +55,6 @@ def _calculate_create2_gas(
 
         init_code_size = metadata["init_code_size"]
         init_code_words = (init_code_size + 31) // 32
-        init_code_gas = gas_costs.GAS_CODE_INIT_PER_WORD * init_code_words
+        init_code_gas = gas_costs.CODE_INIT_PER_WORD * init_code_words
 
         return base_cost + init_code_gas
diff --git a/packages/testing/src/execution_testing/forks/forks/eips/spurious_dragon/eip_161.py b/packages/testing/src/execution_testing/forks/forks/eips/spurious_dragon/eip_161.py
@@ -26,9 +26,9 @@ def _calculate_call_gas(
         metadata = opcode.metadata
         if "value_transfer" in metadata:
             if metadata["value_transfer"]:
-                base_cost += gas_costs.GAS_CALL_VALUE
+                base_cost += gas_costs.CALL_VALUE
                 if metadata["account_new"]:
-                    base_cost += gas_costs.GAS_NEW_ACCOUNT
+                    base_cost += gas_costs.NEW_ACCOUNT
             elif metadata["account_new"]:
                 raise ValueError("Account new requires value transfer")
 
diff --git a/packages/testing/src/execution_testing/forks/forks/forks.py b/packages/testing/src/execution_testing/forks/forks/forks.py
@@ -32,7 +32,7 @@
     TransactionDataFloorCostCalculator,
     TransactionIntrinsicCostCalculator,
 )
-from ..gas_costs import GasCosts
+from ..gas_costs import BASE, HIGH, LOW, MID, VERY_LOW, GasCosts
 from . import eips
 from .eips.amsterdam import AmsterdamEIPs
 from .helpers import ceiling_division

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ def gas_costs(cls) -> GasCosts:`
`36`	`36`	`"""`
`37`	`37`	`return replace(`
`38`	`38`	`super(EIP7928, cls).gas_costs(),`
`39`		`- GAS_BLOCK_ACCESS_LIST_ITEM=2000,`
	`39`	`+ BLOCK_ACCESS_LIST_ITEM=2000,`
`40`	`40`	`)`
`41`	`41`
`42`	`42`	`@classmethod`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@ def gas_costs(cls) -> GasCosts:`
`30`	`30`	`"""Set gas costs for BN254 addition and multiplication."""`
`31`	`31`	`return replace(`
`32`	`32`	`super(EIP196, cls).gas_costs(),`
`33`		`- GAS_PRECOMPILE_ECADD=500,`
`34`		`- GAS_PRECOMPILE_ECMUL=40_000,`
	`33`	`+ PRECOMPILE_ECADD=500,`
	`34`	`+ PRECOMPILE_ECMUL=40_000,`
`35`	`35`	`)`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@ def gas_costs(cls) -> GasCosts:`
`29`	`29`	`"""Set gas costs for BN254 pairing check."""`
`30`	`30`	`return replace(`
`31`	`31`	`super(EIP197, cls).gas_costs(),`
`32`		`- GAS_PRECOMPILE_ECPAIRING_BASE=100_000,`
`33`		`- GAS_PRECOMPILE_ECPAIRING_PER_POINT=80_000,`
	`32`	`+ PRECOMPILE_ECPAIRING_BASE=100_000,`
	`33`	`+ PRECOMPILE_ECPAIRING_PER_POINT=80_000,`
`34`	`34`	`)`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ def opcode_gas_map(`
`27`	`27`	`return {`
`28`	`28`	`**base_map,`
`29`	`29`	`Opcodes.MCOPY: cls._with_memory_expansion(`
`30`		`- cls._with_data_copy(gas_costs.GAS_VERY_LOW, gas_costs),`
	`30`	`+ cls._with_data_copy(gas_costs.VERY_LOW, gas_costs),`
`31`	`31`	`memory_expansion_calculator,`
`32`	`32`	`),`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ def opcode_gas_map(`
`29`	`29`	`# Add Cancun-specific opcodes`
`30`	`30`	`return {`
`31`	`31`	`**base_map,`
`32`		`- Opcodes.BLOBBASEFEE: gas_costs.GAS_BASE,`
	`32`	`+ Opcodes.BLOBBASEFEE: gas_costs.BASE,`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@classmethod`