status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-01-28 04:55:33 +00:00
Code Issues Projects Releases Wiki Activity

refactor GST

Browse Source
This commit is contained in:
andri lim 2019-02-27 13:18:44 +07:00 committed by zah
parent b107bdd226
commit e2bc3d0045
1 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tests/test_generalstate_json.nim
View File

@ -9,7 +9,7 @@ import
unittest, strformat, strutils, tables, json, ospaths, times, unittest, strformat, strutils, tables, json, ospaths, times,
byteutils, ranges/typedranges, nimcrypto/[keccak, hash], options, byteutils, ranges/typedranges, nimcrypto/[keccak, hash], options,
eth/[rlp, common, keys], eth/trie/db, chronicles, eth/[rlp, common, keys], eth/trie/db, chronicles,
./test_helpers, ./test_helpers, ../nimbus/p2p/executor,
../nimbus/[constants, errors], ../nimbus/[constants, errors],
../nimbus/[vm_state, vm_types, vm_state_transactions, utils], ../nimbus/[vm_state, vm_types, vm_state_transactions, utils],
../nimbus/vm/interpreter, ../nimbus/vm/interpreter,
@ -20,8 +20,7 @@ proc testFixture(fixtures: JsonNode, testStatusIMPL: var TestStatus)
suite "generalstate json tests": suite "generalstate json tests":
jsonTest("GeneralStateTests", testFixture) jsonTest("GeneralStateTests", testFixture)
proc testFixtureIndexes(prevStateRoot: Hash256, header: BlockHeader, pre: JsonNode, tx: 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: when enabledLogLevel <= TRACE:
let tracerFlags = {TracerFlags.EnableTracing} let tracerFlags = {TracerFlags.EnableTracing}
else: else:
@ -35,55 +34,32 @@ proc testFixtureIndexes(prevStateRoot: Hash256, header: BlockHeader, pre: JsonNo
let obtainedHash = "0x" & `$`(vmState.readOnlyStateDB.rootHash).toLowerAscii let obtainedHash = "0x" & `$`(vmState.readOnlyStateDB.rootHash).toLowerAscii
check obtainedHash == expectedHash check obtainedHash == expectedHash
if not validateTransaction(vmState, transaction, sender): if not validateTransaction(vmState, tx, sender):
vmState.mutateStateDB: vmState.mutateStateDB:
# pre-EIP158 (e.g., Byzantium) should ensure currentCoinbase exists # pre-EIP158 (e.g., Byzantium) should ensure currentCoinbase exists
# in later forks, don't create at all # in later forks, don't create at all
db.addBalance(header.coinbase, 0.u256) db.addBalance(header.coinbase, 0.u256)
return return
# TODO: replace with cachingDb or similar approach; necessary let gasCost = tx.gasLimit.u256 * tx.gasPrice.u256
# when calls/subcalls/etc come in, too.
var readOnly = vmState.readOnlyStateDB
let storageRoot = readOnly.getStorageRoot(transaction.to)
let gasCost = transaction.gasLimit.u256 * transaction.gasPrice.u256
vmState.mutateStateDB: vmState.mutateStateDB:
db.incNonce(sender) db.incNonce(sender)
db.subBalance(sender, gasCost) db.subBalance(sender, gasCost)
if transaction.isContractCreation and transaction.payload.len > 0: if tx.isContractCreation and tx.payload.len > 0:
vmState.mutateStateDB: vmState.mutateStateDB:
# TODO: move into applyCreateTransaction # TODO: move into applyCreateTransaction
# fixtures/GeneralStateTests/stTransactionTest/TransactionSendingToZero.json # fixtures/GeneralStateTests/stTransactionTest/TransactionSendingToZero.json
# fixtures/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json # fixtures/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json
#db.addBalance(generateAddress(sender, transaction.accountNonce), transaction.value) #db.addBalance(generateAddress(sender, transaction.accountNonce), transaction.value)
let createGasUsed = applyCreateTransaction(transaction, vmState, sender, some(fork)) let createGasUsed = applyCreateTransaction(tx, vmState, sender, some(fork))
db.addBalance(header.coinbase, createGasUsed.u256 * transaction.gasPrice.u256) db.addBalance(header.coinbase, createGasUsed.u256 * tx.gasPrice.u256)
return return
var computation = setupComputation(vmState, transaction, sender, some(fork))
# What remains is call and/or value transfer
if execComputation(computation):
let
gasRemaining = computation.gasMeter.gasRemaining.u256
gasRefunded = computation.getGasRefund().u256
gasUsed = transaction.gasLimit.u256 - gasRemaining
gasRefund = min(gasRefunded, gasUsed div 2)
gasRefundAmount = (gasRefund + gasRemaining) * transaction.gasPrice.u256
vmState.mutateStateDB: vmState.mutateStateDB:
# TODO if the balance/etc calls were gated on gAFD or similar, let gasUsed = contractCall(tx, vmState, sender, some(fork))
# that would simplify/combine codepaths db.addBalance(header.coinbase, gasUsed.u256 * tx.gasPrice.u256)
if header.coinbase notin computation.getAccountsForDeletion:
db.subBalance(header.coinbase, gasRefundAmount)
db.addBalance(header.coinbase, gasCost)
db.addBalance(sender, gasRefundAmount)
# TODO: only here does one commit, with some nuance/caveat
else:
vmState.mutateStateDB:
db.addBalance(header.coinbase, gasCost)
proc testFixture(fixtures: JsonNode, testStatusIMPL: var TestStatus) = proc testFixture(fixtures: JsonNode, testStatusIMPL: var TestStatus) =
var fixture: JsonNode var fixture: JsonNode