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

Merge stable into unstable (take 2)

This commit is contained in:
Zahary Karadjov 2021-05-20 13:52:09 +03:00
parent b7aa30adfd eb55fe2419
commit dc49a51654
No known key found for this signature in database
GPG Key ID: C8936F8A3073D609
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
beacon_chain/conf.nim
View File

@ -80,6 +80,12 @@ type
# migrateAll = "Export and remove the whole validator slashing protection DB." # migrateAll = "Export and remove the whole validator slashing protection DB."
# migrate = "Export and remove specified validators from Nimbus." # migrate = "Export and remove specified validators from Nimbus."
SlashProtCmd* = enum
`import` = "Import a EIP-3076 slashing protection interchange file"
`export` = "Export a EIP-3076 slashing protection interchange file"
# migrateAll = "Export and remove the whole validator slashing protection DB."
# migrate = "Export and remove specified validators from Nimbus."
BeaconNodeConf* = object BeaconNodeConf* = object
logLevel* {. logLevel* {.
desc: "Sets the log level for process and topics (e.g. \"DEBUG; TRACE:discv5,libp2p; REQUIRED:none; DISABLED:none\")" desc: "Sets the log level for process and topics (e.g. \"DEBUG; TRACE:discv5,libp2p; REQUIRED:none; DISABLED:none\")"

1
beacon_chain/validators/slashing_protection.nim
View File

@ -91,7 +91,6 @@ proc init*(
if requiresMigration: if requiresMigration:
var db_v1: SlashingProtectionDB_v1 var db_v1: SlashingProtectionDB_v1
let rawdb = kvstore result.db_v2.getRawDBHandle().openKvStore().get() let rawdb = kvstore result.db_v2.getRawDBHandle().openKvStore().get()
if not rawdb.checkOrPutGenesis_DbV1(genesis_validators_root): if not rawdb.checkOrPutGenesis_DbV1(genesis_validators_root):
fatal "The slashing database refers to another chain/mainnet/testnet", fatal "The slashing database refers to another chain/mainnet/testnet",

2
vendor/nim-eth vendored

@ -1 +1 @@
Subproject commit 1995afb87e14bfb2d3fc2f3474e4d30e10c927a7 Subproject commit 8abe6b7144d87315cae5c2b7a74d792f3dc527aa