From c5fa3543ffcee8673ae8b8cb39126c6819768551 Mon Sep 17 00:00:00 2001
From: Oskar Thoren <ot@oskarthoren.com>
Date: Thu, 28 May 2020 11:28:44 +0800
Subject: [PATCH] WIP try to fix port shift and multiple address mismatch

---
 waku/node/v2/config.nim        |  4 ++--
 waku/node/v2/start_network.nim | 24 +++++++++++++++++------
 waku/node/v2/wakunode.nim      | 36 +++++++++-------------------------
 3 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/waku/node/v2/config.nim b/waku/node/v2/config.nim
index 795bf3319..b1df4d896 100644
--- a/waku/node/v2/config.nim
+++ b/waku/node/v2/config.nim
@@ -19,12 +19,12 @@ type
 
     tcpPort* {.
       desc: "TCP listening port."
-      defaultValue: 30303
+      defaultValue: 60000
       name: "tcp-port" }: uint16
 
     udpPort* {.
       desc: "UDP listening port."
-      defaultValue: 30303
+      defaultValue: 60000
       name: "udp-port" }: uint16
 
     portsShift* {.
diff --git a/waku/node/v2/start_network.nim b/waku/node/v2/start_network.nim
index b6819e21f..839649b80 100644
--- a/waku/node/v2/start_network.nim
+++ b/waku/node/v2/start_network.nim
@@ -36,10 +36,13 @@ proc initNodeCmd(shift: int, staticNodes: seq[string] = @[], master = false, lab
     pubkey = privKey.getKey()[] #assumes ok
     keys = KeyPair(seckey: privKey, pubkey: pubkey)
     peerInfo = PeerInfo.init(privKey)
-    # XXX
-    DefaultAddr = "/ip4/127.0.0.1/tcp/55505"
-    hostAddress = MultiAddress.init(DefaultAddr)
+    port = 60000 + shift
+    #DefaultAddr = "/ip4/127.0.0.1/tcp/55505"
+    address = "/ip4/127.0.0.1/tcp/" & $port
+    hostAddress = MultiAddress.init(address)
 
+  echo "ADDRESS", address
+  # TODO: Need to port shift
   peerInfo.addrs.add(hostAddress)
   let id = peerInfo.id
 
@@ -85,15 +88,24 @@ when isMainModule:
     of FullMesh:
       nodes = fullMeshNetwork(amount)
 
+  var staticnodes: seq[string]
+  for i in 0..<amount:
+    # TODO: could also select nodes randomly
+    staticnodes.add(nodes[i].address)
+
+  # TODO: Here we could add a light node, but not clear thats what we want to test?
 
   var commandStr = "multitail -s 2 -M 0 -x \"Waku Simulation\""
   var count = 0
   var sleepDuration = 0
   for node in nodes:
-    #if conf.topology in {Star, DiscoveryBased}:
-    sleepDuration = if node.master: 0
-                    else: 1
+    if topology in {Star}: #DiscoveryBased
+      sleepDuration = if node.master: 0
+                      else: 1
     commandStr &= &" -cT ansi -t 'node #{count} {node.label}' -l 'sleep {sleepDuration}; {node.cmd}; echo [node execution completed]; while true; do sleep 100; done'"
+    if topology == FullMesh:
+      sleepDuration += 1
+      count += 1
 
   let errorCode = execCmd(commandStr)
   if errorCode != 0:
diff --git a/waku/node/v2/wakunode.nim b/waku/node/v2/wakunode.nim
index 114a0245a..3d2ea2a49 100644
--- a/waku/node/v2/wakunode.nim
+++ b/waku/node/v2/wakunode.nim
@@ -125,13 +125,13 @@ proc run(config: WakuNodeConf) =
   let
     # External TCP and UDP ports
     (ip, tcpPort, udpPort) = setupNat(config)
-    address = Address(ip: ip, tcpPort: tcpPort, udpPort: udpPort)
-
-    port = tcpPort
-    # Using this for now
-    DefaultAddr = "/ip4/127.0.0.1/tcp/55505"
-    hostAddress = MultiAddress.init(DefaultAddr)
+    nat_address = Address(ip: ip, tcpPort: tcpPort, udpPort: udpPort)
+    #port = 60000 + tcpPort
+    #DefaultAddr = "/ip4/127.0.0.1/tcp/55505"
+    address = "/ip4/127.0.0.1/tcp/" & $tcpPort
+    hostAddress = MultiAddress.init(address)
 
+    # XXX: Address and hostAddress usage needs more clarity
     # Difference between announced and host address relevant for running behind NAT, however doesn't seem like nim-libp2p supports this. GHI?
     # NOTE: This is a privatekey
     nodekey = config.nodekey
@@ -141,28 +141,10 @@ proc run(config: WakuNodeConf) =
 
     peerInfo = PeerInfo.init(nodekey)
 
-  info "Initializing networking (host address and announced same)", address
+  #INF 2020-05-28 11:15:50+08:00 Initializing networking (host address and announced same) tid=15555 address=192.168.1.101:30305:30305
+  info "Initializing networking (nat address unused)", nat_address, address
+  peerInfo.addrs.add(Multiaddress.init(address))
 
-  peerInfo.addrs.add(Multiaddress.init(DefaultAddr))
-
-  # TODO: Here setup a libp2p node
-  # Essentially something like this in nbc/eth2_network:
-  # proc createEth2Node*(conf: BeaconNodeConf): Future[Eth2Node]
-  # TODO: Also see beacon_chain/beaconnode, RPC server etc
-  # Also probably start with floodsub for simplicity
-  # Slice it up only minimal parts here
-  # HERE ATM
-  # config.nodekey = KeyPair.random().tryGet()
-  # address = set above; ip, tcp and udp port (incl NAT)
-  # clientId = "Nimbus waku node"
-  #let network = await createLibP2PNode(conf) # doing in-line
-  # let rpcServer ...
-
-  # Is it a "Standard" Switch? Assume it is for now
-  # NOTE: This should be WakuSub here
-
-  # XXX: Do we want to use this wakuProto? Or Switch?
-  # We need access to the WakuSub thing
   # switch.pubsub = wakusub, plus all the peer info etc
   # And it has wakuProto lets use wakuProto maybe, cause it has switch
   var switch = newStandardSwitch(some keys.seckey, hostAddress, triggerSelf = true, gossip = false)