touch code

Author: chirag-parmar

execution_chain/constants.nim

@@ -62,8 +62,8 @@ const
   # See EIP-170 (https://eips.ethereum.org/EIPS/eip-170) Maximum code size
   # that can be stored for a new contract.  Init code when creating a new
   # contract is not subject to this limit.
-  EIP170_SIZE_THRESHOLD* =                  0x6000
-  # See See EIP-170 (https://eips.ethereum.org/EIPS/eip-170). Update to limits
+  EIP170_MAX_CODE_SIZE* =                   0x6000
+  # See See EIP-7907 (https://eips.ethereum.org/EIPS/eip-7907). Update to limits
   CODE_SIZE_THRESHOLD* =                    0x6000
   EIP7907_MAX_CODE_SIZE* =                  0x40000
 

execution_chain/db/access_list.nim

@@ -21,7 +21,7 @@ type
 
   AccessList* = object
     slots: Table[Address, SlotSet]
-    codeAddrs: seq[Address]
+    codeAddrs: HashSet[Address]
 
 # ------------------------------------------------------------------------------
 # Private helpers
@@ -37,7 +37,7 @@ func toStorageKeys(slots: SlotSet): seq[Bytes32] =
 
 proc init*(ac: var AccessList) =
   ac.slots = Table[Address, SlotSet]()
-  ac.codeAddrs = newSeq[Address]()
+  ac.codeAddrs = HashSet[Address]()
 
 proc init*(_: type AccessList): AccessList {.inline.} =
   result.init()
@@ -73,12 +73,11 @@ proc add*(ac: var AccessList, address: Address, slot: UInt256) =
     ac.slots[address] = toHashSet([slot])
 
 proc addCode*(ac: var AccessList, codeAddr: Address) =
-  if codeAddr notin ac.codeAddrs:
-    ac.codeAddrs.add(codeAddr)
+  ac.codeAddrs.incl codeAddr
 
 proc clear*(ac: var AccessList) {.inline.} =
   ac.slots.clear()
-  ac.codeAddrs.setLen(0)
+  ac.codeAddrs.clear()
 
 # TODO: accesses code is still not a part of the transaction access list
 # but when it does trickle down into the transaction we will have to add

execution_chain/db/ledger.nim

@@ -829,7 +829,7 @@ proc accessList*(ac: LedgerRef, address: Address) =
 proc accessList*(ac: LedgerRef, address: Address, slot: UInt256) =
   ac.savePoint.accessList.add(address, slot)
 
-proc accessList*(ac: LedgerRef, codeAddr: Address) =
+proc codeAccessList*(ac: LedgerRef, codeAddr: Address) =
   ac.savePoint.accessList.addCode(codeAddr)
 
 func inAccessList*(ac: LedgerRef, address: Address): bool =

execution_chain/evm/computation.nim

@@ -219,7 +219,7 @@ proc writeContract*(c: Computation) =
     c.setError(StatusCode.OutOfGas, true)
     return
   # EIP-170 constraint (https://eips.ethereum.org/EIPS/eip-170).
-  elif fork >= FkSpurious and len > EIP7907_MAX_CODE_SIZE:
+  elif fork >= FkSpurious and len > EIP170_MAX_CODE_SIZE:
     withExtra trace, "New contract code exceeds EIP-170 limit",
       codeSize=len, maxSize=EIP170_MAX_CODE_SIZE
     c.setError(StatusCode.OutOfGas, true)

execution_chain/evm/interpreter/op_handlers/oph_create.nim

@@ -117,6 +117,10 @@ proc createOp(cpt: VmCpt): EvmResultVoid =
     createMsgGas -= createMsgGas div 64
   ? cpt.gasMeter.consumeGas(createMsgGas, reason = "CREATE msg gas")
 
+  if cpt.fork >= FkOsaka:
+    cpt.vmState.mutateLedger:
+      db.codeAccessList(cpt.msg.contractAddress)
+
   var
     childMsg = Message(
       kind:   CallKind.Create,
@@ -187,6 +191,11 @@ proc create2Op(cpt: VmCpt): EvmResultVoid =
         balance = senderBalance
       return ok()
 
+  if cpt.fork >= FkOsaka:
+    cpt.vmState.mutateLedger:
+      db.codeAccessList(cpt.msg.contractAddress)
+
+
   var createMsgGas = cpt.gasMeter.gasRemaining
   if cpt.fork >= FkTangerine:
     createMsgGas -= createMsgGas div 64

execution_chain/evm/interpreter/op_handlers/oph_defs.nim

@@ -82,9 +82,12 @@ const
   VmOpCancunAndLater* =
     VmOpShanghaiAndLater - {FkShanghai}
 
-  VmOpOsakaAndLater* =
+  VmOpPragueAndLater* =
     VmOpCancunAndLater - {FkCancun}
 
+  VmOpOsakaAndLater* =
+    VmOpPragueAndLater - {FkPrague}
+
 
 # ------------------------------------------------------------------------------
 # End

execution_chain/evm/interpreter/op_handlers/oph_envinfo.nim

@@ -198,7 +198,7 @@ proc extCodeCopyEIP7907Op(cpt: VmCpt): EvmResultVoid =
     codePos = cpt.stack.lsPeekMemRef(^3)
     len     = cpt.stack.lsPeekMemRef(^4)
     gasCost = cpt.gasCosts[ExtCodeCopy].m_handler(cpt.memory.len, memPos, len) +
-                cpt.gasEip2929AccountCheck(address) + cpt.gasCallEIP7907(addresss)
+                cpt.gasEip2929AccountCheck(address) + cpt.gasCallEIP7907(address)
 
   cpt.stack.lsShrink(4)
   ? cpt.opcodeGasCost(ExtCodeCopy, gasCost, reason = "ExtCodeCopy EIP7907")
@@ -207,7 +207,6 @@ proc extCodeCopyEIP7907Op(cpt: VmCpt): EvmResultVoid =
   cpt.memory.writePadded(code.bytes(), memPos, codePos, len)
   ok()
 
-
 # -----------
 
 func returnDataSizeOp(cpt: VmCpt): EvmResultVoid =
@@ -364,7 +363,7 @@ const
 
 
     (opCode: ExtCodeCopy,    ## 0x3c, Account Code-copy for Berlin through Cancun
-     forks: VmOpBerlinAndLater,
+     forks: VmOpBerlinAndLater - VmOpOsakaAndLater,
      name: "extCodeCopyEIP2929",
      info: "EIP2929: Copy an account's code to memory",
      exec: extCodeCopyEIP2929Op),

execution_chain/evm/interpreter/op_handlers/oph_helpers.nim

@@ -15,8 +15,10 @@
 {.push raises: [].}
 
 import
+  ../../../constants,
   ../../../core/eip7702,
   ../../evm_errors,
+  ../../interpreter/utils/utils_numeric,
   ../../types,
   ../gas_costs,
   eth/common/[addresses, base],
@@ -68,10 +70,9 @@ proc gasEip7702CodeCheck*(c: Computation; address: Address): GasInt =
 
 proc gasCallEIP7907*(c: Computation, codeAddress: Address): GasInt =
   c.vmState.mutateLedger:
-    let codeHash = db.getCodeHash(codeAddress)
 
-    if not db.inAccessList(codeHash):
-      db.accessList(codeHash)
+    if not db.inCodeAccessList(codeAddress):
+      db.codeAccessList(codeAddress)
 
       let
         code = db.getCode(codeAddress)

hive_integration/nodocker/engine/withdrawals/wd_max_init_code_spec.nim

@@ -32,7 +32,7 @@ type
     overflowMaxInitcodeTxCountAfterFork *: uint64
 
 const
-  MAX_INITCODE_SIZE = EIP170_MAX_INITCODE_SIZE
+  MAX_INITCODE_SIZE = EIP3860_MAX_INITCODE_SIZE
 
 proc execute*(ws: MaxInitcodeSizeSpec, env: TestEnv): bool =
   testCond waitFor env.clMock.waitForTTD()