status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixes vmState construction

This commit is contained in:
andri lim 2019-02-14 22:20:41 +07:00 committed by zah
parent c53e7fa07c
commit fdc34a4cf6
14 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nimbus/p2p/chain.nim
View File

@ -42,7 +42,7 @@ method persistBlocks*(c: Chain, headers: openarray[BlockHeader], bodies: openarr
trace "Persisting blocks", fromBlock = headers[0].blockNumber, toBlock = headers[^1].blockNumber
for i in 0 ..< headers.len:
let head = c.db.getCanonicalHead()
let vmState = newBaseVMState(head, c.db)
let vmState = newBaseVMState(head.stateRoot, headers[i], c.db)
let validationResult = processBlock(c.db, head, headers[i], bodies[i], vmState)
when not defined(release):

13
nimbus/p2p/executor.nim
View File

@ -140,17 +140,6 @@ proc makeReceipt(vmState: BaseVMState, cumulativeGasUsed: GasInt, fork = FkFront
result.logs = vmState.getAndClearLogEntries()
result.bloom = logsBloom(result.logs).value.toByteArrayBE
proc prepareVMState(vmState: BaseVMState, header: BlockHeader) =
# TODO: move this proc to somewhere else if it already complete
# blockNumber returned from VM should be current block number
# and not something else
vmState.blockHeader.blockNumber = header.blockNumber
# time stamp?
# gas limit?
# etc?
proc processBlock*(chainDB: BaseChainDB, head, header: BlockHeader, body: BlockBody, vmState: BaseVMState): ValidationResult =
let blockReward = 5.u256 * pow(10.u256, 18) # 5 ETH
@ -158,8 +147,6 @@ proc processBlock*(chainDB: BaseChainDB, head, header: BlockHeader, body: BlockB
debug "Mismatched txRoot", blockNumber=header.blockNumber
return ValidationResult.Error
prepareVMState(vmState, header)
var stateDb = vmState.accountDb
if header.txRoot != BLANK_ROOT_HASH:
if body.transactions.len == 0:

13
nimbus/rpc/p2p.nim
View File

@ -82,7 +82,8 @@ proc setupEthRpc*(node: EthereumNode, chain: BaseChainDB, rpcsrv: RpcServer) =
func getAccountDb(header: BlockHeader): ReadOnlyStateDB =
## Retrieves the account db from canonical head
let vmState = newBaseVMState(header, chain)
# TODO: header.stateRoot to prevStateRoot
let vmState = newBaseVMState(header.stateRoot, header, chain)
result = vmState.readOnlyStateDB()
proc accountDbFromTag(tag: string, readOnly = true): ReadOnlyStateDB =
@ -293,7 +294,8 @@ proc setupEthRpc*(node: EthereumNode, chain: BaseChainDB, rpcsrv: RpcServer) =
## Returns the return value of executed contract.
let header = headerFromTag(chain, quantityTag)
var
vmState = newBaseVMState(header, chain)
# TODO: header.stateRoot to prevStateRoot
vmState = newBaseVMState(header.stateRoot, header, chain)
gasLimit =
if call.gas.isSome: call.gas.get
else: 0.GasInt
@ -330,7 +332,8 @@ proc setupEthRpc*(node: EthereumNode, chain: BaseChainDB, rpcsrv: RpcServer) =
## Returns the amount of gas used.
var
header = chain.headerFromTag(quantityTag)
vmState = newBaseVMState(header, chain)
# TODO: header.stateRoot to prevStateRoot?
vmState = newBaseVMState(header.stateRoot, header, chain)
let
gasLimit = if
call.gas.isSome and call.gas.get > 0.GasInt: call.gas.get
@ -411,11 +414,13 @@ proc setupEthRpc*(node: EthereumNode, chain: BaseChainDB, rpcsrv: RpcServer) =
## Returns BlockObject or nil when no block was found.
let
header = chain.headerFromTag(quantityTag)
result = some(populateBlockObject(header, getBlockBody(header.hash)))
proc populateTransactionObject(transaction: Transaction, txIndex: int64, blockHeader: BlockHeader, blockHash: Hash256): TransactionObject =
let
vmState = newBaseVMState(blockHeader, chain)
# TODO: header.stateRoot to prevStateRoot?
vmState = newBaseVMState(blockHeader.stateRoot, blockHeader, chain)
accountDb = vmState.readOnlyStateDB()
address = transaction.getSender()
txCount = accountDb.getNonce(address)

6
nimbus/tracer.nim
View File

@ -86,7 +86,7 @@ proc traceTransaction*(db: BaseChainDB, header: BlockHeader,
captureDB = newCaptureDB(db.db, memoryDB)
captureTrieDB = trieDB captureDB
captureChainDB = newBaseChainDB(captureTrieDB, false) # prune or not prune?
vmState = newBaseVMState(parent, captureChainDB, tracerFlags + {EnableAccount})
vmState = newBaseVMState(parent.stateRoot, header, captureChainDB, tracerFlags + {EnableAccount})
var stateDb = vmState.accountDb
@ -151,7 +151,7 @@ proc dumpBlockState*(db: BaseChainDB, header: BlockHeader, body: BlockBody, dump
captureTrieDB = trieDB captureDB
captureChainDB = newBaseChainDB(captureTrieDB, false)
# we only need stack dump if we want to scan for internal transaction address
vmState = newBaseVMState(parent, captureChainDB, {EnableTracing, DisableMemory, DisableStorage, EnableAccount})
vmState = newBaseVMState(parent.stateRoot, header, captureChainDB, {EnableTracing, DisableMemory, DisableStorage, EnableAccount})
var
before = newJArray()
@ -206,7 +206,7 @@ proc traceBlock*(db: BaseChainDB, header: BlockHeader, body: BlockBody, tracerFl
captureDB = newCaptureDB(db.db, memoryDB)
captureTrieDB = trieDB captureDB
captureChainDB = newBaseChainDB(captureTrieDB, false)
vmState = newBaseVMState(parent, captureChainDB, tracerFlags + {EnableTracing})
vmState = newBaseVMState(parent.stateRoot, header, captureChainDB, tracerFlags + {EnableTracing})
if header.txRoot == BLANK_ROOT_HASH: return newJNull()
assert(body.transactions.calcTxRoot == header.txRoot)

6
nimbus/vm_state.nim
View File

@ -24,7 +24,8 @@ proc `$`*(vmState: BaseVMState): string =
else:
result = &"VMState {vmState.name}:\n header: {vmState.blockHeader}\n chaindb: {vmState.chaindb}"
proc newBaseVMState*(header: BlockHeader, chainDB: BaseChainDB, tracerFlags: set[TracerFlags] = {}): BaseVMState =
proc newBaseVMState*(prevStateRoot: Hash256, header: BlockHeader,
chainDB: BaseChainDB, tracerFlags: set[TracerFlags] = {}): BaseVMState =
new result
result.prevHeaders = @[]
result.name = "BaseVM"
@ -34,7 +35,8 @@ proc newBaseVMState*(header: BlockHeader, chainDB: BaseChainDB, tracerFlags: set
result.tracer.initTracer(tracerFlags)
result.tracingEnabled = TracerFlags.EnableTracing in tracerFlags
result.logEntries = @[]
result.accountDb = newAccountStateDB(chainDB.db, header.stateRoot, chainDB.pruneTrie)
result.blockHeader.stateRoot = prevStateRoot
result.accountDb = newAccountStateDB(chainDB.db, prevStateRoot, chainDB.pruneTrie)
proc stateRoot*(vmState: BaseVMState): Hash256 =
vmState.blockHeader.stateRoot

2
premix/debug.nim
View File

@ -22,7 +22,7 @@ proc executeBlock(blockEnv: JsonNode, memoryDB: TrieDatabaseRef, blockNumber: Ui
let transaction = memoryDB.beginTransaction()
defer: transaction.dispose()
let
vmState = newBaseVMState(parent, chainDB)
vmState = newBaseVMState(parent.stateRoot, header, chainDB)
validationResult = processBlock(chainDB, parent, header, body, vmState)
if validationResult != ValidationResult.OK:

2
premix/dumper.nim
View File

@ -24,7 +24,7 @@ proc dumpDebug(chainDB: BaseChainDB, blockNumber: Uint256) =
header = captureChainDB.getBlockHeader(blockNumber)
headerHash = header.blockHash
body = captureChainDB.getBlockBody(headerHash)
vmState = newBaseVMState(parent, captureChainDB)
vmState = newBaseVMState(parent.stateRoot, header, captureChainDB)
captureChainDB.setHead(parent, true)
let validationResult = processBlock(captureChainDB, parent, header, body, vmState)

2
premix/hunter.nim
View File

@ -71,7 +71,7 @@ proc huntProblematicBlock(blockNumber: Uint256): ValidationResult =
let transaction = memoryDB.beginTransaction()
defer: transaction.dispose()
let
vmState = newBaseVMState(parentBlock.header, chainDB)
vmState = newBaseVMState(parentBlock.header.stateRoot, thisBlock.header, chainDB)
validationResult = processBlock(chainDB, parentBlock.header, thisBlock.header, thisBlock.body, vmState)
if validationResult != ValidationResult.OK:

2
tests/macro_assembler.nim
View File

@ -225,7 +225,7 @@ proc initComputation(blockNumber: Uint256, chainDB: BaseChainDB, payload, data:
header = chainDB.getBlockHeader(blockNumber)
headerHash = header.blockHash
body = chainDB.getBlockBody(headerHash)
vmState = newBaseVMState(parent, chainDB)
vmState = newBaseVMState(parent.stateRoot, header, chainDB)
var
tx = body.transactions[0]

6
tests/test_generalstate_json.nim
View File

@ -22,12 +22,12 @@ suite "generalstate json tests":
jsonTest("GeneralStateTests", testFixture)
proc testFixtureIndexes(header: BlockHeader, pre: JsonNode, transaction: Transaction, sender: EthAddress, expectedHash: string, testStatusIMPL: var TestStatus, fork: Fork) =
proc testFixtureIndexes(prevStateRoot: Hash256, header: BlockHeader, pre: JsonNode, transaction: Transaction, sender: EthAddress, expectedHash: string, testStatusIMPL: var TestStatus, fork: Fork) =
when enabledLogLevel <= TRACE:
let tracerFlags = {TracerFlags.EnableTracing}
else:
let tracerFlags: set[TracerFlags] = {}
var vmState = newBaseVMState(header, newBaseChainDB(newMemoryDb()), tracerFlags)
var vmState = newBaseVMState(prevStateRoot, header, newBaseChainDB(newMemoryDb()), tracerFlags)
vmState.mutateStateDB:
setupStateDB(pre, db)
@ -124,4 +124,4 @@ proc testFixture(fixtures: JsonNode, testStatusIMPL: var TestStatus) =
valueIndex = indexes["value"].getInt
let transaction = ftrans.getFixtureTransaction(dataIndex, gasIndex, valueIndex)
let sender = ftrans.getFixtureTransactionSender
testFixtureIndexes(header, fixture["pre"], transaction, sender, expectedHash, testStatusIMPL, fork)
testFixtureIndexes(emptyRlpHash, header, fixture["pre"], transaction, sender, expectedHash, testStatusIMPL, fork)

2
tests/test_opcode.nim
View File

@ -18,7 +18,7 @@ from eth/common import GasInt
proc testCode(code: string, initialGas: GasInt, blockNum: UInt256): BaseComputation =
let header = BlockHeader(blockNumber: blockNum)
var vmState = newBaseVMState(header, newBaseChainDB(newMemoryDb()))
var vmState = newBaseVMState(header.stateRoot, header, newBaseChainDB(newMemoryDb()))
# coinbase: "",
# difficulty: fixture{"env"}{"currentDifficulty"}.getHexadecimalInt.u256,

2
tests/test_precompiles.nim
View File

@ -23,7 +23,7 @@ template doTest(fixture: JsonNode, address: byte, action: untyped): untyped =
var
dataStr = test["input"].getStr
data = if dataStr.len > 0: dataStr.hexToSeqByte else: @[]
vmState = newBaseVMState(header, newBaseChainDB(newMemoryDb()))
vmState = newBaseVMState(header.stateRoot, header, newBaseChainDB(newMemoryDb()))
gas = 1_000_000.GasInt
gasPrice = 1.GasInt
sender: EthAddress

2
tests/test_rpc.nim
View File

@ -54,7 +54,7 @@ proc doTests =
header = BlockHeader(stateRoot: emptyRlpHash)
var
chain = newBaseChainDB(newMemoryDb())
state = newBaseVMState(header, chain)
state = newBaseVMState(emptyRlpHash, header, chain)
ethNode.chain = newChain(chain)
let

2
tests/test_vm_json.nim
View File

@ -42,7 +42,7 @@ proc testFixture(fixtures: JsonNode, testStatusIMPL: var TestStatus) =
stateRoot: emptyRlpHash
)
var vmState = newBaseVMState(header, newBaseChainDB(newMemoryDB()))
var vmState = newBaseVMState(emptyRlpHash, header, newBaseChainDB(newMemoryDB()))
let fexec = fixture["exec"]
var code: seq[byte]
vmState.mutateStateDB: