From e227959a34c4169df41a143a8f4a91daa49253f5 Mon Sep 17 00:00:00 2001
From: Oskar Thoren <ot@oskarthoren.com>
Date: Fri, 1 May 2020 12:24:34 +0800
Subject: [PATCH] Dial other static node hacky

---
 node/v2/quicksim.nim | 15 ++++++++++++++-
 node/v2/wakunode.nim | 39 ++++++++++++++++++++++++++++++++++-----
 2 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/node/v2/quicksim.nim b/node/v2/quicksim.nim
index f8b3ea8c6..6039a1d9a 100644
--- a/node/v2/quicksim.nim
+++ b/node/v2/quicksim.nim
@@ -20,7 +20,20 @@ let node1 = newRpcHttpClient()
 #let node2 = newRpcHttpClient()
 
 # Where do we connect nodes here? Protocol so not RPC based, maybe?
-# Could hack it I suppose
+# Using with static nodes, hardcoded "works":
+# /ip4/127.0.0.1/tcp/55505/ipfs/16Uiu2HAkufRTzUnYCMggjPaAMbC3ss1bkrjewPcjwSeqK9WgUKYu
+
+# static node parsing ignored for now
+#./build/wakunode2 --staticnode:/ip4/hallibaba/foo --ports-shift:1
+
+# node 1:
+#  WRN 2020-05-01 12:20:13+08:00 no handlers for                            tid=24636 protocol=/vac/waku/2.0.0-alpha0 topic=Multistream
+
+
+
+
+# Need to figure out rw stuff as well, perhaps we can start a few nodes and see if we get some pingpong
+# Unclear how to mount waku on top of gossipsub tho
 
 info "Hello there"
 # Hello world
diff --git a/node/v2/wakunode.nim b/node/v2/wakunode.nim
index 5363095ba..6e9cebd5c 100644
--- a/node/v2/wakunode.nim
+++ b/node/v2/wakunode.nim
@@ -7,6 +7,7 @@ import
   # TODO remove me
   ../../vendor/nimbus/nimbus/rpc/[wakusim, key_storage],
   ../../vendor/nim-libp2p/libp2p/standard_setup,
+  ../../vendor/nim-libp2p/libp2p/multiaddress,
   ../../vendor/nim-libp2p/libp2p/crypto/crypto,
   ../../vendor/nim-libp2p/libp2p/protocols/protocol,
   ../../vendor/nim-libp2p/libp2p/peerinfo,
@@ -48,12 +49,35 @@ proc setBootNodes(nodes: openArray[string]): seq[ENode] =
     # TODO: something more user friendly than an expect
     result.add(ENode.fromString(nodeId).expect("correct node"))
 
-proc connectToNodes(node: EthereumNode, nodes: openArray[string]) =
-  for nodeId in nodes:
-    # TODO: something more user friendly than an assert
-    let whisperENode = ENode.fromString(nodeId).expect("correct node")
+proc initAddress(T: type MultiAddress, str: string): T =
+  let address = MultiAddress.init(str)
+  if IPFS.match(address) and matchPartial(multiaddress.TCP, address):
+    result = address
+  else:
+    raise newException(MultiAddressError,
+                       "Invalid bootstrap node multi-address")
 
-    traceAsyncErrors node.peerPool.connectToNode(newNode(whisperENode))
+proc dialPeer(p: WakuProto, address: string) {.async.} =
+  let multiAddr = MultiAddress.initAddress(address)
+  let parts = address.split("/")
+  let remotePeer = PeerInfo.init(parts[^1], [multiAddr])
+
+  info "Dialing peer", multiAddr
+  p.conn = await p.switch.dial(remotePeer, WakuCodec)
+  # Isn't there just one p instance? Why connected here?
+  p.connected = true
+
+proc connectToNodes(p: WakuProto, nodes: openArray[string]) =
+  info "connectToNodes", nodes
+  # XXX: Hardcoded here
+  let peerInfoStr = "/ip4/127.0.0.1/tcp/55505/ipfs/16Uiu2HAkufRTzUnYCMggjPaAMbC3ss1bkrjewPcjwSeqK9WgUKYu"
+  discard dialPeer(p, peerInfoStr)
+#  for nodeId in nodes:
+#    info "connectToNodes nodeid", nodeId
+#    # TODO: something more user friendly than an assert
+#    let whisperENode = ENode.fromString(nodeId).expect("correct node")
+#
+#    traceAsyncErrors node.peerPool.connectToNode(newNode(whisperENode))
 
 # NOTE: Looks almost identical to beacon_chain/eth2_network.nim
 proc setupNat(conf: WakuNodeConf): tuple[ip: IpAddress,
@@ -180,8 +204,13 @@ proc run(config: WakuNodeConf) =
   let id = peerInfo.peerId.pretty
   info "PeerInfo", id = id, addrs = peerInfo.addrs
   let listenStr = $peerInfo.addrs[0] & "/ipfs/" & id
+  # XXX: this should be /ip4..., / stripped?
   info "Listening on", full = listenStr
 
+  # XXX: So doing this _after_ other setup
+  # Optionally direct connect with a set of nodes
+  if config.staticnodes.len > 0: connectToNodes(wakuProto, config.staticnodes)
+
   # Here directchat uses rwLoop for protocol
   # What if we dial here? How dial?
   # Feels very ghetto, this hookup