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

fix RevertInCreateInInit problem

Browse Source
This commit is contained in:
andri lim 2019-05-02 12:59:10 +07:00 committed by zah
parent 86d5653a4c
commit fd8a649df3
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GeneralStateTests.md
View File

@ -1686,7 +1686,7 @@ OK: 37/38 Fail: 0/38 Skip: 1/38
+ RevertDepthCreateAddressCollision.json OK + RevertDepthCreateAddressCollision.json OK
+ RevertDepthCreateOOG.json OK + RevertDepthCreateOOG.json OK
+ RevertInCallCode.json OK + RevertInCallCode.json OK
RevertInCreateInInit.json Skip + RevertInCreateInInit.json OK
+ RevertInDelegateCall.json OK + RevertInDelegateCall.json OK
+ RevertInStaticCall.json OK + RevertInStaticCall.json OK
+ RevertOnEmptyStack.json OK + RevertOnEmptyStack.json OK
@ -1722,7 +1722,7 @@ OK: 37/38 Fail: 0/38 Skip: 1/38
+ TouchToEmptyAccountRevert2.json OK + TouchToEmptyAccountRevert2.json OK
+ TouchToEmptyAccountRevert3.json OK + TouchToEmptyAccountRevert3.json OK
``` ```
OK: 40/46 Fail: 0/46 Skip: 6/46 OK: 41/46 Fail: 0/46 Skip: 5/46
## stSStoreTest ## stSStoreTest
```diff ```diff
InitCollision.json Skip InitCollision.json Skip
@ -2645,4 +2645,4 @@ OK: 133/133 Fail: 0/133 Skip: 0/133
OK: 130/130 Fail: 0/130 Skip: 0/130 OK: 130/130 Fail: 0/130 Skip: 0/130
---TOTAL--- ---TOTAL---
OK: 2254/2447 Fail: 0/2447 Skip: 193/2447 OK: 2255/2447 Fail: 0/2447 Skip: 192/2447

7
nimbus/vm/computation.nim
View File

@ -12,7 +12,7 @@ import
./interpreter/[opcode_values, gas_meter, gas_costs, vm_forks], ./interpreter/[opcode_values, gas_meter, gas_costs, vm_forks],
./code_stream, ./memory, ./message, ./stack, ../db/[state_db, db_chain], ./code_stream, ./memory, ./message, ./stack, ../db/[state_db, db_chain],
../utils/header, byteutils, ranges, precompiles, ../utils/header, byteutils, ranges, precompiles,
transaction_tracer transaction_tracer, eth/trie/trie_defs
logScope: logScope:
topics = "vm computation" topics = "vm computation"
@ -199,7 +199,10 @@ proc applyMessage*(computation: BaseComputation, opCode: static[Op]) =
when opCode == Create: when opCode == Create:
if computation.getFork >= FkSpurious: if computation.getFork >= FkSpurious:
computation.vmState.mutateStateDb: computation.vmState.mutateStateDb:
db.incNonce(computation.msg.storageAddress) db.incNonce(computation.msg.storageAddress)
if computation.getFork >= FkByzantium:
# RevertInCreateInInit.json
db.setStorageRoot(computation.msg.storageAddress, emptyRlpHash)
when opCode in {CallCode, Call, Create}: when opCode in {CallCode, Call, Create}:
computation.transferBalance(opCode) computation.transferBalance(opCode)

1
tests/test_generalstate_failing.nim
View File

@ -14,7 +14,6 @@
func allowedFailingGeneralStateTest*(folder, name: string): bool = func allowedFailingGeneralStateTest*(folder, name: string): bool =
let allowedFailingGeneralStateTests = @[ let allowedFailingGeneralStateTests = @[
"CreateOOGafterInitCodeReturndataSize.json", "CreateOOGafterInitCodeReturndataSize.json",
"RevertInCreateInInit.json",
"modexp.json", "modexp.json",
# all these tests below actually pass # all these tests below actually pass