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

fixes generateHeaderFromParentHeader

This commit is contained in:
andri lim 2019-09-25 20:05:33 +07:00 committed by zah
parent 12960c27ce
commit a65ab2763e
5 changed files with 77 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
BlockchainTests.md
View File

@ -120,13 +120,13 @@ OK: 8/8 Fail: 0/8 Skip: 0/8
```diff
+ randomStatetest109BC.json OK
+ randomStatetest113BC.json OK
randomStatetest127BC.json Skip
+ randomStatetest127BC.json OK
+ randomStatetest128BC.json OK
+ randomStatetest132BC.json OK
+ randomStatetest140BC.json OK
randomStatetest141BC.json Skip
+ randomStatetest141BC.json OK
+ randomStatetest152BC.json OK
randomStatetest165BC.json Skip
+ randomStatetest165BC.json OK
+ randomStatetest168BC.json OK
+ randomStatetest181BC.json OK
+ randomStatetest182BC.json OK
@ -146,7 +146,7 @@ OK: 8/8 Fail: 0/8 Skip: 0/8
+ randomStatetest256BC.json OK
+ randomStatetest258BC.json OK
+ randomStatetest262BC.json OK
randomStatetest272BC.json Skip
+ randomStatetest272BC.json OK
+ randomStatetest277BC.json OK
+ randomStatetest284BC.json OK
+ randomStatetest289BC.json OK
@ -157,7 +157,7 @@ OK: 8/8 Fail: 0/8 Skip: 0/8
+ randomStatetest331BC.json OK
+ randomStatetest344BC.json OK
+ randomStatetest34BC.json OK
randomStatetest35BC.json Skip
+ randomStatetest35BC.json OK
+ randomStatetest373BC.json OK
+ randomStatetest374BC.json OK
+ randomStatetest390BC.json OK
@ -170,9 +170,9 @@ OK: 8/8 Fail: 0/8 Skip: 0/8
+ randomStatetest431BC.json OK
+ randomStatetest432BC.json OK
+ randomStatetest434BC.json OK
randomStatetest44BC.json Skip
+ randomStatetest44BC.json OK
+ randomStatetest453BC.json OK
randomStatetest459BC.json Skip
+ randomStatetest459BC.json OK
+ randomStatetest463BC.json OK
+ randomStatetest479BC.json OK
+ randomStatetest486BC.json OK
@ -182,7 +182,7 @@ OK: 8/8 Fail: 0/8 Skip: 0/8
+ randomStatetest522BC.json OK
+ randomStatetest529BC.json OK
+ randomStatetest530BC.json OK
randomStatetest540BC.json Skip
+ randomStatetest540BC.json OK
+ randomStatetest551BC.json OK
+ randomStatetest557BC.json OK
+ randomStatetest561BC.json OK
@ -195,12 +195,12 @@ OK: 8/8 Fail: 0/8 Skip: 0/8
+ randomStatetest595BC.json OK
+ randomStatetest598BC.json OK
+ randomStatetest606BC.json OK
randomStatetest613BC.json Skip
+ randomStatetest613BC.json OK
+ randomStatetest614BC.json OK
+ randomStatetest617BC.json OK
+ randomStatetest61BC.json OK
+ randomStatetest622BC.json OK
randomStatetest623BC.json Skip
+ randomStatetest623BC.json OK
+ randomStatetest631BC.json OK
+ randomStatetest634BC.json OK
+ randomStatetest65BC.json OK
@ -215,7 +215,7 @@ OK: 8/8 Fail: 0/8 Skip: 0/8
+ randomStatetest93BC.json OK
+ randomStatetest99BC.json OK
```
OK: 86/96 Fail: 0/96 Skip: 10/96
OK: 96/96 Fail: 0/96 Skip: 0/96
## bcStateTests
```diff
+ BLOCKHASH_Bounds.json OK
@ -229,7 +229,7 @@ OK: 86/96 Fail: 0/96 Skip: 10/96
+ RefundOverflow.json OK
+ RefundOverflow2.json OK
+ SuicidesMixingCoinbase.json OK
TransactionFromCoinbaseHittingBlockGasLimit1.json Skip
+ TransactionFromCoinbaseHittingBlockGasLimit1.json OK
+ TransactionFromCoinbaseNotEnoughFounds.json OK
+ TransactionNonceCheck.json OK
+ TransactionNonceCheck2.json OK
@ -258,24 +258,24 @@ OK: 86/96 Fail: 0/96 Skip: 10/96
+ extCodeHashOfDeletedAccount.json OK
+ extCodeHashOfDeletedAccountDynamic.json OK
+ multimpleBalanceInstruction.json OK
randomStatetest123.json Skip
+ randomStatetest123.json OK
+ randomStatetest136.json OK
randomStatetest160.json Skip
randomStatetest170.json Skip
randomStatetest223.json Skip
randomStatetest229.json Skip
randomStatetest241.json Skip
+ randomStatetest160.json OK
+ randomStatetest170.json OK
+ randomStatetest223.json OK
+ randomStatetest229.json OK
+ randomStatetest241.json OK
+ randomStatetest324.json OK
randomStatetest328.json Skip
randomStatetest375.json Skip
randomStatetest377.json Skip
randomStatetest38.json Skip
randomStatetest441.json Skip
randomStatetest46.json Skip
randomStatetest549.json Skip
randomStatetest594.json Skip
randomStatetest619.json Skip
randomStatetest94.json Skip
+ randomStatetest328.json OK
+ randomStatetest375.json OK
+ randomStatetest377.json OK
+ randomStatetest38.json OK
+ randomStatetest441.json OK
+ randomStatetest46.json OK
+ randomStatetest549.json OK
+ randomStatetest594.json OK
+ randomStatetest619.json OK
+ randomStatetest94.json OK
+ simpleSuicide.json OK
+ suicideCoinbase.json OK
+ suicideCoinbaseState.json OK
@ -286,7 +286,7 @@ OK: 86/96 Fail: 0/96 Skip: 10/96
+ transactionFromNotExistingAccount.json OK
+ txCost-sec73.json OK
```
OK: 50/67 Fail: 0/67 Skip: 17/67
OK: 67/67 Fail: 0/67 Skip: 0/67
## bcTotalDifficultyTest
```diff
+ lotsOfBranchesOverrideAtTheEnd.json OK
@ -404,4 +404,4 @@ OK: 20/20 Fail: 0/20 Skip: 0/20
OK: 5/5 Fail: 0/5 Skip: 0/5
---TOTAL---
OK: 290/318 Fail: 0/318 Skip: 28/318
OK: 317/318 Fail: 0/318 Skip: 1/318

16
nimbus/utils/header.nim
View File

@ -56,19 +56,19 @@ proc computeGasLimit*(parent: BlockHeader, gasLimitFloor: GasInt): GasInt =
let gasLimit = max(
GAS_LIMIT_MINIMUM,
parent.gasLimit - decay + usage_increase
parent.gasLimit - decay + usageIncrease
)
if gas_limit < GAS_LIMIT_MINIMUM:
return GAS_LIMIT_MINIMUM
elif gas_limit < gasLimitFloor:
return parent.gas_limit + decay
if gasLimit < GAS_LIMIT_MINIMUM:
return GAS_LIMIT_MINIMUM
elif gasLimit < gasLimitFloor:
return parent.gasLimit + decay
else:
return gas_limit
return gasLimit
proc generateHeaderFromParentHeader*(parent: BlockHeader,
coinbase: EthAddress, fork: Fork, timestamp: Option[EthTime],
extraData: Blob): BlockHeader =
gasLimit: Option[GasInt], extraData: Blob): BlockHeader =
var lcTimestamp: EthTime
if timestamp.isNone:
@ -83,7 +83,7 @@ proc generateHeaderFromParentHeader*(parent: BlockHeader,
timestamp: lcTimestamp,
blockNumber: (parent.blockNumber + 1),
difficulty: calcDifficulty(lcTimestamp, parent, fork),
gasLimit: computeGasLimit(parent, gasLimitFloor = GENESIS_GAS_LIMIT),
gasLimit: if gasLimit.isSome: gasLimit.get() else: computeGasLimit(parent, gasLimitFloor = GENESIS_GAS_LIMIT),
stateRoot: parent.stateRoot,
coinbase: coinbase,
extraData: extraData,

7
tests/test_blockchain_json.nim
View File

@ -497,7 +497,12 @@ proc importBlock(tester: var Tester, chainDB: BaseChainDB,
let parentHeader = chainDB.getBlockHeader(preminedBlock.header.parentHash)
let baseHeaderForImport = generateHeaderFromParentHeader(parentHeader,
preminedBlock.header.coinbase, fork, some(preminedBlock.header.timestamp), @[])
preminedBlock.header.coinbase,
fork,
some(preminedBlock.header.timestamp),
some(preminedBlock.header.gasLimit),
@[]
)
deepCopy(result, preminedBlock)
let tracerFlags: set[TracerFlags] = if tester.trace: {TracerFlags.EnableTracing} else : {}

58
tests/test_generalstate_failing.nim
View File

@ -23,34 +23,34 @@ func allowedFailingGeneralStateTest*(folder, name: string): bool =
"create2noCash.json",
# bcStateTests
"TransactionFromCoinbaseHittingBlockGasLimit1.json",
"randomStatetest123.json",
"randomStatetest160.json",
"randomStatetest170.json",
"randomStatetest223.json",
"randomStatetest229.json",
"randomStatetest241.json",
"randomStatetest328.json",
"randomStatetest375.json",
"randomStatetest377.json",
"randomStatetest38.json",
"randomStatetest441.json",
"randomStatetest46.json",
"randomStatetest549.json",
"randomStatetest594.json",
"randomStatetest619.json",
"randomStatetest94.json",
# bcRandomBlockhashTest
"randomStatetest127BC.json",
"randomStatetest141BC.json",
"randomStatetest165BC.json",
"randomStatetest272BC.json",
"randomStatetest35BC.json",
"randomStatetest44BC.json",
"randomStatetest459BC.json",
"randomStatetest540BC.json",
"randomStatetest613BC.json",
"randomStatetest623BC.json",
#"TransactionFromCoinbaseHittingBlockGasLimit1.json",
#"randomStatetest123.json",
#"randomStatetest160.json",
#"randomStatetest170.json",
#"randomStatetest223.json",
#"randomStatetest229.json",
#"randomStatetest241.json",
#"randomStatetest328.json",
#"randomStatetest375.json",
#"randomStatetest377.json",
#"randomStatetest38.json",
#"randomStatetest441.json",
#"randomStatetest46.json",
#"randomStatetest549.json",
#"randomStatetest594.json",
#"randomStatetest619.json",
#"randomStatetest94.json",
#
# # bcRandomBlockhashTest
#"randomStatetest127BC.json",
#"randomStatetest141BC.json",
#"randomStatetest165BC.json",
#"randomStatetest272BC.json",
#"randomStatetest35BC.json",
#"randomStatetest44BC.json",
#"randomStatetest459BC.json",
#"randomStatetest540BC.json",
#"randomStatetest613BC.json",
#"randomStatetest623BC.json",
]
result = name in allowedFailingGeneralStateTests

8
tests/test_helpers.nim
View File

@ -274,7 +274,7 @@ proc verifyStateDB*(wantedState: JsonNode, stateDB: ReadOnlyStateDB) =
if not found:
raise newException(ValidationError, "account not found: " & ac)
if actualValue != wantedValue:
raise newException(ValidationError, &"{actualValue.toHex} != {wantedValue.toHex}")
raise newException(ValidationError, &"{ac} storageDiff: [{slot}] {actualValue.toHex} != {wantedValue.toHex}")
let
wantedCode = hexToSeqByte(accountData{"code"}.getStr).toRange
@ -286,11 +286,11 @@ proc verifyStateDB*(wantedState: JsonNode, stateDB: ReadOnlyStateDB) =
actualNonce = stateDB.getNonce(account)
if wantedCode != actualCode:
raise newException(ValidationError, &"{wantedCode} != {actualCode}")
raise newException(ValidationError, &"{ac} codeDiff {wantedCode} != {actualCode}")
if wantedBalance != actualBalance:
raise newException(ValidationError, &"{wantedBalance.toHex} != {actualBalance.toHex}")
raise newException(ValidationError, &"{ac} balanceDiff {wantedBalance.toHex} != {actualBalance.toHex}")
if wantedNonce != actualNonce:
raise newException(ValidationError, &"{wantedNonce.toHex} != {actualNonce.toHex}")
raise newException(ValidationError, &"{ac} nonceDiff {wantedNonce.toHex} != {actualNonce.toHex}")
proc getFixtureTransaction*(j: JsonNode, dataIndex, gasIndex, valueIndex: int): Transaction =
result.accountNonce = j["nonce"].getHexadecimalInt.AccountNonce