Move EVM code initialization outside of newComputation

nimbus/evm/computation.nim

@@ -13,7 +13,7 @@
 import
   std/sequtils,
   ".."/[db/ledger, constants],
-  "."/[code_stream, memory, message, stack, state],
+  "."/[code_stream, memory, stack, state],
   "."/[types],
   ./interpreter/[gas_meter, gas_costs, op_codes],
   ./evm_errors,
@@ -46,17 +46,6 @@ when defined(evmc_enabled):
 const
   evmc_enabled* = defined(evmc_enabled)
 
-# ------------------------------------------------------------------------------
-# Helpers
-# ------------------------------------------------------------------------------
-
-proc generateContractAddress(c: Computation, salt: ContractSalt): Address =
-  if c.msg.kind == EVMC_CREATE:
-    let creationNonce = c.vmState.readOnlyStateDB().getNonce(c.msg.sender)
-    result = generateAddress(c.msg.sender, creationNonce)
-  else:
-    result = generateSafeAddress(c.msg.sender, salt, c.msg.data)
-
 # ------------------------------------------------------------------------------
 # Public functions
 # ------------------------------------------------------------------------------
@@ -259,42 +248,17 @@ template resolveCode*(c: Computation, address: Address): CodeBytesRef =
   else:
     c.vmState.readOnlyStateDB.resolveCode(address)
 
-proc newComputation*(vmState: BaseVMState, sysCall: bool, message: Message,
-                     isPrecompile, keepStack: bool, salt: ContractSalt = ZERO_CONTRACTSALT): Computation =
-  new result
-  result.vmState = vmState
-  result.msg = message
-  result.gasMeter.init(message.gas)
-  result.sysCall = sysCall
-  result.keepStack = keepStack
-
-  if not isPrecompile:
-    result.memory = EvmMemory.init()
-    result.stack = EvmStack.init()
-
-    if result.msg.isCreate():
-      result.msg.contractAddress = result.generateContractAddress(salt)
-      result.code = CodeStream.init(message.data)
-      message.data = @[]
-    else:
-      if vmState.fork >= FkPrague:
-        result.code = CodeStream.init(
-          vmState.readOnlyStateDB.resolveCode(message.codeAddress))
-      else:
-        result.code = CodeStream.init(
-          vmState.readOnlyStateDB.getCode(message.codeAddress))
-
-
-func newComputation*(vmState: BaseVMState, sysCall: bool,
-                     message: Message, code: CodeBytesRef, isPrecompile, keepStack: bool, ): Computation =
+func newComputation*(vmState: BaseVMState,
+                     keepStack: bool,
+                     message: Message,
+                     code = CodeBytesRef(nil)): Computation =
   new result
   result.vmState = vmState
   result.msg = message
   result.gasMeter.init(message.gas)
-  result.sysCall = sysCall
   result.keepStack = keepStack
 
-  if not isPrecompile:
+  if not code.isNil:
     result.code = CodeStream.init(code)
     result.memory = EvmMemory.init()
     result.stack = EvmStack.init()

nimbus/evm/evmc_helpers.nim

@@ -24,9 +24,9 @@ func toEvmc*(h: Hash32): evmc_bytes32 {.inline.} =
   doAssert sizeof(h) == sizeof(evmc_bytes32)
   evmc_bytes32(bytes: h.data)
 
-func toEvmc*(h: ContractSalt): evmc_bytes32 {.inline.} =
+func toEvmc*(h: Bytes32): evmc_bytes32 {.inline.} =
   doAssert sizeof(h) == sizeof(evmc_bytes32)
-  cast[evmc_bytes32](h)
+  evmc_bytes32(bytes: h.data)
 
 func toEvmc*(n: UInt256): evmc_uint256be {.inline.} =
   when evmc_native:
@@ -35,9 +35,9 @@ func toEvmc*(n: UInt256): evmc_uint256be {.inline.} =
     cast[evmc_uint256be](n.toBytesBE)
 
 func fromEvmc*(T: type, n: evmc_bytes32): T {.inline.} =
-  when T is ContractSalt:
+  when T is Bytes32:
     doAssert sizeof(n) == sizeof(T)
-    cast[T](n)
+    T(n.bytes)
   elif T is Hash32:
     Hash32(n.bytes)
   elif T is UInt256:
@@ -63,6 +63,6 @@ when isMainModule:
   var h = EMPTY_SHA3
   var eh = toEvmc(h)
   assert(h == fromEvmc(Hash32, eh))
-  var s = cast[ContractSalt](EMPTY_ROOT_HASH)
+  var s = Bytes32(EMPTY_ROOT_HASH.data)
   var es = toEvmc(s)
-  assert(s == fromEvmc(ContractSalt, es))
+  assert(s == fromEvmc(Bytes32, es))

nimbus/evm/interpreter/op_handlers/oph_call.nim

@@ -21,7 +21,6 @@ import
   ../../../core/eip7702,
   ../../computation,
   ../../memory,
-  ../../precompiles,
   ../../stack,
   ../../types,
   ../gas_costs,
@@ -39,6 +38,7 @@ import
 when not defined(evmc_enabled):
   import
     ../../state,
+    ../../message,
     ../../../db/ledger
 else:
   import
@@ -203,9 +203,9 @@ else:
     # need to provide explicit <c> and <child> for capturing in chainTo proc()
     # <memPos> and <memLen> are provided by value and need not be captured
     var
-      precompile = getPrecompile(c.fork, childMsg.codeAddress)
+      code = getCallCode(c.vmState, childMsg.codeAddress)
       child = newComputation(
-        c.vmState, false, childMsg, isPrecompile = precompile.isSome(), keepStack = false)
+        c.vmState, keepStack = false, childMsg, code)
 
     c.chainTo(child):
       if not child.shouldBurnGas:

nimbus/evm/interpreter/op_handlers/oph_create.nim

@@ -31,15 +31,16 @@ import
   chronicles,
   eth/common,
   eth/common/eth_types,
-  stew/assign2,
   stint
 
 when not defined(evmc_enabled):
   import
     ../../state,
+    ../../message,
     ../../../db/ledger
 else:
   import
+    stew/assign2,
     stew/saturation_arith
 
 # ------------------------------------------------------------------------------
@@ -62,12 +63,12 @@ when evmc_enabled:
 
 else:
   proc execSubCreate(c: Computation; childMsg: Message;
-                    salt: ContractSalt = ZERO_CONTRACTSALT) {.raises: [].} =
+                     code: CodeBytesRef) {.raises: [].} =
     ## Create new VM -- helper for `Create`-like operations
 
     # need to provide explicit <c> and <child> for capturing in chainTo proc()
     var
-      child = newComputation(c.vmState, false, childMsg, false, false, salt)
+      child = newComputation(c.vmState, keepStack = false, childMsg, code)
 
     c.chainTo(child):
       if not child.shouldBurnGas:
@@ -154,14 +155,19 @@ proc createOp(cpt: VmCpt): EvmResultVoid =
     )
     c.execSubCreate(msg)
   else:
-    var childMsg = Message(
-      kind:   EVMC_CREATE,
-      depth:  cpt.msg.depth + 1,
-      gas:    createMsgGas,
-      sender: cpt.msg.contractAddress,
-      value:  endowment)
-    assign(childMsg.data, cpt.memory.read(memPos, memLen))
-    cpt.execSubCreate(childMsg)
+    var
+      childMsg = Message(
+        kind:   EVMC_CREATE,
+        depth:  cpt.msg.depth + 1,
+        gas:    createMsgGas,
+        sender: cpt.msg.contractAddress,
+        contractAddress: generateContractAddress(
+          cpt.vmState,
+          EVMC_CREATE,
+          cpt.msg.contractAddress),
+        value:  endowment)
+      code = CodeBytesRef.init(cpt.memory.read(memPos, memLen))
+    cpt.execSubCreate(childMsg, code)
   ok()
 
 # ---------------------
@@ -176,7 +182,7 @@ proc create2Op(cpt: VmCpt): EvmResultVoid =
     memPos    = cpt.stack.lsPeekSafeInt(^2)
     memLen    = cpt.stack.lsPeekSafeInt(^3)
     salt256   = cpt.stack.lsPeekInt(^4)
-    salt      = ContractSalt(bytes: salt256.toBytesBE)
+    salt      = Bytes32(salt256.toBytesBE)
 
   cpt.stack.lsShrink(3)
   cpt.stack.lsTop(0)
@@ -237,14 +243,21 @@ proc create2Op(cpt: VmCpt): EvmResultVoid =
     )
     c.execSubCreate(msg)
   else:
-    var childMsg = Message(
-      kind:   EVMC_CREATE2,
-      depth:  cpt.msg.depth + 1,
-      gas:    createMsgGas,
-      sender: cpt.msg.contractAddress,
-      value:  endowment)
-    assign(childMsg.data, cpt.memory.read(memPos, memLen))
-    cpt.execSubCreate(salt = salt, childMsg = childMsg)
+    var
+      code = CodeBytesRef.init(cpt.memory.read(memPos, memLen))
+      childMsg = Message(
+        kind:   EVMC_CREATE2,
+        depth:  cpt.msg.depth + 1,
+        gas:    createMsgGas,
+        sender: cpt.msg.contractAddress,
+        contractAddress: generateContractAddress(
+          cpt.vmState,
+          EVMC_CREATE2,
+          cpt.msg.contractAddress,
+          salt,
+          code),
+        value:  endowment)
+    cpt.execSubCreate(childMsg, code)
   ok()
 
 # ------------------------------------------------------------------------------

nimbus/evm/interpreter_dispatch.nim

@@ -264,6 +264,13 @@ else:
       c.dispose()
       c = c.parent
 
+proc postExecComputation*(c: Computation) =
+  if c.isSuccess:
+    if c.fork < FkLondon:
+      # EIP-3529: Reduction in refunds
+      c.refundSelfDestruct()
+  c.vmState.status = c.isSuccess
+
 # ------------------------------------------------------------------------------
 # End
 # ------------------------------------------------------------------------------

nimbus/evm/message.nim

@@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2018 Status Research & Development GmbH
+# Copyright (c) 2018-2024 Status Research & Development GmbH
 # Licensed under either of
 #  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
 #    http://www.apache.org/licenses/LICENSE-2.0)
@@ -8,7 +8,35 @@
 # at your option. This file may not be copied, modified, or distributed except
 # according to those terms.
 
-import ./types
+import
+  ./types,
+  ./state,
+  ./code_bytes,
+  ./precompiles,
+  ../common/evmforks,
+  ../utils/utils,
+  ../db/ledger
 
 proc isCreate*(message: Message): bool =
   message.kind in {EVMC_CREATE, EVMC_CREATE2}
+
+proc generateContractAddress*(vmState: BaseVMState,
+                              kind: CallKind,
+                              sender: Address,
+                              salt = ZERO_CONTRACTSALT,
+                              code = CodeBytesRef(nil)): Address =
+  if kind == EVMC_CREATE:
+    let creationNonce = vmState.readOnlyStateDB().getNonce(sender)
+    generateAddress(sender, creationNonce)
+  else:
+    generateSafeAddress(sender, salt, code.bytes)
+
+proc getCallCode*(vmState: BaseVMState, codeAddress: Address): CodeBytesRef =
+  let isPrecompile = getPrecompile(vmState.fork, codeAddress).isSome()
+  if isPrecompile:
+    return CodeBytesRef(nil)
+
+  if vmState.fork >= FkPrague:
+    vmState.readOnlyStateDB.resolveCode(codeAddress)
+  else:
+    vmState.readOnlyStateDB.getCode(codeAddress)

nimbus/evm/types.nim

@@ -94,7 +94,6 @@ type
     else:
       parent*, child*:      Computation
     continuation*:          proc(): EvmResultVoid {.gcsafe, raises: [].}
-    sysCall*:               bool
     keepStack*:             bool
     finalStack*:            seq[UInt256]