forked update

Author: chirag-parmar

execution_chain/constants.nim

@@ -59,15 +59,19 @@ const
 
   ## Fork specific constants
 
-  # See EIP-7907 (https://eips.ethereum.org/EIPS/eip-7907) Maximum code size
+  # 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
   CODE_SIZE_THRESHOLD* =                    0x6000
   EIP7907_MAX_CODE_SIZE* =                  0x40000
 
-  # See EIP-7907 (https://eips.ethereum.org/EIPS/eip-7907). Maximum initcode
+  # See EIP-3860 (https://eips.ethereum.org/EIPS/eip-3860). Maximum initcode
   # size when creating a new contract.
-  EIP7907_MAX_INITCODE_SIZE* =              0x80000 # 2 * EIP7907_MAX_CODE_SIZE
+  EIP3860_MAX_INITCODE_SIZE* =              2 * EIP170_MAX_CODE_SIZE
+  # See EIP-7907 (https://eips.ethereum.org/EIPS/eip-7907).
+  EIP7907_MAX_INITCODE_SIZE* =              2 * EIP7907_MAX_CODE_SIZE
 
   # EIP
   MaxPrecompilesAddr* =                     0xFFFF

execution_chain/core/validate.nim

@@ -228,8 +228,12 @@ func validateTxBasic*(
     if tx.txType == TxEip7702 and fork < FkPrague:
       return err("invalid tx: Eip7702 Tx type detected before Prague")
 
-  if fork >= FkShanghai and tx.contractCreation and tx.payload.len > EIP7907_MAX_INITCODE_SIZE:
-    return err("invalid tx: initcode size exceeds maximum")
+  if tx.contractCreation:
+    if fork >= FkOsaka and tx.payload.len > EIP7907_MAX_INITCODE_SIZE:
+      return err("invalid tx: initcode size exceeds maximum")
+    elif fork >= FkShanghai and tx.payload.len > EIP3860_MAX_INITCODE_SIZE:
+      return err("invalid tx: initcode size exceeds maximum")
+
 
   # The total must be the larger of the two
   if tx.maxFeePerGasNorm < tx.maxPriorityFeePerGasNorm:

execution_chain/db/access_list.nim

@@ -21,7 +21,7 @@ type
 
   AccessList* = object
     slots: Table[Address, SlotSet]
-    codeHashes: seq[Hash32]
+    codeAddrs: seq[Address]
 
 # ------------------------------------------------------------------------------
 # Private helpers
@@ -37,7 +37,7 @@ func toStorageKeys(slots: SlotSet): seq[Bytes32] =
 
 proc init*(ac: var AccessList) =
   ac.slots = Table[Address, SlotSet]()
-  ac.codeHashes = newSeq[Hash32]()
+  ac.codeAddrs = newSeq[Address]()
 
 proc init*(_: type AccessList): AccessList {.inline.} =
   result.init()
@@ -49,8 +49,8 @@ proc init*(_: type AccessList): AccessList {.inline.} =
 func contains*(ac: AccessList, address: Address): bool {.inline.} =
   address in ac.slots
 
-func contains*(ac: AccessList, codeHash: Hash32): bool {.inline.} =
-  codeHash in ac.codeHashes
+func containsCode*(ac: AccessList, codeAddr: Address): bool {.inline.} =
+  codeAddr in ac.codeAddrs
 
 # returnValue: (addressPresent, slotPresent)
 func contains*(ac: var AccessList, address: Address, slot: UInt256): bool =
@@ -60,7 +60,7 @@ func contains*(ac: var AccessList, address: Address, slot: UInt256): bool =
 proc mergeAndReset*(ac, other: var AccessList) =
   # move values in `other` to `ac`
   ac.slots.mergeAndReset(other.slots)
-  ac.codeHashes.mergeAndReset(other.codeHashes)
+  ac.codeAddrs.mergeAndReset(other.codeAddrs)
 
 proc add*(ac: var AccessList, address: Address) =
   if address notin ac.slots:
@@ -72,13 +72,13 @@ proc add*(ac: var AccessList, address: Address, slot: UInt256) =
   do:
     ac.slots[address] = toHashSet([slot])
 
-proc add*(ac: var AccessList, codeHash: Hash32) =
-  if codeHash notin ac.codeHashes:
-    ac.codeHashes.add(codeHash)
+proc addCode*(ac: var AccessList, codeAddr: Address) =
+  if codeAddr notin ac.codeAddrs:
+    ac.codeAddrs.add(codeAddr)
 
 proc clear*(ac: var AccessList) {.inline.} =
   ac.slots.clear()
-  ac.codeHashes.setLen(0)
+  ac.codeAddrs.setLen(0)
 
 # 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
@@ -105,8 +105,8 @@ func equal*(ac: AccessList, other: var AccessList): bool =
     do:
       return false
 
-  for codeHash in ac.codeHashes:
-    if codeHash notin other:
+  for codeAddr in ac.codeAddrs:
+    if codeAddr notin other:
       return false
 
   true

execution_chain/db/ledger.nim

@@ -829,8 +829,8 @@ proc accessList*(ac: LedgerRef, address: Address) =
 proc accessList*(ac: LedgerRef, address: Address, slot: UInt256) =
   ac.savePoint.accessList.add(address, slot)
 
-proc accessList*(ac: LedgerRef, codeHash: Hash32) =
-  ac.savePoint.accessList.add(codeHash)
+proc accessList*(ac: LedgerRef, codeAddr: Address) =
+  ac.savePoint.accessList.addCode(codeAddr)
 
 func inAccessList*(ac: LedgerRef, address: Address): bool =
   var sp = ac.savePoint
@@ -848,10 +848,10 @@ func inAccessList*(ac: LedgerRef, address: Address, slot: UInt256): bool =
       return
     sp = sp.parentSavepoint
 
-func inAccessList*(ac: LedgerRef, codeHash: Hash32): bool =
+func inCodeAccessList*(ac: LedgerRef, codeAddr: Address): bool =
   var sp = ac.savePoint
   while sp != nil:
-    result = sp.accessList.contains(codeHash)
+    result = sp.accessList.containsCode(codeAddr)
     if result:
       return
     sp = sp.parentSavepoint

execution_chain/evm/computation.nim

@@ -207,10 +207,23 @@ proc writeContract*(c: Computation) =
 
   # EIP-170 constraint (https://eips.ethereum.org/EIPS/eip-3541).
   if fork >= FkSpurious and len > EIP7907_MAX_CODE_SIZE:
+    withExtra trace, "New contract code exceeds EIP-170 limit",
+      codeSize=len, maxSize=EIP170_MAX_CODE_SIZE
+    c.setError(StatusCode.OutOfGas, true)
+    return
+
+  # EIP-7907 constraint (https://eips.ethereum.org/EIPS/eip-7907).
+  if fork >= FkOsaka and len > EIP7907_MAX_CODE_SIZE:
     withExtra trace, "New contract code exceeds EIP-7907 limit",
       codeSize=len, maxSize=EIP7907_MAX_CODE_SIZE
     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:
+    withExtra trace, "New contract code exceeds EIP-170 limit",
+      codeSize=len, maxSize=EIP170_MAX_CODE_SIZE
+    c.setError(StatusCode.OutOfGas, true)
+    return
 
   # Charge gas and write the code even if the code address is self-destructed.
   # Non-empty code in a newly created, self-destructed account is possible if

execution_chain/evm/interpreter/op_handlers/oph_call.nim

@@ -66,19 +66,6 @@ proc gasCallEIP2929(c: Computation, address: Address): GasInt =
       # the form of a constant `gasCall`
       return ColdAccountAccessCost - WarmStorageReadCost
 
-proc gasCallEIP7907(c: Computation, codeAddress: Address): GasInt =
-  c.vmState.mutateLedger:
-    let codeHash = db.getCodeHash(codeAddress)
-
-    if not db.inAccessList(codeHash):
-      db.accessList(codeHash)
-
-      let
-        code = db.getCode(codeAddress)
-        excessContractSize = max(0, code.len - CODE_SIZE_THRESHOLD)
-        largeContractCost = (ceil32(excessContractSize) * 2) div 32
-      return GasInt(largeContractCost)
-
 proc updateStackAndParams(q: var LocalParams; c: Computation) =
   c.stack.lsTop(0)
 

execution_chain/evm/interpreter/op_handlers/oph_create.nim

@@ -76,8 +76,11 @@ proc createOp(cpt: VmCpt): EvmResultVoid =
   cpt.stack.lsShrink(2)
   cpt.stack.lsTop(0)
 
-  # EIP-3860
-  if cpt.fork >= FkShanghai and memLen > EIP7907_MAX_INITCODE_SIZE:
+  # EIP-7907 and EIP-3860
+  if cpt.fork >= FkOsaka and memLen > EIP7907_MAX_INITCODE_SIZE:
+    trace "Initcode size exceeds maximum", initcodeSize = memLen
+    return err(opErr(InvalidInitCode))
+  elif cpt.fork >= FkShanghai and memLen > EIP3860_MAX_INITCODE_SIZE:
     trace "Initcode size exceeds maximum", initcodeSize = memLen
     return err(opErr(InvalidInitCode))
 
@@ -146,8 +149,11 @@ proc create2Op(cpt: VmCpt): EvmResultVoid =
   cpt.stack.lsShrink(3)
   cpt.stack.lsTop(0)
 
-  # EIP-3860
-  if cpt.fork >= FkShanghai and memLen > EIP7907_MAX_INITCODE_SIZE:
+  # EIP-7907 and EIP-3860
+  if cpt.fork >= FkOsaka and memLen > EIP7907_MAX_INITCODE_SIZE:
+    trace "Initcode size exceeds maximum", initcodeSize = memLen
+    return err(opErr(InvalidInitCode))
+  elif cpt.fork >= FkShanghai and memLen > EIP3860_MAX_INITCODE_SIZE:
     trace "Initcode size exceeds maximum", initcodeSize = memLen
     return err(opErr(InvalidInitCode))
 

execution_chain/evm/interpreter/op_handlers/oph_helpers.nim

@@ -60,6 +60,25 @@ proc delegateResolutionCost*(c: Computation, address: Address): GasInt =
     else:
       return WarmStorageReadCost
 
+proc gasEip7702CodeCheck*(c: Computation; address: Address): GasInt =
+  let delegateTo =
+    parseDelegationAddress(c.vmState.readOnlyLedger.getCode(address)).valueOr:
+      return 0
+  c.delegateResolutionCost(delegateTo)
+
+proc gasCallEIP7907*(c: Computation, codeAddress: Address): GasInt =
+  c.vmState.mutateLedger:
+    let codeHash = db.getCodeHash(codeAddress)
+
+    if not db.inAccessList(codeHash):
+      db.accessList(codeHash)
+
+      let
+        code = db.getCode(codeAddress)
+        excessContractSize = max(0, code.len - CODE_SIZE_THRESHOLD)
+        largeContractCost = (ceil32(excessContractSize) * 2) div 32
+      return GasInt(largeContractCost)
+
 # ------------------------------------------------------------------------------
 # End
 # ------------------------------------------------------------------------------

hive_integration/nodocker/engine/withdrawals/wd_max_init_code_spec.nim

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

vendor/constantine

@@ -0,0 +1 @@
+Subproject commit 782d838e7a073262750eff593af6dfff3ff832dd