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

Hotfix: use the mainnet bootstrap nodes without specifying --network=mainnet explicitly

This commit is contained in:
Zahary Karadjov 2020-12-01 10:44:30 +02:00
parent 4328576e18
commit 3bdda3dd46
No known key found for this signature in database
GPG Key ID: C8936F8A3073D609
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
beacon_chain/nimbus_beacon_node.nim
View File

@ -1123,7 +1123,7 @@ proc handleValidatorExitCommand(config: BeaconNodeConf) {.async.} =
"won't be able to withdraw your deposited funds for the time " & "won't be able to withdraw your deposited funds for the time " &
"being. This means that your funds will be effectively frozen " & "being. This means that your funds will be effectively frozen " &
"until withdrawals are enabled in a future phase of Eth2." "until withdrawals are enabled in a future phase of Eth2."
echoP "To understand more about the Eth2 roadmap, we recommend you " & echoP "To understand more about the Eth2 roadmap, we recommend you " &
"have a look at\n" & "have a look at\n" &
@ -1200,8 +1200,7 @@ programMain:
config.runtimePreset = metadata.runtimePreset config.runtimePreset = metadata.runtimePreset
if config.cmd == noCommand: if config.cmd == noCommand:
for node in metadata.bootstrapNodes: config.bootstrapNodes.add metadata.bootstrapNodes
config.bootstrapNodes.add node
if metadata.genesisData.len > 0: if metadata.genesisData.len > 0:
genesisStateContents = newClone metadata.genesisData genesisStateContents = newClone metadata.genesisData
@ -1223,18 +1222,21 @@ programMain:
checkForIncompatibleOption "deposit-contract-block", depositContractDeployedAt checkForIncompatibleOption "deposit-contract-block", depositContractDeployedAt
config.depositContractAddress = some metadata.depositContractAddress config.depositContractAddress = some metadata.depositContractAddress
config.depositContractDeployedAt = some metadata.depositContractDeployedAt config.depositContractDeployedAt = some metadata.depositContractDeployedAt
eth1Network = metadata.eth1Network eth1Network = metadata.eth1Network
else: else:
config.runtimePreset = defaultRuntimePreset config.runtimePreset = defaultRuntimePreset
when const_preset == "mainnet": when const_preset == "mainnet":
if config.depositContractAddress.isNone: # TODO Remove the ability to override the depositContractAddress
config.depositContractAddress = # on the command line in favour of always requiring a custom
some mainnetMetadata.depositContractAddress # nework file. We have to do this, because any user setting
if config.depositContractDeployedAt.isNone: # would conflict with the default choice of 'mainnet' as a
config.depositContractDeployedAt = # --network value.
some mainnetMetadata.depositContractDeployedAt config.depositContractAddress =
some mainnetMetadata.depositContractAddress
config.depositContractDeployedAt =
some mainnetMetadata.depositContractDeployedAt
config.bootstrapNodes.add mainnetMetadata.bootstrapNodes
genesisStateContents = newClone mainnetMetadata.genesisData genesisStateContents = newClone mainnetMetadata.genesisData
genesisDepositsSnapshotContents = newClone mainnetMetadata.genesisDepositsSnapshot genesisDepositsSnapshotContents = newClone mainnetMetadata.genesisDepositsSnapshot
eth1Network = some mainnet eth1Network = some mainnet