fix(rebase): align EIP-8037 with forks/amsterdam GasCosts refactor

Adapt EIP-8037 to forks/amsterdam's module-level-to-GasCosts refactor:
rename GAS_X → GasCosts.X in 8037 files, with remappings:
  GAS_STORAGE_UPDATE   → GasCosts.COLD_STORAGE_WRITE
  GAS_KECCAK256_PER_WORD → GasCosts.OPCODE_KECCACK256_PER_WORD
  GAS_SELF_DESTRUCT    → GasCosts.OPCODE_SELFDESTRUCT_BASE
  GAS_CREATE           → GasCosts.OPCODE_CREATE_BASE
  GAS_MEMORY           → GasCosts.MEMORY_PER_WORD

Tests: 977 pass.

Author: spencer-tb

packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_8037.py

@@ -59,7 +59,7 @@ def code_deposit_state_gas(cls, *, code_size: int) -> int:
     def create_state_gas(cls, *, code_size: int = 0) -> int:
         """Return total state gas for CREATE (EIP-8037)."""
         gas_costs = cls.gas_costs()
-        return gas_costs.GAS_NEW_ACCOUNT + cls.code_deposit_state_gas(
+        return gas_costs.NEW_ACCOUNT + cls.code_deposit_state_gas(
             code_size=code_size
         )
 
@@ -82,17 +82,17 @@ def gas_costs(cls) -> GasCosts:
         return replace(
             parent,
             # EIP-7928: block access list item cost
-            GAS_BLOCK_ACCESS_LIST_ITEM=2000,
+            BLOCK_ACCESS_LIST_ITEM=2000,
             # EIP-8037: state gas folded into totals
-            GAS_STORAGE_SET=(
-                parent.GAS_COLD_STORAGE_WRITE
-                - parent.GAS_COLD_STORAGE_ACCESS
+            STORAGE_SET=(
+                parent.COLD_STORAGE_WRITE
+                - parent.COLD_STORAGE_ACCESS
                 + STATE_BYTES_PER_STORAGE_SET * cpsb
             ),
-            GAS_NEW_ACCOUNT=new_acct,
-            GAS_CREATE=REGULAR_GAS_CREATE + new_acct,
-            GAS_TX_CREATE=(REGULAR_GAS_CREATE + new_acct),
-            GAS_AUTH_PER_EMPTY_ACCOUNT=(
+            NEW_ACCOUNT=new_acct,
+            OPCODE_CREATE_BASE=REGULAR_GAS_CREATE + new_acct,
+            TX_CREATE=(REGULAR_GAS_CREATE + new_acct),
+            AUTH_PER_EMPTY_ACCOUNT=(
                 PER_AUTH_BASE_COST
                 + (STATE_BYTES_PER_NEW_ACCOUNT + STATE_BYTES_PER_AUTH_BASE)
                 * cpsb
@@ -290,17 +290,14 @@ def _calculate_sstore_gas(
             current_value = original_value
         new_value = metadata["new_value"]
 
-        gas_cost = (
-            0 if metadata["key_warm"] else gas_costs.GAS_COLD_STORAGE_ACCESS
-        )
+        gas_cost = 0 if metadata["key_warm"] else gas_costs.COLD_STORAGE_ACCESS
 
         if original_value == current_value and current_value != new_value:
             gas_cost += (
-                gas_costs.GAS_COLD_STORAGE_WRITE
-                - gas_costs.GAS_COLD_STORAGE_ACCESS
+                gas_costs.COLD_STORAGE_WRITE - gas_costs.COLD_STORAGE_ACCESS
             )
         else:
-            gas_cost += gas_costs.GAS_WARM_SLOAD
+            gas_cost += gas_costs.WARM_SLOAD
 
         return gas_cost
 
@@ -356,9 +353,9 @@ def _calculate_sstore_refund(
 
             if original_value == new_value:
                 refund += (
-                    gas_costs.GAS_COLD_STORAGE_WRITE
-                    - gas_costs.GAS_COLD_STORAGE_ACCESS
-                    - gas_costs.GAS_WARM_SLOAD
+                    gas_costs.COLD_STORAGE_WRITE
+                    - gas_costs.COLD_STORAGE_ACCESS
+                    - gas_costs.WARM_SLOAD
                 )
 
         return refund
@@ -404,7 +401,7 @@ def _calculate_return_gas(
         code_deposit_size = metadata["code_deposit_size"]
         if code_deposit_size > 0:
             code_words = (code_deposit_size + 31) // 32
-            hash_gas = gas_costs.GAS_KECCAK256_PER_WORD * code_words
+            hash_gas = gas_costs.OPCODE_KECCACK256_PER_WORD * code_words
             return hash_gas
         return 0
 

src/ethereum/forks/amsterdam/fork.py

@@ -97,10 +97,9 @@
 from .vm import Message
 from .vm.eoa_delegation import is_valid_delegation
 from .vm.gas import (
-    BLOB_SCHEDULE_MAX,
-    GAS_PER_BLOB,
     STATE_BYTES_PER_NEW_ACCOUNT,
     STATE_BYTES_PER_STORAGE_SET,
+    GasCosts,
     calculate_blob_gas_price,
     calculate_data_fee,
     calculate_excess_blob_gas,

src/ethereum/forks/amsterdam/transactions.py

@@ -27,43 +27,6 @@
 )
 from .fork_types import Authorization, VersionedHash
 
-GAS_TX_BASE = Uint(21000)
-"""
-Base cost of a transaction in gas units. This is the minimum amount of gas
-required to execute a transaction.
-"""
-
-GAS_TX_DATA_TOKEN_FLOOR = Uint(10)
-"""
-Minimum gas cost per byte of calldata as per [EIP-7623]. Used to calculate
-the minimum gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_DATA_TOKEN_STANDARD = Uint(4)
-"""
-Gas cost per byte of calldata as per [EIP-7623]. Used to calculate the
-gas cost for transactions that include calldata.
-
-[EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
-"""
-
-GAS_TX_CREATE = Uint(32000)
-"""
-Additional gas cost for creating a new contract.
-"""
-
-GAS_TX_ACCESS_LIST_ADDRESS = Uint(2400)
-"""
-Gas cost for including an address in the access list of a transaction.
-"""
-
-GAS_TX_ACCESS_LIST_STORAGE_KEY = Uint(1900)
-"""
-Gas cost for including a storage key in the access list of a transaction.
-"""
-
 
 @dataclass
 class IntrinsicGasCost:
@@ -648,6 +611,7 @@ def calculate_intrinsic_cost(
         REGULAR_GAS_CREATE,
         STATE_BYTES_PER_AUTH_BASE,
         STATE_BYTES_PER_NEW_ACCOUNT,
+        GasCosts,
         init_code_cost,
         state_gas_per_byte,
     )
@@ -668,13 +632,13 @@ def calculate_intrinsic_cost(
     tokens_in_access_list = Uint(0)
     if has_access_list(tx):
         for access in tx.access_list:
-            access_list_gas += GAS_TX_ACCESS_LIST_ADDRESS
+            access_list_gas += GasCosts.TX_ACCESS_LIST_ADDRESS
             access_list_gas += (
-                ulen(access.slots) * GAS_TX_ACCESS_LIST_STORAGE_KEY
+                ulen(access.slots) * GasCosts.TX_ACCESS_LIST_STORAGE_KEY
             )
 
     # Data token floor cost for access list bytes.
-    access_list_gas += tokens_in_access_list * GAS_TX_DATA_TOKEN_FLOOR
+    access_list_gas += tokens_in_access_list * GasCosts.TX_DATA_TOKEN_FLOOR
 
     auth_regular_gas = Uint(0)
     auth_state_gas = Uint(0)
@@ -698,7 +662,7 @@ def calculate_intrinsic_cost(
     )
 
     intrinsic_regular_gas = (
-        GAS_TX_BASE
+        GasCosts.TX_BASE
         + data_cost
         + create_regular_gas
         + access_list_gas

src/ethereum/forks/amsterdam/vm/eoa_delegation.py

@@ -22,9 +22,8 @@
 )
 from ..utils.hexadecimal import hex_to_address
 from ..vm.gas import (
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_WARM_ACCESS,
     STATE_BYTES_PER_NEW_ACCOUNT,
+    GasCosts,
     state_gas_per_byte,
 )
 from . import Evm, Message

src/ethereum/forks/amsterdam/vm/gas.py

@@ -25,56 +25,11 @@
 from . import Evm
 from .exceptions import OutOfGasError
 
-GAS_JUMPDEST = Uint(1)
-GAS_BASE = Uint(2)
-GAS_VERY_LOW = Uint(3)
-GAS_STORAGE_UPDATE = Uint(5000)
-REFUND_STORAGE_CLEAR = 4800
-GAS_LOW = Uint(5)
-GAS_MID = Uint(8)
-GAS_HIGH = Uint(10)
-GAS_EXPONENTIATION = Uint(10)
-GAS_EXPONENTIATION_PER_BYTE = Uint(50)
-GAS_MEMORY = Uint(3)
-GAS_KECCAK256 = Uint(30)
-GAS_KECCAK256_PER_WORD = Uint(6)
-GAS_COPY = Uint(3)
-GAS_BLOCK_HASH = Uint(20)
-GAS_LOG = Uint(375)
-GAS_LOG_DATA_PER_BYTE = Uint(8)
-GAS_LOG_TOPIC = Uint(375)
-GAS_ZERO = Uint(0)
-GAS_CALL_VALUE = Uint(9000)
-GAS_CALL_STIPEND = Uint(2300)
-GAS_SELF_DESTRUCT = Uint(5000)
-GAS_PRECOMPILE_ECRECOVER = Uint(3000)
-GAS_PRECOMPILE_P256VERIFY = Uint(6900)
-GAS_PRECOMPILE_SHA256_BASE = Uint(60)
-GAS_PRECOMPILE_SHA256_PER_WORD = Uint(12)
-GAS_PRECOMPILE_RIPEMD160_BASE = Uint(600)
-GAS_PRECOMPILE_RIPEMD160_PER_WORD = Uint(120)
-GAS_PRECOMPILE_IDENTITY_BASE = Uint(15)
-GAS_PRECOMPILE_IDENTITY_PER_WORD = Uint(3)
-GAS_RETURN_DATA_COPY = Uint(3)
-GAS_FAST_STEP = Uint(5)
-GAS_PRECOMPILE_BLAKE2F_PER_ROUND = Uint(1)
-GAS_COLD_STORAGE_ACCESS = Uint(2100)
-GAS_COLD_ACCOUNT_ACCESS = Uint(2600)
-GAS_WARM_ACCESS = Uint(100)
-GAS_CODE_INIT_PER_WORD = Uint(2)
-GAS_BLOBHASH_OPCODE = Uint(3)
-GAS_PRECOMPILE_POINT_EVALUATION = Uint(50000)
-
-# These values may be patched at runtime by a future gas repricing utility
-class GasCosts:
-    """
-    Constant gas values for the EVM.
-    """
-
-TARGET_STATE_GROWTH_PER_YEAR = Uint(100 * 1024**3)  # noqa: F841
-BLOCKS_PER_YEAR = Uint(2_628_000)  # noqa: F841
-COST_PER_STATE_BYTE_SIGNIFICANT_BITS = Uint(5)  # noqa: F841
-COST_PER_STATE_BYTE_OFFSET = Uint(9578)  # noqa: F841
+# EIP-8037 state gas accounting constants
+TARGET_STATE_GROWTH_PER_YEAR = Uint(100 * 1024**3)
+BLOCKS_PER_YEAR = Uint(2_628_000)
+COST_PER_STATE_BYTE_SIGNIFICANT_BITS = Uint(5)
+COST_PER_STATE_BYTE_OFFSET = Uint(9578)
 
 STATE_BYTES_PER_NEW_ACCOUNT = Uint(112)
 STATE_BYTES_PER_STORAGE_SET = Uint(32)
@@ -84,12 +39,19 @@ class GasCosts:
 
 REGULAR_GAS_CREATE = Uint(9000)
 
-GAS_PRECOMPILE_BLS_G1ADD = Uint(375)
-GAS_PRECOMPILE_BLS_G1MUL = Uint(12000)
-GAS_PRECOMPILE_BLS_G1MAP = Uint(5500)
-GAS_PRECOMPILE_BLS_G2ADD = Uint(600)
-GAS_PRECOMPILE_BLS_G2MUL = Uint(22500)
-GAS_PRECOMPILE_BLS_G2MAP = Uint(23800)
+
+# These values may be patched at runtime by a future gas repricing utility
+class GasCosts:
+    """
+    Constant gas values for the EVM.
+    """
+
+    # Tiers
+    BASE = Uint(2)
+    VERY_LOW = Uint(3)
+    LOW = Uint(5)
+    MID = Uint(8)
+    HIGH = Uint(10)
 
     # Access
     WARM_ACCESS = Uint(100)

src/ethereum/forks/amsterdam/vm/instructions/storage.py

@@ -23,12 +23,8 @@
 from .. import Evm, credit_state_gas_refund
 from ..exceptions import WriteInStaticContext
 from ..gas import (
-    GAS_CALL_STIPEND,
-    GAS_COLD_STORAGE_ACCESS,
-    GAS_STORAGE_UPDATE,
-    GAS_WARM_ACCESS,
-    REFUND_STORAGE_CLEAR,
     STATE_BYTES_PER_STORAGE_SET,
+    GasCosts,
     charge_gas,
     charge_state_gas,
     check_gas,
@@ -110,7 +106,7 @@ def sstore(evm: Evm) -> None:
             needs_state_gas = True
         # charge regular cost for the operation, even when we
         # already charge state gas for state creation
-        gas_cost += GAS_STORAGE_UPDATE - GAS_COLD_STORAGE_ACCESS
+        gas_cost += GasCosts.COLD_STORAGE_WRITE - GasCosts.COLD_STORAGE_ACCESS
     else:
         gas_cost += GasCosts.WARM_ACCESS
 
@@ -130,7 +126,9 @@ def sstore(evm: Evm) -> None:
                 # Slot set then cleared: refund the state gas charge.
                 credit_state_gas_refund(evm, state_gas_storage_set)
             evm.refund_counter += int(
-                GAS_STORAGE_UPDATE - GAS_COLD_STORAGE_ACCESS - GAS_WARM_ACCESS
+                GasCosts.COLD_STORAGE_WRITE
+                - GasCosts.COLD_STORAGE_ACCESS
+                - GasCosts.WARM_ACCESS
             )
 
     # Charge regular gas before state gas so that a regular-gas OOG

src/ethereum/forks/amsterdam/vm/instructions/system.py

@@ -44,14 +44,9 @@
 )
 from ..exceptions import OutOfGasError, Revert, WriteInStaticContext
 from ..gas import (
-    GAS_CALL_VALUE,
-    GAS_COLD_ACCOUNT_ACCESS,
-    GAS_KECCAK256_PER_WORD,
-    GAS_SELF_DESTRUCT,
-    GAS_WARM_ACCESS,
-    GAS_ZERO,
     REGULAR_GAS_CREATE,
     STATE_BYTES_PER_NEW_ACCOUNT,
+    GasCosts,
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
@@ -253,7 +248,7 @@ def create2(evm: Evm) -> None:
     charge_gas(
         evm,
         REGULAR_GAS_CREATE
-        + GAS_KECCAK256_PER_WORD * call_data_words
+        + GasCosts.OPCODE_KECCACK256_PER_WORD * call_data_words
         + extend_memory.cost
         + init_code_gas,
     )

src/ethereum/forks/amsterdam/vm/interpreter.py

@@ -48,7 +48,7 @@
 from ..vm import Message
 from ..vm.eoa_delegation import get_delegated_code_address, set_delegation
 from ..vm.gas import (
-    GAS_KECCAK256_PER_WORD,
+    GasCosts,
     charge_gas,
     charge_state_gas,
     state_gas_per_byte,
@@ -225,7 +225,7 @@ def process_create_message(message: Message) -> Evm:
                 raise OutOfGasError
             # Hash cost for computing keccak256 of deployed bytecode
             code_hash_gas = (
-                GAS_KECCAK256_PER_WORD
+                GasCosts.OPCODE_KECCACK256_PER_WORD
                 * ceil32(Uint(len(contract_code)))
                 // Uint(32)
             )