split state clearing in execComputation to processTransaction, GST +5

This commit is contained in:
andri lim 2019-04-18 08:27:55 +07:00
parent 03435c7beb
commit 7c134b481e
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
6 changed files with 30 additions and 27 deletions

View File

@ -2076,14 +2076,14 @@ OK: 1/284 Fail: 0/284 Skip: 283/284
+ suicideCaller.json OK + suicideCaller.json OK
+ suicideCallerAddresTooBigLeft.json OK + suicideCallerAddresTooBigLeft.json OK
+ suicideCallerAddresTooBigRight.json OK + suicideCallerAddresTooBigRight.json OK
suicideCoinbase.json Skip + suicideCoinbase.json OK
+ suicideNotExistingAccount.json OK + suicideNotExistingAccount.json OK
+ suicideOrigin.json OK + suicideOrigin.json OK
+ suicideSendEtherPostDeath.json OK + suicideSendEtherPostDeath.json OK
+ suicideSendEtherToMe.json OK + suicideSendEtherToMe.json OK
+ testRandomTest.json OK + testRandomTest.json OK
``` ```
OK: 62/67 Fail: 0/67 Skip: 5/67 OK: 63/67 Fail: 0/67 Skip: 4/67
## stTransactionTest ## stTransactionTest
```diff ```diff
+ ContractStoreClearsOOG.json OK + ContractStoreClearsOOG.json OK
@ -2093,7 +2093,7 @@ OK: 62/67 Fail: 0/67 Skip: 5/67
+ CreateTransactionReverted.json OK + CreateTransactionReverted.json OK
+ CreateTransactionSuccess.json OK + CreateTransactionSuccess.json OK
+ EmptyTransaction.json OK + EmptyTransaction.json OK
EmptyTransaction2.json Skip + EmptyTransaction2.json OK
+ EmptyTransaction3.json OK + EmptyTransaction3.json OK
+ HighGasLimit.json OK + HighGasLimit.json OK
+ InternalCallHittingGasLimit.json OK + InternalCallHittingGasLimit.json OK
@ -2114,7 +2114,7 @@ OK: 62/67 Fail: 0/67 Skip: 5/67
+ SuicidesAndInternlCallSuicidesOOG.json OK + SuicidesAndInternlCallSuicidesOOG.json OK
+ SuicidesAndInternlCallSuicidesSuccess.json OK + SuicidesAndInternlCallSuicidesSuccess.json OK
+ SuicidesAndSendMoneyToItselfEtherDestroyed.json OK + SuicidesAndSendMoneyToItselfEtherDestroyed.json OK
SuicidesMixingCoinbase.json Skip + SuicidesMixingCoinbase.json OK
+ SuicidesStopAfterSuicide.json OK + SuicidesStopAfterSuicide.json OK
+ TransactionDataCosts652.json OK + TransactionDataCosts652.json OK
+ TransactionFromCoinbaseHittingBlockGasLimit.json OK + TransactionFromCoinbaseHittingBlockGasLimit.json OK
@ -2128,10 +2128,10 @@ OK: 62/67 Fail: 0/67 Skip: 5/67
+ TransactionToItself.json OK + TransactionToItself.json OK
+ TransactionToItselfNotEnoughFounds.json OK + TransactionToItselfNotEnoughFounds.json OK
+ UserTransactionGasLimitIsTooLowWhenZeroCost.json OK + UserTransactionGasLimitIsTooLowWhenZeroCost.json OK
UserTransactionZeroCost.json Skip + UserTransactionZeroCost.json OK
UserTransactionZeroCostWithData.json Skip + UserTransactionZeroCostWithData.json OK
``` ```
OK: 39/44 Fail: 0/44 Skip: 5/44 OK: 43/44 Fail: 0/44 Skip: 1/44
## stTransitionTest ## stTransitionTest
```diff ```diff
+ createNameRegistratorPerTxsAfter.json OK + createNameRegistratorPerTxsAfter.json OK
@ -2520,4 +2520,4 @@ OK: 5/133 Fail: 0/133 Skip: 128/133
OK: 0/130 Fail: 0/130 Skip: 130/130 OK: 0/130 Fail: 0/130 Skip: 130/130
---TOTAL--- ---TOTAL---
OK: 1491/2334 Fail: 0/2334 Skip: 843/2334 OK: 1496/2334 Fail: 0/2334 Skip: 838/2334

View File

@ -1,4 +1,4 @@
import options, import options, sets,
eth/[common, bloom], ranges, chronicles, nimcrypto, eth/[common, bloom], ranges, chronicles, nimcrypto,
../db/[db_chain, state_db], ../db/[db_chain, state_db],
../utils, ../constants, ../transaction, ../utils, ../constants, ../transaction,
@ -32,7 +32,7 @@ proc processTransaction*(tx: Transaction, sender: EthAddress, vmState: BaseVMSta
let isCollision = vmState.readOnlyStateDb().hasCodeOrNonce(recipient) let isCollision = vmState.readOnlyStateDb().hasCodeOrNonce(recipient)
var computation = setupComputation(vmState, tx, sender, recipient, forkOverride) var computation = setupComputation(vmState, tx, sender, recipient, forkOverride)
if computation.isNil: if computation.isNil: # OOG in setupComputation
gasUsed = 0 gasUsed = 0
break break
@ -54,6 +54,12 @@ proc processTransaction*(tx: Transaction, sender: EthAddress, vmState: BaseVMSta
vmState.mutateStateDB: vmState.mutateStateDB:
db.addBalance(vmState.blockHeader.coinbase, txFee) db.addBalance(vmState.blockHeader.coinbase, txFee)
# EIP158 state clearing
for account in vmState.touchedAccounts:
debug "state clearing", account
if db.accountExists(account) and db.isEmptyAccount(account):
db.deleteAccount(account)
result = gasUsed result = gasUsed
type type

View File

@ -36,6 +36,7 @@ proc init*(self: BaseVMState, prevStateRoot: Hash256, header: BlockHeader,
self.logEntries = @[] self.logEntries = @[]
self.blockHeader.stateRoot = prevStateRoot self.blockHeader.stateRoot = prevStateRoot
self.accountDb = newAccountStateDB(chainDB.db, prevStateRoot, chainDB.pruneTrie) self.accountDb = newAccountStateDB(chainDB.db, prevStateRoot, chainDB.pruneTrie)
self.touchedAccounts = initSet[EthAddress]()
proc newBaseVMState*(prevStateRoot: Hash256, header: BlockHeader, proc newBaseVMState*(prevStateRoot: Hash256, header: BlockHeader,
chainDB: BaseChainDB, tracerFlags: set[TracerFlags] = {}): BaseVMState = chainDB: BaseChainDB, tracerFlags: set[TracerFlags] = {}): BaseVMState =

View File

@ -6,7 +6,7 @@
# at your option. This file may not be copied, modified, or distributed except according to those terms. # at your option. This file may not be copied, modified, or distributed except according to those terms.
import import
ranges/typedranges, sequtils, strformat, tables, options, sets, ranges/typedranges, sequtils, strformat, tables, options,
eth/common, chronicles, ./db/[db_chain, state_db], eth/common, chronicles, ./db/[db_chain, state_db],
constants, errors, transaction, vm_types, vm_state, utils, constants, errors, transaction, vm_types, vm_state, utils,
./vm/[computation, interpreter], ./vm/interpreter/gas_costs ./vm/[computation, interpreter], ./vm/interpreter/gas_costs
@ -81,13 +81,8 @@ proc execComputation*(computation: var BaseComputation): bool =
const RefundSelfDestruct = 24_000 const RefundSelfDestruct = 24_000
computation.gasMeter.refundGas(RefundSelfDestruct * suicidedCount) computation.gasMeter.refundGas(RefundSelfDestruct * suicidedCount)
if computation.getFork >= FkSpurious: if computation.getFork >= FkSpurious:
var touchedAccounts = initSet[EthAddress]() computation.collectTouchedAccounts(computation.vmState.touchedAccounts)
computation.collectTouchedAccounts(touchedAccounts)
for account in touchedAccounts:
debug "state clearing", account
if db.accountExists(account) and db.isEmptyAccount(account):
db.deleteAccount(account)
result = computation.isSuccess result = computation.isSuccess
if result: if result:

View File

@ -25,6 +25,7 @@ type
receipts* : seq[Receipt] receipts* : seq[Receipt]
accountDb* : AccountStateDB accountDb* : AccountStateDB
cumulativeGasUsed*: GasInt cumulativeGasUsed*: GasInt
touchedAccounts*: HashSet[EthAddress]
AccessLogs* = ref object AccessLogs* = ref object
reads*: Table[string, string] reads*: Table[string, string]

View File

@ -27,11 +27,6 @@ func allowedFailingGeneralStateTest*(folder, name: string): bool =
"RevertOpcodeInInit.json", "RevertOpcodeInInit.json",
"RevertOpcodeWithBigOutputInInit.json", "RevertOpcodeWithBigOutputInInit.json",
"failed_tx_xcf416c53.json", "failed_tx_xcf416c53.json",
"suicideCoinbase.json",
"EmptyTransaction2.json",
"SuicidesMixingCoinbase.json",
"UserTransactionZeroCost.json",
"UserTransactionZeroCostWithData.json",
"createNameRegistratorPerTxsNotEnoughGasAfter.json", "createNameRegistratorPerTxsNotEnoughGasAfter.json",
"createNameRegistratorPerTxsNotEnoughGasAt.json", "createNameRegistratorPerTxsNotEnoughGasAt.json",
"createNameRegistratorPerTxsNotEnoughGasBefore.json", "createNameRegistratorPerTxsNotEnoughGasBefore.json",
@ -41,6 +36,11 @@ func allowedFailingGeneralStateTest*(folder, name: string): bool =
"NonZeroValue_CALLCODE_ToOneStorageKey.json", "NonZeroValue_CALLCODE_ToOneStorageKey.json",
"TransactionSendingToZero.json" "TransactionSendingToZero.json"
#"suicideCoinbase.json",
#"EmptyTransaction2.json",
#"SuicidesMixingCoinbase.json",
#"UserTransactionZeroCost.json",
#"UserTransactionZeroCostWithData.json",
#"NotEnoughCashContractCreation.json", #"NotEnoughCashContractCreation.json",
#"201503110226PYTHON_DUP6.json", #"201503110226PYTHON_DUP6.json",
#"CreateTransactionReverted.json", #"CreateTransactionReverted.json",