Updated to the latest nim-eth, nim-rocksdb, nim-web3. (#1441)

This commit is contained in:
Adam Spitz 2023-01-21 15:04:22 +01:00 committed by GitHub
parent 12f66ae598
commit 1c1a3352b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 27 additions and 16 deletions

View File

@ -1095,8 +1095,9 @@ OK: 22/28 Fail: 0/28 Skip: 6/28
+ Transaction64Rule_d64e0.json OK
+ Transaction64Rule_d64m1.json OK
+ Transaction64Rule_d64p1.json OK
+ Transaction64Rule_integerBoundaries.json OK
```
OK: 13/13 Fail: 0/13 Skip: 0/13
OK: 14/14 Fail: 0/14 Skip: 0/14
## stEIP150singleCodeGasPrices
```diff
+ RawBalanceGas.json OK
@ -3336,4 +3337,4 @@ OK: 0/3 Fail: 0/3 Skip: 3/3
OK: 11/11 Fail: 0/11 Skip: 0/11
---TOTAL---
OK: 2881/2986 Fail: 0/2986 Skip: 105/2986
OK: 2882/2987 Fail: 0/2987 Skip: 105/2987

View File

@ -617,8 +617,9 @@ OK: 22/28 Fail: 0/28 Skip: 6/28
+ Transaction64Rule_d64e0.json OK
+ Transaction64Rule_d64m1.json OK
+ Transaction64Rule_d64p1.json OK
+ Transaction64Rule_integerBoundaries.json OK
```
OK: 13/13 Fail: 0/13 Skip: 0/13
OK: 14/14 Fail: 0/14 Skip: 0/14
## stEIP150singleCodeGasPrices
```diff
+ RawBalanceGas.json OK
@ -2858,4 +2859,4 @@ OK: 1/3 Fail: 0/3 Skip: 2/3
OK: 11/11 Fail: 0/11 Skip: 0/11
---TOTAL---
OK: 2506/2608 Fail: 0/2608 Skip: 102/2608
OK: 2507/2609 Fail: 0/2609 Skip: 102/2609

View File

@ -14,7 +14,6 @@
import
../../../common/common,
../../../transaction,
../../../vm_state,
../../../vm_types,
../../validate,
@ -25,6 +24,8 @@ import
chronicles,
eth/keys
import ../../../transaction except GasPrice, GasPriceEx # already in tx_item
{.push raises: [Defect].}
logScope:

View File

@ -26,9 +26,12 @@ proc put*(db: RocksStoreRef, key, value: openArray[byte]): KvResult[void] =
proc contains*(db: RocksStoreRef, key: openArray[byte]): KvResult[bool] =
db.store.contains(key)
proc del*(db: RocksStoreRef, key: openArray[byte]): KvResult[void] =
proc del*(db: RocksStoreRef, key: openArray[byte]): KvResult[bool] =
db.store.del(key)
proc clear*(db: RocksStoreRef): KvResult[bool] =
db.store.clear()
proc close*(db: RocksStoreRef) =
db.store.close

View File

@ -42,7 +42,7 @@ proc put*(db: ChainDB, key, value: openArray[byte]) =
proc contains*(db: ChainDB, key: openArray[byte]): bool =
db.kv.contains(key).expect("working database")
proc del*(db: ChainDB, key: openArray[byte]) =
proc del*(db: ChainDB, key: openArray[byte]): bool =
db.kv.del(key).expect("working database")
when dbBackend == sqlite:

View File

@ -17,4 +17,4 @@ suite "RocksStoreRef":
defer:
db.close()
testKvStore(kvStore db, false)
testKvStore(kvStore db, false, false)

View File

@ -9,13 +9,16 @@ import
../nimbus/evm/[async_operations, types],
../nimbus/vm_internals,
../nimbus/transaction/[call_common, call_evm],
../nimbus/[transaction, vm_types, vm_state],
../nimbus/[vm_types, vm_state],
../nimbus/core/pow/difficulty
# Need to exclude ServerCommand because it contains something
# called Stop that interferes with the EVM operation named Stop.
import chronos except ServerCommand
# Ditto, for GasPrice.
import ../nimbus/transaction except GasPrice
export byteutils
{.experimental: "dynamicBindSym".}

2
vendor/nim-eth vendored

@ -1 +1 @@
Subproject commit 40ec601d072cf62cb3d3a7929448c43896b3f936
Subproject commit 20d2d318f063d05a0a989b01be80e7560cda34c5

2
vendor/nim-rocksdb vendored

@ -1 +1 @@
Subproject commit b7f07282251b043fa07fc071405727dd17c61654
Subproject commit 724b72fe104bd0af5e1520326e68e9cee0890ec8

2
vendor/nim-web3 vendored

@ -1 +1 @@
Subproject commit df2ef09c63f43eb9a2597bdb3e832ddbf1461871
Subproject commit 98fba0fb0471abffdbe69fb8e66bb59152a7075c

View File

@ -1095,8 +1095,9 @@ OK: 28/28 Fail: 0/28 Skip: 0/28
+ Transaction64Rule_d64e0.json OK
+ Transaction64Rule_d64m1.json OK
+ Transaction64Rule_d64p1.json OK
+ Transaction64Rule_integerBoundaries.json OK
```
OK: 13/13 Fail: 0/13 Skip: 0/13
OK: 14/14 Fail: 0/14 Skip: 0/14
## stEIP150singleCodeGasPrices
```diff
+ RawBalanceGas.json OK
@ -3336,4 +3337,4 @@ OK: 3/3 Fail: 0/3 Skip: 0/3
OK: 11/11 Fail: 0/11 Skip: 0/11
---TOTAL---
OK: 2986/2986 Fail: 0/2986 Skip: 0/2986
OK: 2987/2987 Fail: 0/2987 Skip: 0/2987

View File

@ -617,8 +617,9 @@ OK: 28/28 Fail: 0/28 Skip: 0/28
+ Transaction64Rule_d64e0.json OK
+ Transaction64Rule_d64m1.json OK
+ Transaction64Rule_d64p1.json OK
+ Transaction64Rule_integerBoundaries.json OK
```
OK: 13/13 Fail: 0/13 Skip: 0/13
OK: 14/14 Fail: 0/14 Skip: 0/14
## stEIP150singleCodeGasPrices
```diff
+ RawBalanceGas.json OK
@ -2858,4 +2859,4 @@ OK: 3/3 Fail: 0/3 Skip: 0/3
OK: 11/11 Fail: 0/11 Skip: 0/11
---TOTAL---
OK: 2608/2608 Fail: 0/2608 Skip: 0/2608
OK: 2609/2609 Fail: 0/2609 Skip: 0/2609