introduce warm_code_addresses

Author: gurukamath

src/ethereum/osaka/fork.py

@@ -628,6 +628,7 @@ def process_system_transaction(
         accessed_addresses=set(),
         accessed_storage_keys=set(),
         disable_precompiles=False,
+        warm_code_addresses=set(),
         parent_evm=None,
     )
 

src/ethereum/osaka/utils/message.py

@@ -86,5 +86,6 @@ def prepare_message(
         accessed_addresses=accessed_addresses,
         accessed_storage_keys=set(tx_env.access_list_storage_keys),
         disable_precompiles=False,
+        warm_code_addresses=set(),
         parent_evm=None,
     )

src/ethereum/osaka/vm/__init__.py

@@ -133,6 +133,7 @@ class Message:
     accessed_addresses: Set[Address]
     accessed_storage_keys: Set[Tuple[Address, Bytes32]]
     disable_precompiles: bool
+    warm_code_addresses: Set[Address]
     parent_evm: Optional["Evm"]
 
 
@@ -156,6 +157,7 @@ class Evm:
     error: Optional[EthereumException]
     accessed_addresses: Set[Address]
     accessed_storage_keys: Set[Tuple[Address, Bytes32]]
+    warm_code_addresses: Set[Address]
 
 
 def incorporate_child_on_success(evm: Evm, child_evm: Evm) -> None:
@@ -175,6 +177,7 @@ def incorporate_child_on_success(evm: Evm, child_evm: Evm) -> None:
     evm.accounts_to_delete.update(child_evm.accounts_to_delete)
     evm.accessed_addresses.update(child_evm.accessed_addresses)
     evm.accessed_storage_keys.update(child_evm.accessed_storage_keys)
+    evm.warm_code_addresses.update(child_evm.warm_code_addresses)
 
 
 def incorporate_child_on_error(evm: Evm, child_evm: Evm) -> None:

src/ethereum/osaka/vm/eoa_delegation.py

@@ -142,6 +142,9 @@ def access_delegation(
     else:
         evm.accessed_addresses.add(address)
         access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+
+    if address not in evm.warm_code_addresses:
+        evm.warm_code_addresses.add(address)
         access_gas_cost += code_access_cost(code)
 
     return True, address, code, access_gas_cost

src/ethereum/osaka/vm/gas.py

@@ -66,7 +66,6 @@
 GAS_COLD_ACCOUNT_ACCESS = Uint(2600)
 GAS_WARM_ACCESS = Uint(100)
 GAS_INIT_CODE_WORD_COST = Uint(2)
-GAS_EXCESS_WORD_COST = Uint(2)
 GAS_BLOBHASH_OPCODE = Uint(3)
 GAS_POINT_EVALUATION = Uint(50000)
 
@@ -305,7 +304,9 @@ def code_access_cost(code: Bytes) -> Uint:
         return Uint(0)
 
     return (
-        GAS_EXCESS_WORD_COST * ceil32(Uint(excess_contract_size)) // Uint(32)
+        GAS_INIT_CODE_WORD_COST
+        * ceil32(Uint(excess_contract_size))
+        // Uint(32)
     )
 
 

src/ethereum/osaka/vm/instructions/environment.py

@@ -389,6 +389,9 @@ def extcodecopy(evm: Evm) -> None:
     else:
         evm.accessed_addresses.add(address)
         access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+
+    if address not in evm.warm_code_addresses:
+        evm.warm_code_addresses.add(address)
         access_gas_cost += code_access_cost(
             get_account(evm.message.block_env.state, address).code
         )

src/ethereum/osaka/vm/instructions/system.py

@@ -133,6 +133,7 @@ def generic_create(
         accessed_addresses=evm.accessed_addresses.copy(),
         accessed_storage_keys=evm.accessed_storage_keys.copy(),
         disable_precompiles=False,
+        warm_code_addresses=evm.warm_code_addresses.copy(),
         parent_evm=evm,
     )
     child_evm = process_create_message(child_message)
@@ -323,6 +324,7 @@ def generic_call(
         accessed_addresses=evm.accessed_addresses.copy(),
         accessed_storage_keys=evm.accessed_storage_keys.copy(),
         disable_precompiles=disable_precompiles,
+        warm_code_addresses=evm.warm_code_addresses.copy(),
         parent_evm=evm,
     )
     child_evm = process_message(child_message)
@@ -376,6 +378,9 @@ def call(evm: Evm) -> None:
     else:
         evm.accessed_addresses.add(to)
         access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+
+    if to not in evm.warm_code_addresses:
+        evm.warm_code_addresses.add(to)
         access_gas_cost += code_access_cost(
             get_account(evm.message.block_env.state, to).code
         )
@@ -469,6 +474,9 @@ def callcode(evm: Evm) -> None:
     else:
         evm.accessed_addresses.add(code_address)
         access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+
+    if code_address not in evm.warm_code_addresses:
+        evm.warm_code_addresses.add(code_address)
         access_gas_cost += code_access_cost(
             get_account(evm.message.block_env.state, code_address).code
         )
@@ -611,6 +619,9 @@ def delegatecall(evm: Evm) -> None:
     else:
         evm.accessed_addresses.add(code_address)
         access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+
+    if code_address not in evm.warm_code_addresses:
+        evm.warm_code_addresses.add(code_address)
         access_gas_cost += code_access_cost(
             get_account(evm.message.block_env.state, code_address).code
         )
@@ -682,6 +693,9 @@ def staticcall(evm: Evm) -> None:
     else:
         evm.accessed_addresses.add(to)
         access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+
+    if to not in evm.warm_code_addresses:
+        evm.warm_code_addresses.add(to)
         access_gas_cost += code_access_cost(
             get_account(evm.message.block_env.state, to).code
         )

src/ethereum/osaka/vm/interpreter.py

@@ -288,6 +288,7 @@ def execute_code(message: Message) -> Evm:
         error=None,
         accessed_addresses=message.accessed_addresses,
         accessed_storage_keys=message.accessed_storage_keys,
+        warm_code_addresses=message.warm_code_addresses,
     )
     try:
         if evm.message.code_address in PRE_COMPILED_CONTRACTS: