status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-02-02 09:46:26 +00:00
Code Issues Projects Releases Wiki Activity

Tentative fix for self-connection discovery issues

Browse Source
This commit is contained in:
Zahary Karadjov 2019-03-20 03:18:49 +02:00
parent 71670ca9c9
commit 6d4284877d
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
beacon_chain/beacon_node.nim
View File

@ -175,7 +175,14 @@ proc init*(T: type BeaconNode, conf: BeaconNodeConf): Future[BeaconNode] {.async
result.network.saveConnectionAddressFile(addressFile) result.network.saveConnectionAddressFile(addressFile)
proc connectToNetwork(node: BeaconNode) {.async.} = proc connectToNetwork(node: BeaconNode) {.async.} =
var bootstrapNodes = node.networkMetadata.bootstrapNodes let localKeys = ensureNetworkKeys(node.config)
var bootstrapNodes = newSeq[BootstrapAddr]()
for bootNode in node.networkMetadata.bootstrapNodes:
if bootNode.pubkey == localKeys.pubKey:
node.isBootstrapNode = true
else:
bootstrapNodes.add bootNode
for bootNode in node.config.bootstrapNodes: for bootNode in node.config.bootstrapNodes:
bootstrapNodes.add BootstrapAddr.init(bootNode) bootstrapNodes.add BootstrapAddr.init(bootNode)

1
beacon_chain/beacon_node_types.nim
View File

@ -26,6 +26,7 @@ type
BeaconNode* = ref object BeaconNode* = ref object
network*: EthereumNode network*: EthereumNode
networkMetadata*: NetworkMetadata networkMetadata*: NetworkMetadata
isBootstrapNode*: bool
db*: BeaconChainDB db*: BeaconChainDB
config*: BeaconNodeConf config*: BeaconNodeConf
keys*: KeyPair keys*: KeyPair

2
beacon_chain/eth2_network.nim
View File

@ -30,7 +30,7 @@ when useRLPx:
else: else:
parseIpAddress("127.0.0.1") parseIpAddress("127.0.0.1")
proc ensureNetworkKeys(conf: BeaconNodeConf): KeyPair = proc ensureNetworkKeys*(conf: BeaconNodeConf): KeyPair =
let privateKeyFile = conf.dataDir / "network.privkey" let privateKeyFile = conf.dataDir / "network.privkey"
var privKey: PrivateKey var privKey: PrivateKey
if not fileExists(privateKeyFile): if not fileExists(privateKeyFile):