remove opCodeExec, use executeOpcodes
This commit is contained in:
parent
4aaa6e6c94
commit
be79bc8740
|
@ -1,5 +1,5 @@
|
||||||
import ../db/[db_chain, state_db], eth/common, chronicles, ../vm_state, ../vm_types, ../transaction, ranges,
|
import ../db/[db_chain, state_db], eth/common, chronicles, ../vm_state, ../vm_types, ../transaction, ranges,
|
||||||
../vm/[computation, interpreter_dispatch, message], ../constants, stint, nimcrypto,
|
../vm/[computation, message], ../constants, stint, nimcrypto,
|
||||||
../vm_state_transactions, sugar, ../utils, eth/trie/db, ../tracer, ./executor
|
../vm_state_transactions, sugar, ../utils, eth/trie/db, ../tracer, ./executor
|
||||||
|
|
||||||
type
|
type
|
||||||
|
|
|
@ -3,7 +3,7 @@ import options,
|
||||||
../db/[db_chain, state_db],
|
../db/[db_chain, state_db],
|
||||||
../utils, ../constants, ../transaction,
|
../utils, ../constants, ../transaction,
|
||||||
../vm_state, ../vm_types, ../vm_state_transactions,
|
../vm_state, ../vm_types, ../vm_state_transactions,
|
||||||
../vm/[computation, interpreter_dispatch, message],
|
../vm/[computation, message],
|
||||||
../vm/interpreter/vm_forks
|
../vm/interpreter/vm_forks
|
||||||
|
|
||||||
proc processTransaction*(tx: Transaction, sender: EthAddress, vmState: BaseVMState, forkOverride=none(Fork)): GasInt =
|
proc processTransaction*(tx: Transaction, sender: EthAddress, vmState: BaseVMState, forkOverride=none(Fork)): GasInt =
|
||||||
|
|
|
@ -14,7 +14,7 @@ import
|
||||||
../transaction, ../config, ../vm_state, ../constants, ../vm_types,
|
../transaction, ../config, ../vm_state, ../constants, ../vm_types,
|
||||||
../vm_state_transactions, ../utils,
|
../vm_state_transactions, ../utils,
|
||||||
../db/[db_chain, state_db, storage_types],
|
../db/[db_chain, state_db, storage_types],
|
||||||
rpc_types, rpc_utils, ../vm/[message, computation, interpreter_dispatch]
|
rpc_types, rpc_utils, ../vm/[message, computation]
|
||||||
|
|
||||||
#[
|
#[
|
||||||
Note:
|
Note:
|
||||||
|
|
|
@ -143,32 +143,34 @@ proc writeContract*(computation: var BaseComputation, fork: Fork): bool =
|
||||||
if fork < FkHomestead: computation.output = @[]
|
if fork < FkHomestead: computation.output = @[]
|
||||||
result = false
|
result = false
|
||||||
|
|
||||||
proc transferBalance(computation: var BaseComputation, opCode: static[Op]) =
|
proc transferBalance(computation: var BaseComputation, opCode: static[Op]): bool =
|
||||||
if computation.msg.depth >= MaxCallDepth:
|
if computation.msg.depth >= MaxCallDepth:
|
||||||
raise newException(StackDepthError, "Stack depth limit reached")
|
debug "Stack depth limit reached", depth=computation.msg.depth
|
||||||
|
return false
|
||||||
|
|
||||||
let senderBalance = computation.vmState.readOnlyStateDb().
|
let senderBalance = computation.vmState.readOnlyStateDb().
|
||||||
getBalance(computation.msg.sender)
|
getBalance(computation.msg.sender)
|
||||||
|
|
||||||
if senderBalance < computation.msg.value:
|
if senderBalance < computation.msg.value:
|
||||||
raise newException(InsufficientFunds,
|
debug "insufficient funds", available=senderBalance, needed=computation.msg.value
|
||||||
&"Insufficient funds: {senderBalance} < {computation.msg.value}")
|
return false
|
||||||
|
|
||||||
when opCode in {Call, Create}:
|
when opCode in {Call, Create}:
|
||||||
computation.vmState.mutateStateDb:
|
computation.vmState.mutateStateDb:
|
||||||
db.subBalance(computation.msg.sender, computation.msg.value)
|
db.subBalance(computation.msg.sender, computation.msg.value)
|
||||||
db.addBalance(computation.msg.storageAddress, computation.msg.value)
|
db.addBalance(computation.msg.storageAddress, computation.msg.value)
|
||||||
|
|
||||||
|
result = true
|
||||||
|
|
||||||
|
proc executeOpcodes*(computation: var BaseComputation)
|
||||||
|
|
||||||
proc applyMessage(fork: Fork, computation: var BaseComputation, opCode: static[Op]) =
|
proc applyMessage(fork: Fork, computation: var BaseComputation, opCode: static[Op]) =
|
||||||
var snapshot = computation.snapshot()
|
var snapshot = computation.snapshot()
|
||||||
defer: snapshot.dispose()
|
defer: snapshot.dispose()
|
||||||
|
|
||||||
when opCode in {CallCode, Call, Create}:
|
when opCode in {CallCode, Call, Create}:
|
||||||
try:
|
if not computation.transferBalance(opCode):
|
||||||
computation.transferBalance(opCode)
|
|
||||||
except VMError:
|
|
||||||
snapshot.revert()
|
snapshot.revert()
|
||||||
debug "transferBalance failed", msg = computation.error.info
|
|
||||||
return
|
return
|
||||||
|
|
||||||
if computation.gasMeter.gasRemaining < 0:
|
if computation.gasMeter.gasRemaining < 0:
|
||||||
|
@ -177,10 +179,7 @@ proc applyMessage(fork: Fork, computation: var BaseComputation, opCode: static[O
|
||||||
|
|
||||||
var success = true
|
var success = true
|
||||||
try:
|
try:
|
||||||
# Run code
|
executeOpcodes(computation)
|
||||||
# We cannot use the normal dispatching function `executeOpcodes`
|
|
||||||
# within `interpreter_dispatch.nim` due to a cyclic dependency.
|
|
||||||
computation.opcodeExec(computation)
|
|
||||||
success = not computation.isError
|
success = not computation.isError
|
||||||
except VMError:
|
except VMError:
|
||||||
success = false
|
success = false
|
||||||
|
@ -197,18 +196,6 @@ proc applyMessage(fork: Fork, computation: var BaseComputation, opCode: static[O
|
||||||
else:
|
else:
|
||||||
snapshot.revert(true)
|
snapshot.revert(true)
|
||||||
|
|
||||||
proc generateChildComputation*(fork: Fork, computation: var BaseComputation, childMsg: Message): BaseComputation =
|
|
||||||
var childComp = newBaseComputation(
|
|
||||||
computation.vmState,
|
|
||||||
computation.vmState.blockNumber,
|
|
||||||
childMsg,
|
|
||||||
some(fork))
|
|
||||||
|
|
||||||
# Copy the fork op code executor proc (assumes child computation is in the same fork)
|
|
||||||
childComp.opCodeExec = computation.opCodeExec
|
|
||||||
|
|
||||||
return childComp
|
|
||||||
|
|
||||||
proc addChildComputation(fork: Fork, computation: var BaseComputation, child: BaseComputation) =
|
proc addChildComputation(fork: Fork, computation: var BaseComputation, child: BaseComputation) =
|
||||||
if child.isError:
|
if child.isError:
|
||||||
if child.msg.isCreate:
|
if child.msg.isCreate:
|
||||||
|
@ -286,3 +273,5 @@ proc traceError*(c: BaseComputation) =
|
||||||
|
|
||||||
proc prepareTracer*(c: BaseComputation) =
|
proc prepareTracer*(c: BaseComputation) =
|
||||||
c.vmState.tracer.prepare(c.msg.depth)
|
c.vmState.tracer.prepare(c.msg.depth)
|
||||||
|
|
||||||
|
include interpreter_dispatch
|
||||||
|
|
|
@ -10,11 +10,11 @@ import
|
||||||
./interpreter/vm_forks
|
./interpreter/vm_forks
|
||||||
|
|
||||||
import # Used in vm_types. Beware of recursive dependencies
|
import # Used in vm_types. Beware of recursive dependencies
|
||||||
./code_stream, ./computation, ./stack, ./message, interpreter_dispatch
|
./code_stream, ./computation, ./stack, ./message
|
||||||
|
|
||||||
export
|
export
|
||||||
opcode_values, gas_meter,
|
opcode_values, gas_meter,
|
||||||
vm_forks
|
vm_forks
|
||||||
|
|
||||||
export
|
export
|
||||||
code_stream, computation, stack, message, interpreter_dispatch
|
code_stream, computation, stack, message
|
||||||
|
|
|
@ -572,7 +572,11 @@ proc setupCreate(computation: var BaseComputation, memPos, len: int, value: Uint
|
||||||
)
|
)
|
||||||
|
|
||||||
childMsg.sender = computation.msg.storageAddress
|
childMsg.sender = computation.msg.storageAddress
|
||||||
result = generateChildComputation(computation.getFork, computation, childMsg)
|
result = newBaseComputation(
|
||||||
|
computation.vmState,
|
||||||
|
computation.vmState.blockNumber,
|
||||||
|
childMsg,
|
||||||
|
some(computation.getFork))
|
||||||
|
|
||||||
op create, inline = false, value, startPosition, size:
|
op create, inline = false, value, startPosition, size:
|
||||||
## 0xf0, Create a new account with associated code.
|
## 0xf0, Create a new account with associated code.
|
||||||
|
@ -739,7 +743,12 @@ template genCall(callName: untyped, opCode: Op): untyped =
|
||||||
when opCode == CallCode:
|
when opCode == CallCode:
|
||||||
childMsg.storageAddress = computation.msg.storageAddress
|
childMsg.storageAddress = computation.msg.storageAddress
|
||||||
|
|
||||||
var childComp = generateChildComputation(computation.getFork, computation, childMsg)
|
var childComp = newBaseComputation(
|
||||||
|
computation.vmState,
|
||||||
|
computation.vmState.blockNumber,
|
||||||
|
childMsg,
|
||||||
|
some(computation.getFork))
|
||||||
|
|
||||||
result = (childComp, memOutPos, memOutLen)
|
result = (childComp, memOutPos, memOutLen)
|
||||||
|
|
||||||
op callName, inline = false:
|
op callName, inline = false:
|
||||||
|
|
|
@ -11,7 +11,7 @@ import
|
||||||
./interpreter/[opcode_values, opcodes_impl, vm_forks, gas_costs, gas_meter, utils/macros_gen_opcodes],
|
./interpreter/[opcode_values, opcodes_impl, vm_forks, gas_costs, gas_meter, utils/macros_gen_opcodes],
|
||||||
./code_stream,
|
./code_stream,
|
||||||
../vm_types, ../errors, precompiles,
|
../vm_types, ../errors, precompiles,
|
||||||
./stack, ./computation, terminal # Those are only needed for logging
|
./stack, terminal # Those are only needed for logging
|
||||||
|
|
||||||
logScope:
|
logScope:
|
||||||
topics = "vm opcode"
|
topics = "vm opcode"
|
||||||
|
@ -256,20 +256,14 @@ proc homesteadVM(computation: var BaseComputation) =
|
||||||
if not computation.execPrecompiles:
|
if not computation.execPrecompiles:
|
||||||
genHomesteadDispatch(computation)
|
genHomesteadDispatch(computation)
|
||||||
|
|
||||||
proc executeOpcodes*(computation: var BaseComputation) =
|
proc executeOpcodes(computation: var BaseComputation) =
|
||||||
# TODO: Optimise getting fork and updating opCodeExec only when necessary
|
# TODO: Optimise getting fork and updating opCodeExec only when necessary
|
||||||
let fork = computation.getFork
|
let fork = computation.getFork
|
||||||
|
|
||||||
try:
|
case fork
|
||||||
case fork
|
of FkFrontier..FkThawing:
|
||||||
of FkFrontier..FkThawing:
|
computation.frontierVM()
|
||||||
computation.opCodeExec = frontierVM
|
of FkHomestead..FkSpurious:
|
||||||
computation.frontierVM()
|
computation.homesteadVM()
|
||||||
of FkHomestead..FkSpurious:
|
else:
|
||||||
computation.opCodeExec = homesteadVM
|
raise newException(VMError, "Unknown or not implemented fork: " & $fork)
|
||||||
computation.homesteadVM()
|
|
||||||
else:
|
|
||||||
raise newException(VMError, "Unknown or not implemented fork: " & $fork)
|
|
||||||
except VMError:
|
|
||||||
computation.error = Error(info: getCurrentExceptionMsg())
|
|
||||||
debug "VM Error executeOpcodes() failed", error = getCurrentExceptionMsg()
|
|
||||||
|
|
|
@ -77,9 +77,12 @@ proc execComputation*(computation: var BaseComputation): bool =
|
||||||
for deletedAccount in computation.getAccountsForDeletion:
|
for deletedAccount in computation.getAccountsForDeletion:
|
||||||
db.deleteAccount deletedAccount
|
db.deleteAccount deletedAccount
|
||||||
result = not computation.isError
|
result = not computation.isError
|
||||||
|
except VMError:
|
||||||
|
result = false
|
||||||
|
debug "execComputation() VM Error", error = getCurrentExceptionMsg()
|
||||||
except ValueError:
|
except ValueError:
|
||||||
result = false
|
result = false
|
||||||
debug "execComputation() error", msg = getCurrentExceptionMsg()
|
debug "execComputation() Value Error", msg = getCurrentExceptionMsg()
|
||||||
|
|
||||||
if result and computation.msg.isCreate:
|
if result and computation.msg.isCreate:
|
||||||
let fork = computation.getFork
|
let fork = computation.getFork
|
||||||
|
|
|
@ -44,8 +44,6 @@ type
|
||||||
accounts*: HashSet[EthAddress]
|
accounts*: HashSet[EthAddress]
|
||||||
storageKeys*: seq[HashSet[Uint256]]
|
storageKeys*: seq[HashSet[Uint256]]
|
||||||
|
|
||||||
OpcodeExecutor* = proc(computation: var BaseComputation)
|
|
||||||
|
|
||||||
BaseComputation* = ref object of RootObj
|
BaseComputation* = ref object of RootObj
|
||||||
# The execution computation
|
# The execution computation
|
||||||
vmState*: BaseVMState
|
vmState*: BaseVMState
|
||||||
|
@ -62,7 +60,6 @@ type
|
||||||
accountsToDelete*: Table[EthAddress, EthAddress]
|
accountsToDelete*: Table[EthAddress, EthAddress]
|
||||||
opcodes*: Table[Op, proc(computation: var BaseComputation){.nimcall.}]
|
opcodes*: Table[Op, proc(computation: var BaseComputation){.nimcall.}]
|
||||||
gasCosts*: GasCosts # TODO - will be hidden at a lower layer
|
gasCosts*: GasCosts # TODO - will be hidden at a lower layer
|
||||||
opCodeExec*: OpcodeExecutor
|
|
||||||
forkOverride*: Option[Fork]
|
forkOverride*: Option[Fork]
|
||||||
logEntries*: seq[Log]
|
logEntries*: seq[Log]
|
||||||
|
|
||||||
|
@ -71,13 +68,6 @@ type
|
||||||
burnsGas*: bool
|
burnsGas*: bool
|
||||||
erasesReturnData*: bool
|
erasesReturnData*: bool
|
||||||
|
|
||||||
Opcode* = ref object of RootObj
|
|
||||||
# TODO can't use a stack-allocated object because
|
|
||||||
# "BaseComputation is not a concrete type"
|
|
||||||
# TODO: We can probably remove this.
|
|
||||||
kind*: Op
|
|
||||||
runLogic*: proc(computation: var BaseComputation)
|
|
||||||
|
|
||||||
GasMeter* = object
|
GasMeter* = object
|
||||||
gasRefunded*: GasInt
|
gasRefunded*: GasInt
|
||||||
startGas*: GasInt
|
startGas*: GasInt
|
||||||
|
|
Loading…
Reference in New Issue