feat(osaka): Remove EIP-7907 from Osaka (#1333)

* Revert "introduce warm_code_addresses"

This reverts commit 4708376.

* Revert "Implement EIP-7907"

This reverts commit f069e08.

Author: gurukamath

src/ethereum/osaka/fork.py

@@ -627,7 +627,6 @@ 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,6 +86,5 @@ 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,7 +133,6 @@ 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"]
 
 
@@ -157,7 +156,6 @@ 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:
@@ -177,7 +175,6 @@ 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

@@ -16,7 +16,7 @@
 from ..fork_types import Address, Authorization
 from ..state import account_exists, get_account, increment_nonce, set_code
 from ..utils.hexadecimal import hex_to_address
-from ..vm.gas import GAS_COLD_ACCOUNT_ACCESS, GAS_WARM_ACCESS, code_access_cost
+from ..vm.gas import GAS_COLD_ACCOUNT_ACCESS, GAS_WARM_ACCESS
 from . import Evm, Message
 
 SET_CODE_TX_MAGIC = b"\x05"
@@ -136,16 +136,12 @@ def access_delegation(
         return False, address, code, Uint(0)
 
     address = Address(code[EOA_DELEGATION_MARKER_LENGTH:])
-    code = get_account(state, address).code
     if address in evm.accessed_addresses:
         access_gas_cost = GAS_WARM_ACCESS
     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)
+    code = get_account(state, address).code
 
     return True, address, code, access_gas_cost
 

src/ethereum/osaka/vm/gas.py

@@ -14,7 +14,6 @@
 from dataclasses import dataclass
 from typing import List, Tuple
 
-from ethereum_types.bytes import Bytes
 from ethereum_types.numeric import U64, U256, Uint
 
 from ethereum.trace import GasAndRefund, evm_trace
@@ -282,35 +281,6 @@ def init_code_cost(init_code_length: Uint) -> Uint:
     return GAS_INIT_CODE_WORD_COST * ceil32(init_code_length) // Uint(32)
 
 
-def code_access_cost(code: Bytes) -> Uint:
-    """
-    Calculates the gas to be charged for loading contract code.
-
-    Parameters
-    ----------
-    code :
-        The contract code.
-
-    Returns
-    -------
-    code_access_gas: `ethereum.base_types.Uint`
-        The gas to be charged for loading the code.
-    """
-    from .interpreter import MAX_CODE_SIZE_WITH_NO_ACCESS_COST
-
-    excess_contract_size = max(
-        0, len(code) - MAX_CODE_SIZE_WITH_NO_ACCESS_COST
-    )
-    if excess_contract_size == 0:
-        return Uint(0)
-
-    return (
-        GAS_INIT_CODE_WORD_COST
-        * ceil32(Uint(excess_contract_size))
-        // Uint(32)
-    )
-
-
 def calculate_excess_blob_gas(parent_header: Header) -> U64:
     """
     Calculated the excess blob gas for the current block based

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

@@ -36,7 +36,6 @@
     calculate_blob_gas_price,
     calculate_gas_extend_memory,
     charge_gas,
-    code_access_cost,
 )
 from ..stack import pop, push
 
@@ -390,12 +389,6 @@ def extcodecopy(evm: Evm) -> None:
         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
-        )
-
     charge_gas(evm, access_gas_cost + copy_gas_cost + extend_memory.cost)
 
     # OPERATION

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

@@ -53,7 +53,6 @@
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
-    code_access_cost,
     init_code_cost,
     max_message_call_gas,
 )
@@ -133,7 +132,6 @@ 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)
@@ -324,7 +322,6 @@ 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)
@@ -379,12 +376,6 @@ def call(evm: Evm) -> None:
         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
-        )
-
     code_address = to
     (
         disable_precompiles,
@@ -473,12 +464,6 @@ def callcode(evm: Evm) -> None:
         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
-        )
-
     (
         disable_precompiles,
         code_address,
@@ -618,12 +603,6 @@ def delegatecall(evm: Evm) -> None:
         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
-        )
-
     (
         disable_precompiles,
         code_address,
@@ -692,12 +671,6 @@ def staticcall(evm: Evm) -> None:
         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
-        )
-
     code_address = to
     (
         disable_precompiles,

src/ethereum/osaka/vm/interpreter.py

@@ -63,8 +63,7 @@
 from .runtime import get_valid_jump_destinations
 
 STACK_DEPTH_LIMIT = Uint(1024)
-MAX_CODE_SIZE_WITH_NO_ACCESS_COST = 0x6000
-MAX_CODE_SIZE = 0x40000
+MAX_CODE_SIZE = 0x6000
 MAX_INIT_CODE_SIZE = 2 * MAX_CODE_SIZE
 
 
@@ -289,7 +288,6 @@ 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: