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 byzantium contract creation OOG

This commit is contained in:
andri lim 2019-05-02 13:39:55 +07:00 committed by zah
parent fd8a649df3
commit 2f08a6bc0e
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GeneralStateTests.md
View File

@ -440,14 +440,14 @@ OK: 11/44 Fail: 0/44 Skip: 33/44
+ CreateOOGafterInitCodeReturndata.json OK + CreateOOGafterInitCodeReturndata.json OK
+ CreateOOGafterInitCodeReturndata2.json OK + CreateOOGafterInitCodeReturndata2.json OK
+ CreateOOGafterInitCodeReturndata3.json OK + CreateOOGafterInitCodeReturndata3.json OK
CreateOOGafterInitCodeReturndataSize.json Skip + CreateOOGafterInitCodeReturndataSize.json OK
+ CreateOOGafterInitCodeRevert.json OK + CreateOOGafterInitCodeRevert.json OK
+ CreateOOGafterInitCodeRevert2.json OK + CreateOOGafterInitCodeRevert2.json OK
+ TransactionCollisionToEmpty.json OK + TransactionCollisionToEmpty.json OK
+ TransactionCollisionToEmptyButCode.json OK + TransactionCollisionToEmptyButCode.json OK
+ TransactionCollisionToEmptyButNonce.json OK + TransactionCollisionToEmptyButNonce.json OK
``` ```
OK: 29/30 Fail: 0/30 Skip: 1/30 OK: 30/30 Fail: 0/30 Skip: 0/30
## stDelegatecallTestHomestead ## stDelegatecallTestHomestead
```diff ```diff
Call1024BalanceTooLow.json Skip Call1024BalanceTooLow.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: 2255/2447 Fail: 0/2447 Skip: 192/2447 OK: 2256/2447 Fail: 0/2447 Skip: 191/2447

2
nimbus/vm/computation.nim
View File

@ -146,7 +146,7 @@ proc writeContract*(computation: BaseComputation, fork: Fork): bool {.gcsafe.} =
db.setCode(storageAddr, contractCode.toRange) db.setCode(storageAddr, contractCode.toRange)
result = true result = true
else: else:
if fork < FkHomestead: computation.output = @[] if fork < FkHomestead or fork >= FkByzantium: computation.output = @[]
result = false result = false
proc transferBalance(computation: BaseComputation, opCode: static[Op]) = proc transferBalance(computation: BaseComputation, opCode: static[Op]) =

1
tests/test_generalstate_failing.nim
View File

@ -13,7 +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 = @[
"CreateOOGafterInitCodeReturndataSize.json",
"modexp.json", "modexp.json",
# all these tests below actually pass # all these tests below actually pass