Implement EIP-7907

Author: gurukamath

src/ethereum/osaka/transactions.py

@@ -542,14 +542,14 @@ def validate_transaction(tx: Transaction) -> Tuple[Uint, Uint]:
     [EIP-2681]: https://eips.ethereum.org/EIPS/eip-2681
     [EIP-7623]: https://eips.ethereum.org/EIPS/eip-7623
     """
-    from .vm.interpreter import MAX_CODE_SIZE
+    from .vm.interpreter import MAX_INIT_CODE_SIZE
 
     intrinsic_gas, calldata_floor_gas_cost = calculate_intrinsic_cost(tx)
     if max(intrinsic_gas, calldata_floor_gas_cost) > tx.gas:
         raise InvalidTransaction("Insufficient gas")
     if U256(tx.nonce) >= U256(U64.MAX_VALUE):
         raise InvalidTransaction("Nonce too high")
-    if tx.to == Bytes0(b"") and len(tx.data) > 2 * MAX_CODE_SIZE:
+    if tx.to == Bytes0(b"") and len(tx.data) > MAX_INIT_CODE_SIZE:
         raise InvalidTransaction("Code size too large")
     if tx.gas > TX_MAX_GAS_LIMIT:
         raise InvalidTransaction("Gas limit too high")

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
+from ..vm.gas import GAS_COLD_ACCOUNT_ACCESS, GAS_WARM_ACCESS, code_access_cost
 from . import Evm, Message
 
 SET_CODE_TX_MAGIC = b"\x05"
@@ -136,12 +136,13 @@ 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
-    code = get_account(state, address).code
+        access_gas_cost += code_access_cost(code)
 
     return True, address, code, access_gas_cost
 

src/ethereum/osaka/vm/gas.py

@@ -14,6 +14,7 @@
 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
@@ -65,6 +66,7 @@
 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)
 
@@ -280,6 +282,33 @@ 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_EXCESS_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,6 +36,7 @@
     calculate_blob_gas_price,
     calculate_gas_extend_memory,
     charge_gas,
+    code_access_cost,
 )
 from ..stack import pop, push
 
@@ -388,6 +389,9 @@ def extcodecopy(evm: Evm) -> None:
     else:
         evm.accessed_addresses.add(address)
         access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        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)
 

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

@@ -53,6 +53,7 @@
     calculate_gas_extend_memory,
     calculate_message_call_gas,
     charge_gas,
+    code_access_cost,
     init_code_cost,
     max_message_call_gas,
 )
@@ -73,15 +74,15 @@ def generic_create(
     # This import causes a circular import error
     # if it's not moved inside this method
     from ...vm.interpreter import (
-        MAX_CODE_SIZE,
+        MAX_INIT_CODE_SIZE,
         STACK_DEPTH_LIMIT,
         process_create_message,
     )
 
     call_data = memory_read_bytes(
         evm.memory, memory_start_position, memory_size
     )
-    if len(call_data) > 2 * MAX_CODE_SIZE:
+    if len(call_data) > MAX_INIT_CODE_SIZE:
         raise OutOfGasError
 
     create_message_gas = max_message_call_gas(Uint(evm.gas_left))
@@ -375,6 +376,9 @@ def call(evm: Evm) -> None:
     else:
         evm.accessed_addresses.add(to)
         access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost += code_access_cost(
+            get_account(evm.message.block_env.state, to).code
+        )
 
     code_address = to
     (
@@ -465,6 +469,9 @@ def callcode(evm: Evm) -> None:
     else:
         evm.accessed_addresses.add(code_address)
         access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost += code_access_cost(
+            get_account(evm.message.block_env.state, code_address).code
+        )
 
     (
         disable_precompiles,
@@ -604,6 +611,9 @@ def delegatecall(evm: Evm) -> None:
     else:
         evm.accessed_addresses.add(code_address)
         access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost += code_access_cost(
+            get_account(evm.message.block_env.state, code_address).code
+        )
 
     (
         disable_precompiles,
@@ -672,6 +682,9 @@ def staticcall(evm: Evm) -> None:
     else:
         evm.accessed_addresses.add(to)
         access_gas_cost = GAS_COLD_ACCOUNT_ACCESS
+        access_gas_cost += code_access_cost(
+            get_account(evm.message.block_env.state, to).code
+        )
 
     code_address = to
     (

src/ethereum/osaka/vm/interpreter.py

@@ -63,7 +63,9 @@
 from .runtime import get_valid_jump_destinations
 
 STACK_DEPTH_LIMIT = Uint(1024)
-MAX_CODE_SIZE = 0x6000
+MAX_CODE_SIZE_WITH_NO_ACCESS_COST = 0x6000
+MAX_CODE_SIZE = 0x40000
+MAX_INIT_CODE_SIZE = 0x80000
 
 
 @dataclass