status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-01-12 21:34:33 +00:00
Code Issues Projects Releases Wiki Activity

don't mix customBootNodes and bootNodes usage

Browse Source
This commit is contained in:
jangko 2021-05-20 13:37:24 +07:00
parent a0d10f5728
commit b82061bf46
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nimbus/config.nim
View File

@ -93,6 +93,7 @@ type
flags*: set[NetworkFlags] ## Network flags flags*: set[NetworkFlags] ## Network flags
bootNodes*: seq[ENode] ## List of bootnodes bootNodes*: seq[ENode] ## List of bootnodes
staticNodes*: seq[ENode] ## List of static nodes to connect to staticNodes*: seq[ENode] ## List of static nodes to connect to
customBootNodes*: seq[ENode]
bindPort*: uint16 ## Main TCP bind port bindPort*: uint16 ## Main TCP bind port
discPort*: uint16 ## Discovery UDP bind port discPort*: uint16 ## Discovery UDP bind port
metricsServer*: bool ## Enable metrics server metricsServer*: bool ## Enable metrics server
@ -417,6 +418,7 @@ proc setBootnodes(onodes: var seq[ENode], nodeUris: openarray[string]) =
doAssert(processENode(item, node) == Success) doAssert(processENode(item, node) == Success)
onodes.add(node) onodes.add(node)
proc setNetwork(conf: var NetConfiguration, id: NetworkId) = proc setNetwork(conf: var NetConfiguration, id: NetworkId) =
## Set network id and default network bootnodes ## Set network id and default network bootnodes
conf.networkId = id conf.networkId = id
@ -442,11 +444,11 @@ proc processNetArguments(key, value: string): ConfigStatus =
let config = getConfiguration() let config = getConfiguration()
let skey = key.toLowerAscii() let skey = key.toLowerAscii()
if skey == "bootnodes": if skey == "bootnodes":
result = processENodesList(value, config.net.bootNodes) result = processENodesList(value, config.net.customBootNodes)
elif skey == "bootnodesv4": elif skey == "bootnodesv4":
result = processENodesList(value, config.net.bootNodes) result = processENodesList(value, config.net.customBootNodes)
elif skey == "bootnodesv5": elif skey == "bootnodesv5":
result = processENodesList(value, config.net.bootNodes) result = processENodesList(value, config.net.customBootNodes)
elif skey == "staticnodes": elif skey == "staticnodes":
result = processENodesList(value, config.net.staticNodes) result = processENodesList(value, config.net.staticNodes)
elif skey == "testnet": elif skey == "testnet":
@ -480,7 +482,7 @@ proc processNetArguments(key, value: string): ConfigStatus =
config.net.flags.incl(NoDiscover) config.net.flags.incl(NoDiscover)
elif skey == "v5discover": elif skey == "v5discover":
config.net.flags.incl(V5Discover) config.net.flags.incl(V5Discover)
config.net.bootNodes.setBootnodes(DiscoveryV5Bootnodes) config.net.customBootNodes.setBootnodes(DiscoveryV5Bootnodes)
elif skey == "port": elif skey == "port":
var res = 0 var res = 0
result = processInteger(value, res) result = processInteger(value, res)
@ -763,17 +765,8 @@ when declared(os.paramCount): # not available with `--app:lib`
## Process command line argument and update `NimbusConfiguration`. ## Process command line argument and update `NimbusConfiguration`.
let config = getConfiguration() let config = getConfiguration()
# At this point `config.net.bootnodes` is likely populated with network default # At this point `config.net.discPort` is likely populated with network default
# bootnodes. We want to override those if at least one custom bootnode is # discPort. We want to override those if it is specified on the command line.
# specified on the command line. We temporarily set `config.net.bootNodes`
# to empty seq, and in the end restore it if no bootnodes were spricified on
# the command line.
# TODO: This is pretty hacky and it's better to refactor it to make a clear
# distinction between default and custom bootnodes.
var tempBootNodes: seq[ENode]
swap(tempBootNodes, config.net.bootNodes)
# The same trick is done to discPort
config.net.discPort = 0 config.net.discPort = 0
var length = 0 var length = 0
@ -806,11 +799,6 @@ when declared(os.paramCount): # not available with `--app:lib`
of cmdEnd: of cmdEnd:
doAssert(false) # we're never getting this kind here doAssert(false) # we're never getting this kind here
if config.net.bootNodes.len == 0:
# No custom bootnodes were specified on the command line, restore to
# previous values
swap(tempBootNodes, config.net.bootNodes)
if config.net.discPort == 0: if config.net.discPort == 0:
config.net.discPort = config.net.bindPort config.net.discPort = config.net.bindPort

5
nimbus/nimbus.nim
View File

@ -160,6 +160,11 @@ proc start(nimbus: NimbusNode) =
asyncCheck nimbus.ethNode.peerPool.connectToNode(newNode(enode)) asyncCheck nimbus.ethNode.peerPool.connectToNode(newNode(enode))
# Connect via discovery # Connect via discovery
if conf.net.customBootNodes.len > 0:
# override the default bootnodes from public network
waitFor nimbus.ethNode.connectToNetwork(conf.net.customBootNodes,
enableDiscovery = NoDiscover notin conf.net.flags)
else:
waitFor nimbus.ethNode.connectToNetwork(conf.net.bootNodes, waitFor nimbus.ethNode.connectToNetwork(conf.net.bootNodes,
enableDiscovery = NoDiscover notin conf.net.flags) enableDiscovery = NoDiscover notin conf.net.flags)