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

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

This reverts commit 1c1a3352b3.
This commit is contained in:
Kim De Mey 2023-01-23 10:50:17 +01:00 committed by GitHub
parent 1c1a3352b3
commit 9b1193c402
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newBlockchainTests.md
View File

@ -1095,9 +1095,8 @@ 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: 14/14 Fail: 0/14 Skip: 0/14
OK: 13/13 Fail: 0/13 Skip: 0/13
## stEIP150singleCodeGasPrices
```diff
+ RawBalanceGas.json OK
@ -3337,4 +3336,4 @@ OK: 0/3 Fail: 0/3 Skip: 3/3
OK: 11/11 Fail: 0/11 Skip: 0/11
---TOTAL---
OK: 2882/2987 Fail: 0/2987 Skip: 105/2987
OK: 2881/2986 Fail: 0/2986 Skip: 105/2986

5
newGeneralStateTests.md
View File

@ -617,9 +617,8 @@ 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: 14/14 Fail: 0/14 Skip: 0/14
OK: 13/13 Fail: 0/13 Skip: 0/13
## stEIP150singleCodeGasPrices
```diff
+ RawBalanceGas.json OK
@ -2859,4 +2858,4 @@ OK: 1/3 Fail: 0/3 Skip: 2/3
OK: 11/11 Fail: 0/11 Skip: 0/11
---TOTAL---
OK: 2507/2609 Fail: 0/2609 Skip: 102/2609
OK: 2506/2608 Fail: 0/2608 Skip: 102/2608

3
nimbus/core/tx_pool/tx_tasks/tx_classify.nim
View File

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

5
nimbus/db/kvstore_rocksdb.nim
View File

@ -26,12 +26,9 @@ 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[bool] =
proc del*(db: RocksStoreRef, key: openArray[byte]): KvResult[void] =
db.store.del(key)
proc clear*(db: RocksStoreRef): KvResult[bool] =
db.store.clear()
proc close*(db: RocksStoreRef) =
db.store.close

2
nimbus/db/select_backend.nim
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]): bool =
proc del*(db: ChainDB, key: openArray[byte]) =
db.kv.del(key).expect("working database")
when dbBackend == sqlite:

2
tests/db/test_kvstore_rocksdb.nim
View File

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

5
tests/macro_assembler.nim
View File

@ -9,16 +9,13 @@ import
../nimbus/evm/[async_operations, types],
../nimbus/vm_internals,
../nimbus/transaction/[call_common, call_evm],
../nimbus/[vm_types, vm_state],
../nimbus/[transaction, 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 20d2d318f063d05a0a989b01be80e7560cda34c5
Subproject commit 40ec601d072cf62cb3d3a7929448c43896b3f936

2
vendor/nim-rocksdb vendored

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

2
vendor/nim-web3 vendored

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

5
witnessBuilderBC.md
View File

@ -1095,9 +1095,8 @@ 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: 14/14 Fail: 0/14 Skip: 0/14
OK: 13/13 Fail: 0/13 Skip: 0/13
## stEIP150singleCodeGasPrices
```diff
+ RawBalanceGas.json OK
@ -3337,4 +3336,4 @@ OK: 3/3 Fail: 0/3 Skip: 0/3
OK: 11/11 Fail: 0/11 Skip: 0/11
---TOTAL---
OK: 2987/2987 Fail: 0/2987 Skip: 0/2987
OK: 2986/2986 Fail: 0/2986 Skip: 0/2986

5
witnessBuilderGST.md
View File

@ -617,9 +617,8 @@ 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: 14/14 Fail: 0/14 Skip: 0/14
OK: 13/13 Fail: 0/13 Skip: 0/13
## stEIP150singleCodeGasPrices
```diff
+ RawBalanceGas.json OK
@ -2859,4 +2858,4 @@ OK: 3/3 Fail: 0/3 Skip: 0/3
OK: 11/11 Fail: 0/11 Skip: 0/11
---TOTAL---
OK: 2609/2609 Fail: 0/2609 Skip: 0/2609
OK: 2608/2608 Fail: 0/2608 Skip: 0/2608