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

Merge branch 'jangko-fix_gaspricelimit'

This commit is contained in:
Ștefan Talpalaru 2019-03-28 15:17:58 +01:00
parent 7b26bf1cee 348782ac6a
commit 5a8c00dcea
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GeneralStateTests.md
View File

@ -1711,9 +1711,9 @@ OK: 16/16 Fail: 0/16 Skip: 0/16
+ makeMoney.json OK + makeMoney.json OK
sha3_deja.json Skip sha3_deja.json Skip
txCost-sec73.json Skip txCost-sec73.json Skip
tx_e1c174e2.json Skip + tx_e1c174e2.json OK
``` ```
OK: 4/13 Fail: 0/13 Skip: 9/13 OK: 5/13 Fail: 0/13 Skip: 8/13
## stStackTests ## stStackTests
```diff ```diff
shallowStack.json Skip shallowStack.json Skip
@ -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: 1432/2334 Fail: 0/2334 Skip: 902/2334 OK: 1433/2334 Fail: 0/2334 Skip: 901/2334

2
nimbus/vm_state_transactions.nim
View File

@ -19,7 +19,7 @@ proc validateTransaction*(vmState: BaseVMState, transaction: Transaction, sender
let gasCost = transaction.gasLimit.u256 * transaction.gasPrice.u256 let gasCost = transaction.gasLimit.u256 * transaction.gasPrice.u256
transaction.gasLimit >= transaction.intrinsicGas and transaction.gasLimit >= transaction.intrinsicGas and
transaction.gasPrice <= (1 shl 34) and #transaction.gasPrice <= (1 shl 34) and
limitAndValue <= readOnlyDB.getBalance(sender) and limitAndValue <= readOnlyDB.getBalance(sender) and
transaction.accountNonce == readOnlyDB.getNonce(sender) and transaction.accountNonce == readOnlyDB.getNonce(sender) and
readOnlyDB.getBalance(sender) >= gasCost readOnlyDB.getBalance(sender) >= gasCost

1
tests/test_generalstate_failing.nim
View File

@ -15,7 +15,6 @@ func allowedFailingGeneralStateTest*(folder, name: string): bool =
let allowedFailingGeneralStateTests = @[ let allowedFailingGeneralStateTests = @[
"randomStatetest14.json", "randomStatetest14.json",
"randomStatetest85.json", "randomStatetest85.json",
"tx_e1c174e2.json",
# 2019-02-17: # 2019-02-17:
"pairingTest.json", "pairingTest.json",
"pointAdd.json", "pointAdd.json",