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

P2P fixes, optional discovery

This commit is contained in:
Yuriy Glukhov 2018-09-25 16:17:24 +03:00 committed by zah
parent f89d2eee5f
commit d808d9dc1a
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
eth_p2p.nim
View File

@ -60,6 +60,7 @@ type
discovery: DiscoveryProtocol discovery: DiscoveryProtocol
lastLookupTime: float lastLookupTime: float
connectedNodes: Table[Node, Peer] connectedNodes: Table[Node, Peer]
connectingNodes: HashSet[Node]
running: bool running: bool
listenPort*: Port listenPort*: Port
@ -1259,6 +1260,7 @@ proc newPeerPool*(network: EthereumNode,
result.networkId = networkId result.networkId = networkId
result.discovery = discovery result.discovery = discovery
result.connectedNodes = initTable[Node, Peer]() result.connectedNodes = initTable[Node, Peer]()
result.connectingNodes = initSet[Node]()
result.listenPort = listenPort result.listenPort = listenPort
template ensureFuture(f: untyped) = asyncCheck f template ensureFuture(f: untyped) = asyncCheck f
@ -1292,7 +1294,14 @@ proc connect(p: PeerPool, remote: Node): Future[Peer] {.async.} =
debug "skipping_connection_to_already_connected_peer", remote debug "skipping_connection_to_already_connected_peer", remote
return nil return nil
if remote in p.connectingNodes:
# debug "skipping connection"
return nil
debug "Connecting to node", remote
p.connectingNodes.incl(remote)
result = await p.network.rlpxConnect(remote) result = await p.network.rlpxConnect(remote)
p.connectingNodes.excl(remote)
# expected_exceptions = ( # expected_exceptions = (
# UnreachablePeer, TimeoutError, PeerConnectionLost, HandshakeFailure) # UnreachablePeer, TimeoutError, PeerConnectionLost, HandshakeFailure)
@ -1349,7 +1358,6 @@ proc run(p: Peer, peerPool: PeerPool) {.async.} =
peerPool.peerFinished(p) peerPool.peerFinished(p)
proc connectToNode*(p: PeerPool, n: Node) {.async.} = proc connectToNode*(p: PeerPool, n: Node) {.async.} =
info "Connecting to node", node = n
let peer = await p.connect(n) let peer = await p.connect(n)
if not peer.isNil: if not peer.isNil:
info "Connection established", peer info "Connection established", peer
@ -1360,7 +1368,6 @@ proc connectToNode*(p: PeerPool, n: Node) {.async.} =
# subscriber.register_peer(peer) # subscriber.register_peer(peer)
proc connectToNodes(p: PeerPool, nodes: seq[Node]) {.async.} = proc connectToNodes(p: PeerPool, nodes: seq[Node]) {.async.} =
let f = nodes.mapIt(p.connect(it))
for node in nodes: for node in nodes:
discard p.connectToNode(node) discard p.connectToNode(node)
@ -1494,7 +1501,8 @@ proc startListening*(node: EthereumNode) =
proc connectToNetwork*(node: EthereumNode, proc connectToNetwork*(node: EthereumNode,
bootstrapNodes: seq[ENode], bootstrapNodes: seq[ENode],
startListening = true) {.async.} = startListening = true,
enableDiscovery = true) {.async.} =
assert node.connectionState == ConnectionState.None assert node.connectionState == ConnectionState.None
node.connectionState = Connecting node.connectionState = Connecting
@ -1517,9 +1525,11 @@ proc connectToNetwork*(node: EthereumNode,
if startListening: if startListening:
node.listeningServer.start() node.listeningServer.start()
node.discovery.open() if enableDiscovery:
await node.discovery.bootstrap() node.discovery.open()
# await node.peerPool.maybeConnectToMorePeers() await node.discovery.bootstrap()
else:
info "Disovery disabled"
node.peerPool.start() node.peerPool.start()