temp

Author: LouisTsai-Csie

packages/testing/src/execution_testing/forks/forks/forks.py

@@ -115,44 +115,44 @@ def gas_costs(
         """
         del block_number, timestamp
         return GasCosts(
-            G_JUMPDEST=1,
-            G_BASE=2,
-            G_VERY_LOW=3,
-            G_LOW=5,
-            G_MID=8,
-            G_HIGH=10,
-            G_WARM_ACCOUNT_ACCESS=100,
-            G_COLD_ACCOUNT_ACCESS=2_600,
+            GAS_JUMPDEST=1,
+            GAS_BASE=2,
+            GAS_VERY_LOW=3,
+            GAS_LOW=5,
+            GAS_MID=8,
+            GAS_HIGH=10,
+            GAS_WARM_ACCESS=100,
+            GAS_COLD_ACCOUNT_ACCESS=2_600,
             G_ACCESS_LIST_ADDRESS=2_400,
             G_ACCESS_LIST_STORAGE=1_900,
             G_WARM_SLOAD=100,
-            G_COLD_SLOAD=2_100,
-            G_STORAGE_SET=20_000,
-            G_STORAGE_RESET=2_900,
-            R_STORAGE_CLEAR=4_800,
-            G_SELF_DESTRUCT=5_000,
-            G_CREATE=32_000,
-            G_CODE_DEPOSIT_BYTE=200,
+            GAS_COLD_SLOAD=2_100,
+            GAS_STORAGE_SET=20_000,
+            GAS_STORAGE_UPDATE=2_900,
+            GAS_STORAGE_CLEAR_REFUND=4_800,
+            GAS_SELF_DESTRUCT=5_000,
+            GAS_CREATE=32_000,
+            GAS_CODE_DEPOSIT=200,
             G_INITCODE_WORD=2,
-            G_CALL_VALUE=9_000,
-            G_CALL_STIPEND=2_300,
-            G_NEW_ACCOUNT=25_000,
-            G_EXP=10,
-            G_EXP_BYTE=50,
-            G_MEMORY=3,
+            GAS_CALL_VALUE=9_000,
+            GAS_CALL_STIPEND=2_300,
+            GAS_NEW_ACCOUNT=25_000,
+            GAS_EXPONENTIATION=10,
+            GAS_EXPONENTIATION_PER_BYTE=50,
+            GAS_MEMORY=3,
             G_TX_DATA_ZERO=4,
             G_TX_DATA_NON_ZERO=68,
             G_TX_DATA_STANDARD_TOKEN_COST=0,
             G_TX_DATA_FLOOR_TOKEN_COST=0,
             G_TRANSACTION=21_000,
             G_TRANSACTION_CREATE=32_000,
-            G_LOG=375,
-            G_LOG_DATA=8,
-            G_LOG_TOPIC=375,
-            G_KECCAK_256=30,
-            G_KECCAK_256_WORD=6,
-            G_COPY=3,
-            G_BLOCKHASH=20,
+            GAS_LOG=375,
+            GAS_LOG_DATA=8,
+            GAS_LOG_TOPIC=375,
+            GAS_KECCAK256=30,
+            GAS_KECCAK256_WORD=6,
+            GAS_COPY=3,
+            GAS_BLOCK_HASH=20,
             G_AUTHORIZATION=0,
             R_AUTHORIZATION_EXISTING_AUTHORITY=0,
         )
@@ -176,7 +176,7 @@ def fn(*, new_bytes: int, previous_bytes: int = 0) -> int:
             previous_words = ceiling_division(previous_bytes, 32)
 
             def c(w: int) -> int:
-                return (gas_costs.G_MEMORY * w) + ((w * w) // 512)
+                return (gas_costs.GAS_MEMORY * w) + ((w * w) // 512)
 
             return c(new_words) - c(previous_words)
 
@@ -2325,6 +2325,27 @@ def blob_base_cost(
         del block_number, timestamp
         return 2**13  # EIP-7918 new parameter
 
+    @classmethod
+    def gas_costs(
+        cls, *, block_number: int = 0, timestamp: int = 0
+    ) -> GasCosts:
+        """Return the gas costs for the fork."""
+        from ethereum.forks.osaka.vm import gas as g
+        from dataclasses import fields
+
+        # Build kwargs by matching GasCosts field names with gas module variables
+        kwargs = {}
+        for field in fields(GasCosts):
+            if hasattr(g, field.name):
+                kwargs[field.name] = getattr(g, field.name)
+            # Handle special mappings where names differ
+            elif field.name == "G_WARM_SLOAD":
+                kwargs[field.name] = g.GAS_WARM_ACCESS
+            elif field.name == "G_INITCODE_WORD":
+                kwargs[field.name] = g.GAS_INIT_CODE_WORD_COST
+
+        return GasCosts(**kwargs)
+
 
 class BPO1(Osaka, bpo_fork=True):
     """Mainnet BPO1 fork - Blob Parameter Only fork 1."""

packages/testing/src/execution_testing/forks/gas_costs.py

@@ -7,37 +7,37 @@
 class GasCosts:
     """Class that contains the gas cost constants for any fork."""
 
-    G_JUMPDEST: int
-    G_BASE: int
-    G_VERY_LOW: int
-    G_LOW: int
-    G_MID: int
-    G_HIGH: int
-    G_WARM_ACCOUNT_ACCESS: int
-    G_COLD_ACCOUNT_ACCESS: int
+    GAS_JUMPDEST: int
+    GAS_BASE: int
+    GAS_VERY_LOW: int
+    GAS_LOW: int
+    GAS_MID: int
+    GAS_HIGH: int
+    GAS_WARM_ACCESS: int
+    GAS_COLD_ACCOUNT_ACCESS: int
     G_ACCESS_LIST_ADDRESS: int
     G_ACCESS_LIST_STORAGE: int
     G_WARM_SLOAD: int
-    G_COLD_SLOAD: int
-    G_STORAGE_SET: int
-    G_STORAGE_RESET: int
+    GAS_COLD_SLOAD: int
+    GAS_STORAGE_SET: int
+    GAS_STORAGE_UPDATE: int
 
-    R_STORAGE_CLEAR: int
+    GAS_STORAGE_CLEAR_REFUND: int
 
-    G_SELF_DESTRUCT: int
-    G_CREATE: int
+    GAS_SELF_DESTRUCT: int
+    GAS_CREATE: int
 
-    G_CODE_DEPOSIT_BYTE: int
+    GAS_CODE_DEPOSIT: int
     G_INITCODE_WORD: int
 
-    G_CALL_VALUE: int
-    G_CALL_STIPEND: int
-    G_NEW_ACCOUNT: int
+    GAS_CALL_VALUE: int
+    GAS_CALL_STIPEND: int
+    GAS_NEW_ACCOUNT: int
 
-    G_EXP: int
-    G_EXP_BYTE: int
+    GAS_EXPONENTIATION: int
+    GAS_EXPONENTIATION_PER_BYTE: int
 
-    G_MEMORY: int
+    GAS_MEMORY: int
 
     G_TX_DATA_ZERO: int
     G_TX_DATA_NON_ZERO: int
@@ -47,15 +47,15 @@ class GasCosts:
     G_TRANSACTION: int
     G_TRANSACTION_CREATE: int
 
-    G_LOG: int
-    G_LOG_DATA: int
-    G_LOG_TOPIC: int
+    GAS_LOG: int
+    GAS_LOG_DATA: int
+    GAS_LOG_TOPIC: int
 
-    G_KECCAK_256: int
-    G_KECCAK_256_WORD: int
+    GAS_KECCAK256: int
+    GAS_KECCAK256_WORD: int
 
-    G_COPY: int
-    G_BLOCKHASH: int
+    GAS_COPY: int
+    GAS_BLOCK_HASH: int
 
     G_AUTHORIZATION: int
 

packages/testing/src/execution_testing/tools/utility/generators.py

@@ -347,9 +347,9 @@ def wrapper(
                 # code will only work once, so if the system contract is re-
                 # executed in a subsequent block, it will consume less gas.
                 gas_used_per_storage = (
-                    gas_costs.G_STORAGE_SET
-                    + gas_costs.G_COLD_SLOAD
-                    + (gas_costs.G_VERY_LOW * 2)
+                    gas_costs.GAS_STORAGE_SET
+                    + gas_costs.GAS_COLD_SLOAD
+                    + (gas_costs.GAS_VERY_LOW * 2)
                 )
                 modified_system_contract_code += sum(
                     Op.SSTORE(i, 1)
@@ -358,8 +358,8 @@ def wrapper(
                 # If the gas limit is not divisible by the gas used per
                 # storage, we need to add some NO-OP (JUMPDEST) to the code
                 # that each consume 1 gas.
-                assert gas_costs.G_JUMPDEST == 1, (
-                    f"JUMPDEST gas cost should be 1, but got {gas_costs.G_JUMPDEST}. "
+                assert gas_costs.GAS_JUMPDEST == 1, (
+                    f"JUMPDEST gas cost should be 1, but got {gas_costs.GAS_JUMPDEST}. "
                     "Generator `generate_system_contract_error_test` needs to be updated."
                 )
                 modified_system_contract_code += sum(

src/ethereum/forks/gas_repricing/utils/gas_cost.yaml

@@ -8,63 +8,63 @@
 # Variable names follow the test framework convention (G_ prefix)
 static_costs:
   # Basic operation costs
-  G_JUMPDEST: 1
-  G_BASE: 2
-  G_VERY_LOW: 3
-  G_LOW: 5
-  G_MID: 8
-  G_HIGH: 10
+  GAS_JUMPDEST: 1
+  GAS_BASE: 2
+  GAS_VERY_LOW: 3
+  GAS_LOW: 5
+  GAS_MID: 8
+  GAS_HIGH: 10
 
   # Storage costs
-  G_STORAGE_SET: 20000
-  G_STORAGE_RESET: 5000
-  R_STORAGE_CLEAR: 4800
+  GAS_STORAGE_SET: 20000
+  GAS_STORAGE_UPDATE: 5000
+  GAS_STORAGE_CLEAR_REFUND: 4800
 
   # Access costs (EIP-2929)
-  G_COLD_SLOAD: 2100
-  G_COLD_ACCOUNT_ACCESS: 2600
-  G_WARM_ACCOUNT_ACCESS: 100
+  GAS_COLD_SLOAD: 2100
+  GAS_COLD_ACCOUNT_ACCESS: 2600
+  GAS_WARM_ACCESS: 100
   G_WARM_SLOAD: 100
   G_ACCESS_LIST_ADDRESS: 2400
   G_ACCESS_LIST_STORAGE: 1900
 
   # Exponentiation costs
-  G_EXP: 10
-  G_EXP_BYTE: 50
+  GAS_EXPONENTIATION: 10
+  GAS_EXPONENTIATION_PER_BYTE: 50
 
   # Memory costs
-  G_MEMORY: 3
+  GAS_MEMORY: 3
 
   # Keccak256 costs
-  G_KECCAK_256: 30
-  G_KECCAK_256_WORD: 6
+  GAS_KECCAK256: 30
+  GAS_KECCAK256_WORD: 6
 
   # Copy operation costs
-  G_COPY: 3
+  GAS_COPY: 3
 
   # Block operation costs
-  G_BLOCKHASH: 20
+  GAS_BLOCK_HASH: 20
 
   # Log costs
-  G_LOG: 375
-  G_LOG_DATA: 8
-  G_LOG_TOPIC: 375
+  GAS_LOG: 375
+  GAS_LOG_DATA: 8
+  GAS_LOG_TOPIC: 375
 
   # Create costs
-  G_CREATE: 32000
-  G_CODE_DEPOSIT_BYTE: 200
+  GAS_CREATE: 32000
+  GAS_CODE_DEPOSIT: 200
 
   # Transaction costs
   G_TRANSACTION: 21000
   G_TRANSACTION_CREATE: 32000
 
   # Account creation and value transfer costs
-  G_NEW_ACCOUNT: 25000
-  G_CALL_VALUE: 9000
-  G_CALL_STIPEND: 2300
+  GAS_NEW_ACCOUNT: 25000
+  GAS_CALL_VALUE: 9000
+  GAS_CALL_STIPEND: 2300
 
   # Self-destruct costs
-  G_SELF_DESTRUCT: 5000
+  GAS_SELF_DESTRUCT: 5000
 
   # Transaction data costs
   G_TX_DATA_ZERO: 4
@@ -124,14 +124,14 @@ opcode_costs:
   SHL: BASE_OPCODE_COST
   SHR: BASE_OPCODE_COST
   SAR: BASE_OPCODE_COST
-  CLZ: G_VERY_LOW
+  CLZ: GAS_VERY_LOW
 
   # Keccak operation
-  KECCAK: G_KECCAK_256  # 0x20 - plus G_KECCAK_256_WORD per word
+  KECCAK: GAS_KECCAK256  # 0x20 - plus GAS_KECCAK256_WORD per word
 
   # Environmental operations
   ADDRESS: BASE_OPCODE_COST
-  BALANCE: G_COLD_ACCOUNT_ACCESS
+  BALANCE: GAS_COLD_ACCOUNT_ACCESS
   ORIGIN: BASE_OPCODE_COST
   CALLER: BASE_OPCODE_COST
   CALLVALUE: BASE_OPCODE_COST
@@ -141,24 +141,24 @@ opcode_costs:
   CODESIZE: BASE_OPCODE_COST
   CODECOPY: BASE_OPCODE_COST
   GASPRICE: BASE_OPCODE_COST
-  EXTCODESIZE: G_COLD_ACCOUNT_ACCESS
-  EXTCODECOPY: G_COLD_ACCOUNT_ACCESS
+  EXTCODESIZE: GAS_COLD_ACCOUNT_ACCESS
+  EXTCODECOPY: GAS_COLD_ACCOUNT_ACCESS
   RETURNDATASIZE: BASE_OPCODE_COST
   RETURNDATACOPY: BASE_OPCODE_COST
-  EXTCODEHASH: G_WARM_ACCOUNT_ACCESS
+  EXTCODEHASH: GAS_WARM_ACCESS
 
   # Block operations
-  BLOCKHASH: G_BLOCKHASH
+  BLOCKHASH: GAS_BLOCK_HASH
   COINBASE: BASE_OPCODE_COST
   TIMESTAMP: BASE_OPCODE_COST
   NUMBER: BASE_OPCODE_COST
-  PREVRANDAO: G_BASE
+  PREVRANDAO: GAS_BASE
   GASLIMIT: BASE_OPCODE_COST
   CHAINID: BASE_OPCODE_COST
   SELFBALANCE: BASE_OPCODE_COST
-  BASEFEE: G_BASE
-  BLOBHASH: G_BASE
-  BLOBBASEFEE: G_BASE
+  BASEFEE: GAS_BASE
+  BLOBHASH: GAS_BASE
+  BLOBBASEFEE: GAS_BASE
 
   # Memory operations
   MLOAD: BASE_OPCODE_COST
@@ -171,8 +171,8 @@ opcode_costs:
   POP: BASE_OPCODE_COST
 
   # Storage operations
-  SLOAD: G_COLD_SLOAD
-  SSTORE: G_STORAGE_SET
+  SLOAD: GAS_COLD_SLOAD
+  SSTORE: GAS_STORAGE_SET
   TLOAD: WARM_STORAGE_READ_COST
   TSTORE: WARM_STORAGE_READ_COST
 
@@ -194,15 +194,15 @@ opcode_costs:
   SWAP: BASE_OPCODE_COST
 
   # Log operations
-  LOG0: G_LOG
+  LOG0: GAS_LOG
 
   # System operations
-  CREATE: G_CREATE
-  CALL: G_COLD_ACCOUNT_ACCESS
-  CALLCODE: G_COLD_ACCOUNT_ACCESS
-  RETURN: G_BASE
-  DELEGATECALL: G_COLD_ACCOUNT_ACCESS
-  CREATE2: G_CREATE
-  STATICCALL: G_COLD_ACCOUNT_ACCESS
-  REVERT: G_BASE
-  SELFDESTRUCT: G_SELF_DESTRUCT
+  CREATE: GAS_CREATE
+  CALL: GAS_COLD_ACCOUNT_ACCESS
+  CALLCODE: GAS_COLD_ACCOUNT_ACCESS
+  RETURN: GAS_BASE
+  DELEGATECALL: GAS_COLD_ACCOUNT_ACCESS
+  CREATE2: GAS_CREATE
+  STATICCALL: GAS_COLD_ACCOUNT_ACCESS
+  REVERT: GAS_BASE
+  SELFDESTRUCT: GAS_SELF_DESTRUCT