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

fix block gaslimit problem, GST +70

This commit is contained in:
andri lim 2019-03-18 14:35:52 +07:00
parent 739e20253a
commit a7c6531f08
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
4 changed files with 111 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
GeneralStateTests.md
View File

@ -84,28 +84,28 @@ OK: 2/3 Fail: 0/3 Skip: 1/3
+ callcallcall_000_SuicideMiddle.json OK + callcallcall_000_SuicideMiddle.json OK
+ callcallcall_ABCB_RECURSIVE.json OK + callcallcall_ABCB_RECURSIVE.json OK
callcallcallcode_001.json Skip callcallcallcode_001.json Skip
callcallcallcode_001_OOGE.json Skip + callcallcallcode_001_OOGE.json OK
callcallcallcode_001_OOGMAfter.json Skip + callcallcallcode_001_OOGMAfter.json OK
callcallcallcode_001_OOGMBefore.json Skip + callcallcallcode_001_OOGMBefore.json OK
callcallcallcode_001_SuicideEnd.json Skip + callcallcallcode_001_SuicideEnd.json OK
+ callcallcallcode_001_SuicideMiddle.json OK + callcallcallcode_001_SuicideMiddle.json OK
callcallcallcode_ABCB_RECURSIVE.json Skip callcallcallcode_ABCB_RECURSIVE.json Skip
callcallcode_01.json Skip callcallcode_01.json Skip
callcallcode_01_OOGE.json Skip + callcallcode_01_OOGE.json OK
callcallcode_01_SuicideEnd.json Skip + callcallcode_01_SuicideEnd.json OK
callcallcodecall_010.json Skip callcallcodecall_010.json Skip
+ callcallcodecall_010_OOGE.json OK + callcallcodecall_010_OOGE.json OK
callcallcodecall_010_OOGMAfter.json Skip + callcallcodecall_010_OOGMAfter.json OK
callcallcodecall_010_OOGMBefore.json Skip + callcallcodecall_010_OOGMBefore.json OK
callcallcodecall_010_SuicideEnd.json Skip + callcallcodecall_010_SuicideEnd.json OK
callcallcodecall_010_SuicideMiddle.json Skip + callcallcodecall_010_SuicideMiddle.json OK
callcallcodecall_ABCB_RECURSIVE.json Skip callcallcodecall_ABCB_RECURSIVE.json Skip
callcallcodecallcode_011.json Skip callcallcodecallcode_011.json Skip
+ callcallcodecallcode_011_OOGE.json OK + callcallcodecallcode_011_OOGE.json OK
callcallcodecallcode_011_OOGMAfter.json Skip + callcallcodecallcode_011_OOGMAfter.json OK
+ callcallcodecallcode_011_OOGMBefore.json OK + callcallcodecallcode_011_OOGMBefore.json OK
callcallcodecallcode_011_SuicideEnd.json Skip + callcallcodecallcode_011_SuicideEnd.json OK
callcallcodecallcode_011_SuicideMiddle.json Skip + callcallcodecallcode_011_SuicideMiddle.json OK
callcallcodecallcode_ABCB_RECURSIVE.json Skip callcallcodecallcode_ABCB_RECURSIVE.json Skip
+ callcodeDynamicCode.json OK + callcodeDynamicCode.json OK
+ callcodeDynamicCode2SelfCall.json OK + callcodeDynamicCode2SelfCall.json OK
@ -150,7 +150,7 @@ OK: 2/3 Fail: 0/3 Skip: 1/3
+ callcodecallcodecallcode_111_SuicideMiddle.json OK + callcodecallcodecallcode_111_SuicideMiddle.json OK
callcodecallcodecallcode_ABCB_RECURSIVE.json Skip callcodecallcodecallcode_ABCB_RECURSIVE.json Skip
``` ```
OK: 50/79 Fail: 0/79 Skip: 29/79 OK: 63/79 Fail: 0/79 Skip: 16/79
## stCallCreateCallCodeTest ## stCallCreateCallCodeTest
```diff ```diff
Call1024BalanceTooLow.json Skip Call1024BalanceTooLow.json Skip
@ -161,21 +161,21 @@ OK: 50/79 Fail: 0/79 Skip: 29/79
+ Callcode1024BalanceTooLow.json OK + Callcode1024BalanceTooLow.json OK
Callcode1024OOG.json Skip Callcode1024OOG.json Skip
CallcodeLoseGasOOG.json Skip CallcodeLoseGasOOG.json Skip
callOutput1.json Skip + callOutput1.json OK
callOutput2.json Skip + callOutput2.json OK
callOutput3.json Skip + callOutput3.json OK
callOutput3Fail.json Skip + callOutput3Fail.json OK
callOutput3partial.json Skip + callOutput3partial.json OK
callOutput3partialFail.json Skip + callOutput3partialFail.json OK
+ callWithHighValue.json OK + callWithHighValue.json OK
+ callWithHighValueAndGasOOG.json OK + callWithHighValueAndGasOOG.json OK
+ callWithHighValueAndOOGatTxLevel.json OK + callWithHighValueAndOOGatTxLevel.json OK
+ callWithHighValueOOGinCall.json OK + callWithHighValueOOGinCall.json OK
callcodeOutput1.json Skip + callcodeOutput1.json OK
callcodeOutput2.json Skip + callcodeOutput2.json OK
callcodeOutput3.json Skip + callcodeOutput3.json OK
callcodeOutput3Fail.json Skip + callcodeOutput3Fail.json OK
callcodeOutput3partial.json Skip + callcodeOutput3partial.json OK
callcodeOutput3partialFail.json Skip callcodeOutput3partialFail.json Skip
+ callcodeWithHighValue.json OK + callcodeWithHighValue.json OK
+ callcodeWithHighValueAndGasOOG.json OK + callcodeWithHighValueAndGasOOG.json OK
@ -193,32 +193,32 @@ OK: 50/79 Fail: 0/79 Skip: 29/79
+ createNameRegistratorPreStore1NotEnoughGas.json OK + createNameRegistratorPreStore1NotEnoughGas.json OK
+ createNameRegistratorendowmentTooHigh.json OK + createNameRegistratorendowmentTooHigh.json OK
``` ```
OK: 20/39 Fail: 0/39 Skip: 19/39 OK: 31/39 Fail: 0/39 Skip: 8/39
## stCallDelegateCodesCallCodeHomestead ## stCallDelegateCodesCallCodeHomestead
```diff ```diff
callcallcallcode_001.json Skip callcallcallcode_001.json Skip
callcallcallcode_001_OOGE.json Skip + callcallcallcode_001_OOGE.json OK
callcallcallcode_001_OOGMAfter.json Skip + callcallcallcode_001_OOGMAfter.json OK
callcallcallcode_001_OOGMBefore.json Skip + callcallcallcode_001_OOGMBefore.json OK
callcallcallcode_001_SuicideEnd.json Skip + callcallcallcode_001_SuicideEnd.json OK
+ callcallcallcode_001_SuicideMiddle.json OK + callcallcallcode_001_SuicideMiddle.json OK
callcallcallcode_ABCB_RECURSIVE.json Skip callcallcallcode_ABCB_RECURSIVE.json Skip
callcallcode_01.json Skip callcallcode_01.json Skip
callcallcode_01_OOGE.json Skip + callcallcode_01_OOGE.json OK
callcallcode_01_SuicideEnd.json Skip + callcallcode_01_SuicideEnd.json OK
callcallcodecall_010.json Skip callcallcodecall_010.json Skip
+ callcallcodecall_010_OOGE.json OK + callcallcodecall_010_OOGE.json OK
callcallcodecall_010_OOGMAfter.json Skip + callcallcodecall_010_OOGMAfter.json OK
callcallcodecall_010_OOGMBefore.json Skip + callcallcodecall_010_OOGMBefore.json OK
callcallcodecall_010_SuicideEnd.json Skip + callcallcodecall_010_SuicideEnd.json OK
callcallcodecall_010_SuicideMiddle.json Skip + callcallcodecall_010_SuicideMiddle.json OK
callcallcodecall_ABCB_RECURSIVE.json Skip callcallcodecall_ABCB_RECURSIVE.json Skip
callcallcodecallcode_011.json Skip callcallcodecallcode_011.json Skip
+ callcallcodecallcode_011_OOGE.json OK + callcallcodecallcode_011_OOGE.json OK
callcallcodecallcode_011_OOGMAfter.json Skip + callcallcodecallcode_011_OOGMAfter.json OK
+ callcallcodecallcode_011_OOGMBefore.json OK + callcallcodecallcode_011_OOGMBefore.json OK
callcallcodecallcode_011_SuicideEnd.json Skip + callcallcodecallcode_011_SuicideEnd.json OK
callcallcodecallcode_011_SuicideMiddle.json Skip + callcallcodecallcode_011_SuicideMiddle.json OK
callcallcodecallcode_ABCB_RECURSIVE.json Skip callcallcodecallcode_ABCB_RECURSIVE.json Skip
+ callcodecall_10.json OK + callcodecall_10.json OK
+ callcodecall_10_OOGE.json OK + callcodecall_10_OOGE.json OK
@ -255,32 +255,32 @@ OK: 20/39 Fail: 0/39 Skip: 19/39
+ callcodecallcodecallcode_111_SuicideMiddle.json OK + callcodecallcodecallcode_111_SuicideMiddle.json OK
callcodecallcodecallcode_ABCB_RECURSIVE.json Skip callcodecallcodecallcode_ABCB_RECURSIVE.json Skip
``` ```
OK: 29/58 Fail: 0/58 Skip: 29/58 OK: 42/58 Fail: 0/58 Skip: 16/58
## stCallDelegateCodesHomestead ## stCallDelegateCodesHomestead
```diff ```diff
callcallcallcode_001.json Skip callcallcallcode_001.json Skip
callcallcallcode_001_OOGE.json Skip + callcallcallcode_001_OOGE.json OK
callcallcallcode_001_OOGMAfter.json Skip + callcallcallcode_001_OOGMAfter.json OK
callcallcallcode_001_OOGMBefore.json Skip + callcallcallcode_001_OOGMBefore.json OK
callcallcallcode_001_SuicideEnd.json Skip + callcallcallcode_001_SuicideEnd.json OK
+ callcallcallcode_001_SuicideMiddle.json OK + callcallcallcode_001_SuicideMiddle.json OK
callcallcallcode_ABCB_RECURSIVE.json Skip callcallcallcode_ABCB_RECURSIVE.json Skip
callcallcode_01.json Skip callcallcode_01.json Skip
callcallcode_01_OOGE.json Skip + callcallcode_01_OOGE.json OK
callcallcode_01_SuicideEnd.json Skip + callcallcode_01_SuicideEnd.json OK
callcallcodecall_010.json Skip callcallcodecall_010.json Skip
+ callcallcodecall_010_OOGE.json OK + callcallcodecall_010_OOGE.json OK
callcallcodecall_010_OOGMAfter.json Skip + callcallcodecall_010_OOGMAfter.json OK
callcallcodecall_010_OOGMBefore.json Skip + callcallcodecall_010_OOGMBefore.json OK
callcallcodecall_010_SuicideEnd.json Skip + callcallcodecall_010_SuicideEnd.json OK
callcallcodecall_010_SuicideMiddle.json Skip + callcallcodecall_010_SuicideMiddle.json OK
callcallcodecall_ABCB_RECURSIVE.json Skip callcallcodecall_ABCB_RECURSIVE.json Skip
callcallcodecallcode_011.json Skip callcallcodecallcode_011.json Skip
+ callcallcodecallcode_011_OOGE.json OK + callcallcodecallcode_011_OOGE.json OK
callcallcodecallcode_011_OOGMAfter.json Skip + callcallcodecallcode_011_OOGMAfter.json OK
+ callcallcodecallcode_011_OOGMBefore.json OK + callcallcodecallcode_011_OOGMBefore.json OK
callcallcodecallcode_011_SuicideEnd.json Skip + callcallcodecallcode_011_SuicideEnd.json OK
callcallcodecallcode_011_SuicideMiddle.json Skip + callcallcodecallcode_011_SuicideMiddle.json OK
callcallcodecallcode_ABCB_RECURSIVE.json Skip callcallcodecallcode_ABCB_RECURSIVE.json Skip
+ callcodecall_10.json OK + callcodecall_10.json OK
+ callcodecall_10_OOGE.json OK + callcodecall_10_OOGE.json OK
@ -317,7 +317,7 @@ OK: 29/58 Fail: 0/58 Skip: 29/58
+ callcodecallcodecallcode_111_SuicideMiddle.json OK + callcodecallcodecallcode_111_SuicideMiddle.json OK
callcodecallcodecallcode_ABCB_RECURSIVE.json Skip callcodecallcodecallcode_ABCB_RECURSIVE.json Skip
``` ```
OK: 29/58 Fail: 0/58 Skip: 29/58 OK: 42/58 Fail: 0/58 Skip: 16/58
## stChangedEIP150 ## stChangedEIP150
```diff ```diff
Call1024BalanceTooLow.json Skip Call1024BalanceTooLow.json Skip
@ -327,7 +327,7 @@ OK: 29/58 Fail: 0/58 Skip: 29/58
+ callcall_00_OOGE_2.json OK + callcall_00_OOGE_2.json OK
+ callcall_00_OOGE_valueTransfer.json OK + callcall_00_OOGE_valueTransfer.json OK
+ callcallcall_000_OOGMAfter.json OK + callcallcall_000_OOGMAfter.json OK
callcallcallcode_001_OOGMAfter_1.json Skip + callcallcallcode_001_OOGMAfter_1.json OK
callcallcallcode_001_OOGMAfter_2.json Skip callcallcallcode_001_OOGMAfter_2.json Skip
+ callcallcallcode_001_OOGMAfter_3.json OK + callcallcallcode_001_OOGMAfter_3.json OK
+ callcallcodecall_010_OOGMAfter_1.json OK + callcallcodecall_010_OOGMAfter_1.json OK
@ -351,7 +351,7 @@ OK: 29/58 Fail: 0/58 Skip: 29/58
+ contractCreationMakeCallThatAskMoreGasThenTransactionProvided.jsonOK + contractCreationMakeCallThatAskMoreGasThenTransactionProvided.jsonOK
+ createInitFail_OOGduringInit.json OK + createInitFail_OOGduringInit.json OK
``` ```
OK: 26/30 Fail: 0/30 Skip: 4/30 OK: 27/30 Fail: 0/30 Skip: 3/30
## stCodeCopyTest ## stCodeCopyTest
```diff ```diff
+ ExtCodeCopyTests.json OK + ExtCodeCopyTests.json OK
@ -394,10 +394,10 @@ OK: 3/3 Fail: 0/3 Skip: 0/3
CreateOOGafterInitCodeRevert.json Skip CreateOOGafterInitCodeRevert.json Skip
CreateOOGafterInitCodeRevert2.json Skip CreateOOGafterInitCodeRevert2.json Skip
+ TransactionCollisionToEmpty.json OK + TransactionCollisionToEmpty.json OK
TransactionCollisionToEmptyButCode.json Skip + TransactionCollisionToEmptyButCode.json OK
TransactionCollisionToEmptyButNonce.json Skip + TransactionCollisionToEmptyButNonce.json OK
``` ```
OK: 21/30 Fail: 0/30 Skip: 9/30 OK: 23/30 Fail: 0/30 Skip: 7/30
## stDelegatecallTestHomestead ## stDelegatecallTestHomestead
```diff ```diff
Call1024BalanceTooLow.json Skip Call1024BalanceTooLow.json Skip
@ -408,18 +408,18 @@ OK: 21/30 Fail: 0/30 Skip: 9/30
CallcodeLoseGasOOG.json Skip CallcodeLoseGasOOG.json Skip
Delegatecall1024.json Skip Delegatecall1024.json Skip
Delegatecall1024OOG.json Skip Delegatecall1024OOG.json Skip
callOutput1.json Skip + callOutput1.json OK
callOutput2.json Skip + callOutput2.json OK
callOutput3.json Skip + callOutput3.json OK
callOutput3Fail.json Skip + callOutput3Fail.json OK
callOutput3partial.json Skip + callOutput3partial.json OK
callOutput3partialFail.json Skip + callOutput3partialFail.json OK
+ callWithHighValueAndGasOOG.json OK + callWithHighValueAndGasOOG.json OK
callcodeOutput1.json Skip + callcodeOutput1.json OK
callcodeOutput2.json Skip + callcodeOutput2.json OK
callcodeOutput3.json Skip + callcodeOutput3.json OK
callcodeOutput3Fail.json Skip + callcodeOutput3Fail.json OK
callcodeOutput3partial.json Skip + callcodeOutput3partial.json OK
callcodeOutput3partialFail.json Skip callcodeOutput3partialFail.json Skip
+ callcodeWithHighValueAndGasOOG.json OK + callcodeWithHighValueAndGasOOG.json OK
deleagateCallAfterValueTransfer.json Skip deleagateCallAfterValueTransfer.json Skip
@ -435,7 +435,7 @@ OK: 21/30 Fail: 0/30 Skip: 9/30
delegatecodeDynamicCode.json Skip delegatecodeDynamicCode.json Skip
delegatecodeDynamicCode2SelfCall.json Skip delegatecodeDynamicCode2SelfCall.json Skip
``` ```
OK: 7/34 Fail: 0/34 Skip: 27/34 OK: 18/34 Fail: 0/34 Skip: 16/34
## stEIP150Specific ## stEIP150Specific
```diff ```diff
CallAndCallcodeConsumeMoreGasThenTransactionHas.json Skip CallAndCallcodeConsumeMoreGasThenTransactionHas.json Skip
@ -1039,7 +1039,7 @@ OK: 0/16 Fail: 0/16 Skip: 16/16
+ randomStatetest18.json OK + randomStatetest18.json OK
+ randomStatetest180.json OK + randomStatetest180.json OK
+ randomStatetest183.json OK + randomStatetest183.json OK
randomStatetest184.json Skip + randomStatetest184.json OK
+ randomStatetest185.json OK + randomStatetest185.json OK
+ randomStatetest187.json OK + randomStatetest187.json OK
+ randomStatetest188.json OK + randomStatetest188.json OK
@ -1284,7 +1284,7 @@ OK: 0/16 Fail: 0/16 Skip: 16/16
+ randomStatetest97.json OK + randomStatetest97.json OK
+ randomStatetest98.json OK + randomStatetest98.json OK
``` ```
OK: 318/327 Fail: 0/327 Skip: 9/327 OK: 319/327 Fail: 0/327 Skip: 8/327
## stRandom2 ## stRandom2
```diff ```diff
+ 201503110226PYTHON_DUP6.json OK + 201503110226PYTHON_DUP6.json OK
@ -1604,14 +1604,14 @@ OK: 34/37 Fail: 0/37 Skip: 3/37
+ RevertInStaticCall.json OK + RevertInStaticCall.json OK
+ RevertOnEmptyStack.json OK + RevertOnEmptyStack.json OK
+ RevertOpcode.json OK + RevertOpcode.json OK
RevertOpcodeCalls.json Skip + RevertOpcodeCalls.json OK
+ RevertOpcodeCreate.json OK + RevertOpcodeCreate.json OK
RevertOpcodeDirectCall.json Skip + RevertOpcodeDirectCall.json OK
RevertOpcodeInCallsOnNonEmptyReturnData.json Skip + RevertOpcodeInCallsOnNonEmptyReturnData.json OK
+ RevertOpcodeInCreateReturns.json OK + RevertOpcodeInCreateReturns.json OK
+ RevertOpcodeInInit.json OK + RevertOpcodeInInit.json OK
RevertOpcodeMultipleSubCalls.json Skip RevertOpcodeMultipleSubCalls.json Skip
RevertOpcodeReturn.json Skip + RevertOpcodeReturn.json OK
+ RevertOpcodeWithBigOutputInInit.json OK + RevertOpcodeWithBigOutputInInit.json OK
RevertPrecompiledTouch.json Skip RevertPrecompiledTouch.json Skip
RevertPrecompiledTouchCC.json Skip RevertPrecompiledTouchCC.json Skip
@ -1632,7 +1632,7 @@ OK: 34/37 Fail: 0/37 Skip: 3/37
+ TouchToEmptyAccountRevert2.json OK + TouchToEmptyAccountRevert2.json OK
+ TouchToEmptyAccountRevert3.json OK + TouchToEmptyAccountRevert3.json OK
``` ```
OK: 33/43 Fail: 0/43 Skip: 10/43 OK: 37/43 Fail: 0/43 Skip: 6/43
## stShift ## stShift
```diff ```diff
sar00.json Skip sar00.json Skip
@ -2118,7 +2118,7 @@ OK: 56/67 Fail: 0/67 Skip: 11/67
+ SuicidesStopAfterSuicide.json OK + SuicidesStopAfterSuicide.json OK
+ TransactionDataCosts652.json OK + TransactionDataCosts652.json OK
+ TransactionFromCoinbaseHittingBlockGasLimit.json OK + TransactionFromCoinbaseHittingBlockGasLimit.json OK
TransactionFromCoinbaseHittingBlockGasLimit1.json Skip + TransactionFromCoinbaseHittingBlockGasLimit1.json OK
+ TransactionFromCoinbaseNotEnoughFounds.json OK + TransactionFromCoinbaseNotEnoughFounds.json OK
+ TransactionNonceCheck.json OK + TransactionNonceCheck.json OK
+ TransactionNonceCheck2.json OK + TransactionNonceCheck2.json OK
@ -2131,7 +2131,7 @@ OK: 56/67 Fail: 0/67 Skip: 11/67
+ UserTransactionZeroCost.json OK + UserTransactionZeroCost.json OK
+ UserTransactionZeroCostWithData.json OK + UserTransactionZeroCostWithData.json OK
``` ```
OK: 41/44 Fail: 0/44 Skip: 3/44 OK: 42/44 Fail: 0/44 Skip: 2/44
## stTransitionTest ## stTransitionTest
```diff ```diff
+ createNameRegistratorPerTxsAfter.json OK + createNameRegistratorPerTxsAfter.json OK
@ -2520,4 +2520,4 @@ OK: 0/133 Fail: 0/133 Skip: 133/133
OK: 0/130 Fail: 0/130 Skip: 130/130 OK: 0/130 Fail: 0/130 Skip: 130/130
---TOTAL--- ---TOTAL---
OK: 1311/2334 Fail: 0/2334 Skip: 1023/2334 OK: 1381/2334 Fail: 0/2334 Skip: 953/2334

27
nimbus/p2p/executor.nim
View File

@ -109,19 +109,24 @@ proc processBlock*(chainDB: BaseChainDB, head, header: BlockHeader, body: BlockB
vmState.receipts = newSeq[Receipt](body.transactions.len) vmState.receipts = newSeq[Receipt](body.transactions.len)
var cumulativeGasUsed = GasInt(0) var cumulativeGasUsed = GasInt(0)
for txIndex, tx in body.transactions: for txIndex, tx in body.transactions:
var sender: EthAddress if cumulativeGasUsed + tx.gasLimit > header.gasLimit:
if tx.getSender(sender):
let gasUsed = processTransaction(tx, sender, vmState)
cumulativeGasUsed += gasUsed
# miner fee
let txFee = gasUsed.u256 * tx.gasPrice.u256
vmState.mutateStateDB: vmState.mutateStateDB:
db.addBalance(header.coinbase, txFee) db.addBalance(header.coinbase, 0.u256)
# TODO: do we need to break or continue execution?
else: else:
debug "Could not get sender", txIndex, tx var sender: EthAddress
return ValidationResult.Error if tx.getSender(sender):
vmState.receipts[txIndex] = makeReceipt(vmState, cumulativeGasUsed) let gasUsed = processTransaction(tx, sender, vmState)
cumulativeGasUsed += gasUsed
# miner fee
let txFee = gasUsed.u256 * tx.gasPrice.u256
vmState.mutateStateDB:
db.addBalance(header.coinbase, txFee)
else:
debug "Could not get sender", txIndex, tx
return ValidationResult.Error
vmState.receipts[txIndex] = makeReceipt(vmState, cumulativeGasUsed)
var mainReward = blockReward var mainReward = blockReward
if header.ommersHash != EMPTY_UNCLE_HASH: if header.ommersHash != EMPTY_UNCLE_HASH:

40
tests/test_generalstate_failing.nim
View File

@ -13,8 +13,6 @@
# being mostly used for short-term regression prevention. # being mostly used for short-term regression prevention.
func allowedFailingGeneralStateTest*(folder, name: string): bool = func allowedFailingGeneralStateTest*(folder, name: string): bool =
let allowedFailingGeneralStateTests = @[ let allowedFailingGeneralStateTests = @[
"TransactionCollisionToEmptyButCode.json",
"TransactionCollisionToEmptyButNonce.json",
"deleagateCallAfterValueTransfer.json", "deleagateCallAfterValueTransfer.json",
"delegatecallInInitcodeToEmptyContract.json", "delegatecallInInitcodeToEmptyContract.json",
"delegatecallInInitcodeToExistingContract.json", "delegatecallInInitcodeToExistingContract.json",
@ -24,18 +22,12 @@ func allowedFailingGeneralStateTest*(folder, name: string): bool =
"delegatecodeDynamicCode2SelfCall.json", "delegatecodeDynamicCode2SelfCall.json",
"CALLCODEEcrecoverV_prefixedf0.json", "CALLCODEEcrecoverV_prefixedf0.json",
"randomStatetest14.json", "randomStatetest14.json",
"randomStatetest184.json",
"randomStatetest85.json", "randomStatetest85.json",
"RevertOpcodeCalls.json",
"RevertOpcodeDirectCall.json",
"RevertOpcodeInCallsOnNonEmptyReturnData.json",
"RevertOpcodeMultipleSubCalls.json", "RevertOpcodeMultipleSubCalls.json",
"RevertOpcodeReturn.json",
"tx_e1c174e2.json", "tx_e1c174e2.json",
"suicideCoinbase.json", "suicideCoinbase.json",
"Opcodes_TransactionInit.json", "Opcodes_TransactionInit.json",
"SuicidesMixingCoinbase.json", "SuicidesMixingCoinbase.json",
"TransactionFromCoinbaseHittingBlockGasLimit1.json",
"delegatecallAfterTransition.json", "delegatecallAfterTransition.json",
"delegatecallAtTransition.json", "delegatecallAtTransition.json",
"delegatecallBeforeTransition.json", "delegatecallBeforeTransition.json",
@ -78,31 +70,16 @@ func allowedFailingGeneralStateTest*(folder, name: string): bool =
"callcodecallcallcode_ABCB_RECURSIVE.json", "callcodecallcallcode_ABCB_RECURSIVE.json",
"callcodecallcodecall_ABCB_RECURSIVE.json", "callcodecallcodecall_ABCB_RECURSIVE.json",
"callcodecallcodecallcode_ABCB_RECURSIVE.json", "callcodecallcodecallcode_ABCB_RECURSIVE.json",
# Frontier failed test cases "callcallcallcode_ABCB_RECURSIVE.json",
"callcallcallcode_001_OOGMAfter_1.json", # Frontier failed test cases
"callcallcallcode_001_OOGMAfter_2.json", "callcallcallcode_001_OOGMAfter_2.json",
"callcallcodecall_010_OOGMAfter.json",
# Failed in homestead but OK in Frontier # Failed in homestead but OK in Frontier
"callcallcallcode_001.json", "callcallcallcode_001.json",
"callcallcallcode_001_OOGE.json",
"callcallcallcode_001_OOGMAfter.json",
"callcallcallcode_001_OOGMBefore.json",
"callcallcallcode_001_SuicideEnd.json",
"callcallcallcode_ABCB_RECURSIVE.json",
"callcallcode_01.json", "callcallcode_01.json",
"callcallcode_01_OOGE.json",
"callcallcode_01_SuicideEnd.json",
"callcallcodecall_010.json", "callcallcodecall_010.json",
"callcallcodecall_010_OOGMBefore.json",
"callcallcodecall_010_SuicideEnd.json",
"callcallcodecall_010_SuicideMiddle.json",
"callcallcodecallcode_011.json", "callcallcodecallcode_011.json",
"callcallcodecallcode_011_OOGMAfter.json",
"callcallcodecallcode_011_SuicideEnd.json",
"callcallcodecallcode_011_SuicideMiddle.json",
"callcallcallcode_001.json", "callcallcallcode_001.json",
"callcallcallcode_001_OOGMAfter.json",
"callcallcode_01.json", "callcallcode_01.json",
"callcallcodecall_010.json", "callcallcodecall_010.json",
"callcallcodecallcode_011.json", "callcallcodecallcode_011.json",
@ -113,17 +90,6 @@ func allowedFailingGeneralStateTest*(folder, name: string): bool =
"callcodecallcodecallcode_111.json", "callcodecallcodecallcode_111.json",
"CallLoseGasOOG.json", "CallLoseGasOOG.json",
"CallcodeLoseGasOOG.json", "CallcodeLoseGasOOG.json",
"callOutput1.json",
"callOutput2.json",
"callOutput3.json",
"callOutput3Fail.json",
"callOutput3partial.json",
"callOutput3partialFail.json",
"callcodeOutput1.json",
"callcodeOutput2.json",
"callcodeOutput3.json",
"callcodeOutput3Fail.json",
"callcodeOutput3partial.json",
"callcodeOutput3partialFail.json" "callcodeOutput3partialFail.json"
] ]
result = name in allowedFailingGeneralStateTests result = name in allowedFailingGeneralStateTests

14
tests/test_generalstate_json.nim
View File

@ -83,9 +83,17 @@ proc testFixtureIndexes(tester: Tester, testStatusIMPL: var TestStatus) =
return return
var gasUsed: GasInt var gasUsed: GasInt
vmState.mutateStateDB: if gasUsed + tester.tx.gasLimit <= tester.header.gasLimit:
gasUsed = tester.tx.processTransaction(sender, vmState, some(tester.fork)) vmState.mutateStateDB:
db.addBalance(tester.header.coinbase, gasUsed.u256 * tester.tx.gasPrice.u256) gasUsed = tester.tx.processTransaction(sender, vmState, some(tester.fork))
db.addBalance(tester.header.coinbase, gasUsed.u256 * tester.tx.gasPrice.u256)
else:
debug "invalid tx: block header gasLimit reached",
blockGasLimit=tester.header.gasLimit,
gasUsed=gasUsed,
txGasLimit=tester.tx.gasLimit
vmState.mutateStateDB:
db.addBalance(tester.header.coinbase, 0.u256)
if tester.debugMode: if tester.debugMode:
tester.dumpDebugData(vmState, sender, gasUsed) tester.dumpDebugData(vmState, sender, gasUsed)