From 46721c14f3b5f3468f33028e86488ddbcacfcc5e Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Thu, 10 Oct 2024 12:16:13 +0200
Subject: [PATCH 01/23] circuit relay first commit

---
 tests/test_waku_switch.nim         |  4 ++--
 waku/discovery/autonat_service.nim | 34 ++++++++++++++++++++++++++++++
 waku/factory/builder.nim           | 31 ++++++++++++++++++++++++---
 waku/factory/external_config.nim   | 10 +++++++++
 waku/factory/node_factory.nim      |  1 +
 waku/factory/waku.nim              | 15 +++++++++++++
 waku/node/waku_node.nim            | 33 ++---------------------------
 waku/node/waku_switch.nim          |  5 ++++-
 waku/waku_relay/protocol.nim       |  7 ++++++
 9 files changed, 103 insertions(+), 37 deletions(-)
 create mode 100644 waku/discovery/autonat_service.nim

diff --git a/tests/test_waku_switch.nim b/tests/test_waku_switch.nim
index 6cf734a332..a471078498 100644
--- a/tests/test_waku_switch.nim
+++ b/tests/test_waku_switch.nim
@@ -26,7 +26,7 @@ suite "Waku Switch":
     ## Given
     let
       sourceSwitch = newTestSwitch()
-      wakuSwitch = newWakuSwitch(rng = rng())
+      wakuSwitch = newWakuSwitch(rng = rng(), relay = Relay.new())
     await sourceSwitch.start()
     await wakuSwitch.start()
 
@@ -46,7 +46,7 @@ suite "Waku Switch":
   asyncTest "Waku Switch acts as circuit relayer":
     ## Setup
     let
-      wakuSwitch = newWakuSwitch(rng = rng())
+      wakuSwitch = newWakuSwitch(rng = rng(), relay = Relay.new())
       sourceClient = RelayClient.new()
       destClient = RelayClient.new()
       sourceSwitch = newCircuitRelayClientSwitch(sourceClient)
diff --git a/waku/discovery/autonat_service.nim b/waku/discovery/autonat_service.nim
new file mode 100644
index 0000000000..f801000ae8
--- /dev/null
+++ b/waku/discovery/autonat_service.nim
@@ -0,0 +1,34 @@
+import
+  chronos,
+  chronicles,
+  bearssl/rand,
+  libp2p/protocols/connectivity/autonat/client,
+  libp2p/protocols/connectivity/autonat/service,
+  libp2p/protocols/connectivity/autonat/core
+
+proc getAutonatService*(rng: ref HmacDrbgContext): AutonatService =
+  ## AutonatService request other peers to dial us back
+  ## flagging us as Reachable or NotReachable.
+  ## minConfidence is used as threshold to determine the state.
+  ## If maxQueueSize > numPeersToAsk past samples are considered
+  ## in the calculation.
+  let autonatService = AutonatService.new(
+    autonatClient = AutonatClient.new(),
+    rng = rng,
+    scheduleInterval = Opt.some(chronos.seconds(120)),
+    askNewConnectedPeers = false,
+    numPeersToAsk = 3,
+    maxQueueSize = 3,
+    minConfidence = 0.7,
+  )
+
+  proc statusAndConfidenceHandler(
+      networkReachability: NetworkReachability, confidence: Opt[float]
+  ): Future[void] {.async.} =
+    if confidence.isSome():
+      info "Peer reachability status",
+        networkReachability = networkReachability, confidence = confidence.get()
+
+  autonatService.statusAndConfidenceHandler(statusAndConfidenceHandler)
+
+  return autonatService
diff --git a/waku/factory/builder.nim b/waku/factory/builder.nim
index 7e203fe72b..b2907a9017 100644
--- a/waku/factory/builder.nim
+++ b/waku/factory/builder.nim
@@ -7,13 +7,18 @@ import
   libp2p/crypto/crypto,
   libp2p/builders,
   libp2p/nameresolving/nameresolver,
-  libp2p/transports/wstransport
+  libp2p/transports/wstransport,
+  libp2p/protocols/connectivity/relay/client,
+  libp2p/protocols/connectivity/relay/relay,
+  libp2p/services/autorelayservice,
+  libp2p/services/hpservice
 import
   ../waku_enr,
   ../discovery/waku_discv5,
   ../waku_node,
   ../node/peer_manager,
-  ../common/rate_limit/setting
+  ../common/rate_limit/setting,
+  ../discovery/autonat_service
 
 type
   WakuNodeBuilder* = object # General
@@ -38,6 +43,7 @@ type
     switchSslSecureKey: Option[string]
     switchSslSecureCert: Option[string]
     switchSendSignedPeerRecord: Option[bool]
+    switchIsRelayClient: bool ## circuit-relay related
 
     #Rate limit configs for non-relay req-resp protocols
     rateLimitSettings: Option[seq[string]]
@@ -126,12 +132,14 @@ proc withSwitchConfiguration*(
     secureKey = none(string),
     secureCert = none(string),
     agentString = none(string),
+    isRelayClient = false,
 ) =
   builder.switchMaxConnections = maxConnections
   builder.switchSendSignedPeerRecord = some(sendSignedPeerRecord)
   builder.switchSslSecureKey = secureKey
   builder.switchSslSecureCert = secureCert
   builder.switchAgentString = agentString
+  builder.switchIsRelayClient = isRelayClient
 
   if not nameResolver.isNil():
     builder.switchNameResolver = some(nameResolver)
@@ -154,6 +162,22 @@ proc build*(builder: WakuNodeBuilder): Result[WakuNode, string] =
   if builder.record.isNone():
     return err("node record is required")
 
+  let autonatService = autonat_service.getAutonatService(rng)
+  var services: seq[Service]
+
+  var relay = Relay.new()
+    ## by default, the node is configured as a server relay-circuit node
+
+  if builder.switchIsRelayClient:
+    ## The node is considered to be behind a NAT or firewall and then it
+    ## should struggle to be reachable and establish connections to other nodes
+    relay = RelayClient.new()
+    let autoRelayService = AutoRelayService.new(1, RelayClient(relay), nil, rng)
+    let holePunchService = HPService.new(autonatService, autoRelayService)
+    services = @[Service(holePunchService)]
+  else:
+    services = @[Service(autonatService)]
+
   var switch: Switch
   try:
     switch = newWakuSwitch(
@@ -170,7 +194,8 @@ proc build*(builder: WakuNodeBuilder): Result[WakuNode, string] =
       sendSignedPeerRecord = builder.switchSendSignedPeerRecord.get(false),
       agentString = builder.switchAgentString,
       peerStoreCapacity = builder.peerStorageCapacity,
-      services = @[Service(getAutonatService(rng))],
+      services = services,
+      relay = relay,
     )
   except CatchableError:
     return err("failed to create switch: " & getCurrentExceptionMsg())
diff --git a/waku/factory/external_config.nim b/waku/factory/external_config.nim
index 2446352c10..31cc4adc3a 100644
--- a/waku/factory/external_config.nim
+++ b/waku/factory/external_config.nim
@@ -245,6 +245,16 @@ type WakuNodeConf* = object
       name: "dns4-domain-name"
     .}: string
 
+    ## Circuit-relay config
+    isRelayClient* {.
+      desc:
+        """Set the node as a relay-client.
+Set it to true for nodes that might run behind a NAT or firewall and
+hence would have reachability issues.""",
+      defaultValue: false
+      name: "relay-client"
+    .}: bool
+
     ## Relay config
     relay* {.
       desc: "Enable relay protocol: true|false", defaultValue: true, name: "relay"
diff --git a/waku/factory/node_factory.nim b/waku/factory/node_factory.nim
index 7cc24428a6..12af4656d1 100644
--- a/waku/factory/node_factory.nim
+++ b/waku/factory/node_factory.nim
@@ -97,6 +97,7 @@ proc initNode(
     sendSignedPeerRecord = conf.relayPeerExchange,
       # We send our own signed peer record when peer exchange enabled
     agentString = some(conf.agentString),
+    isRelayClient = conf.isRelayClient,
   )
   builder.withColocationLimit(conf.colocationLimit)
   builder.withPeerManagerConfig(
diff --git a/waku/factory/waku.nim b/waku/factory/waku.nim
index e503ee8f0d..28dbc88a3d 100644
--- a/waku/factory/waku.nim
+++ b/waku/factory/waku.nim
@@ -10,6 +10,8 @@ import
   libp2p/crypto/crypto,
   libp2p/protocols/pubsub/gossipsub,
   libp2p/peerid,
+  libp2p/discovery/discoverymngr,
+  libp2p/discovery/rendezvousinterface,
   eth/keys,
   presto,
   metrics,
@@ -24,6 +26,7 @@ import
   ../waku_api/message_cache,
   ../waku_api/rest/server,
   ../waku_archive,
+  ../waku_relay/protocol,
   ../discovery/waku_dnsdisc,
   ../discovery/waku_discv5,
   ../waku_enr/sharding,
@@ -49,6 +52,7 @@ type Waku* = object
 
   wakuDiscv5*: WakuDiscoveryV5
   dynamicBootstrapNodes: seq[RemotePeerInfo]
+  discoveryMngr: DiscoveryManager
 
   node*: WakuNode
 
@@ -189,6 +193,7 @@ proc init*(T: type Waku, confCopy: var WakuNodeConf): Result[Waku, string] =
 
   let node = nodeRes.get()
 
+  ## Delivery Monitor
   var deliveryMonitor: DeliveryMonitor
   if confCopy.reliabilityEnabled:
     if confCopy.storenode == "":
@@ -297,6 +302,16 @@ proc startWaku*(waku: ptr Waku): Future[Result[void, string]] {.async: (raises:
   if not waku[].deliveryMonitor.isNil():
     waku[].deliveryMonitor.startDeliveryMonitor()
 
+  ## libp2p DiscoveryManager
+  waku[].discoveryMngr = DiscoveryManager()
+  waku[].discoveryMngr.add(
+    RendezVousInterface.new(rdv = waku[].node.rendezvous, tta = 1.minutes)
+  )
+  if not isNil(waku[].node.wakuRelay):
+    for topic in waku[].node.wakuRelay.getSubscribedTopics():
+      debug "advertise rendezvous namespace", topic
+      waku[].discoveryMngr.advertise(RdvNamespace(topic))
+
   return ok()
 
 # Waku shutdown
diff --git a/waku/node/waku_node.nim b/waku/node/waku_node.nim
index 060237a9dc..fc2b3f6065 100644
--- a/waku/node/waku_node.nim
+++ b/waku/node/waku_node.nim
@@ -50,7 +50,8 @@ import
   ../waku_rln_relay,
   ./config,
   ./peer_manager,
-  ../common/rate_limit/setting
+  ../common/rate_limit/setting,
+  waku/discovery/autonat_service
 
 declarePublicCounter waku_node_messages, "number of messages received", ["type"]
 declarePublicHistogram waku_histogram_message_size,
@@ -116,33 +117,6 @@ type
     contentTopicHandlers: Table[ContentTopic, TopicHandler]
     rateLimitSettings*: ProtocolRateLimitSettings
 
-proc getAutonatService*(rng: ref HmacDrbgContext): AutonatService =
-  ## AutonatService request other peers to dial us back
-  ## flagging us as Reachable or NotReachable.
-  ## minConfidence is used as threshold to determine the state.
-  ## If maxQueueSize > numPeersToAsk past samples are considered
-  ## in the calculation.
-  let autonatService = AutonatService.new(
-    autonatClient = AutonatClient.new(),
-    rng = rng,
-    scheduleInterval = Opt.some(chronos.seconds(120)),
-    askNewConnectedPeers = false,
-    numPeersToAsk = 3,
-    maxQueueSize = 3,
-    minConfidence = 0.7,
-  )
-
-  proc statusAndConfidenceHandler(
-      networkReachability: NetworkReachability, confidence: Opt[float]
-  ): Future[void] {.gcsafe, async.} =
-    if confidence.isSome():
-      info "Peer reachability status",
-        networkReachability = networkReachability, confidence = confidence.get()
-
-  autonatService.statusAndConfidenceHandler(statusAndConfidenceHandler)
-
-  return autonatService
-
 proc new*(
     T: type WakuNode,
     netConfig: NetConfig,
@@ -433,9 +407,6 @@ proc startRelay*(node: WakuNode) {.async.} =
 
     await node.peerManager.reconnectPeers(WakuRelayCodec, backoffPeriod)
 
-  # Start the WakuRelay protocol
-  await node.wakuRelay.start()
-
   info "relay started successfully"
 
 proc mountRelay*(
diff --git a/waku/node/waku_switch.nim b/waku/node/waku_switch.nim
index db1dc51bb2..726e622d46 100644
--- a/waku/node/waku_switch.nim
+++ b/waku/node/waku_switch.nim
@@ -9,6 +9,7 @@ import
   libp2p/crypto/crypto,
   libp2p/protocols/pubsub/gossipsub,
   libp2p/protocols/rendezvous,
+  libp2p/protocols/connectivity/relay/relay,
   libp2p/nameresolving/nameresolver,
   libp2p/builders,
   libp2p/switch,
@@ -78,6 +79,8 @@ proc newWakuSwitch*(
     peerStoreCapacity = none(int), # defaults to 1.25 maxConnections
     services: seq[switch.Service] = @[],
     rendezvous: RendezVous = nil,
+    isRelayClient: bool = false,
+    relay: Relay,
 ): Switch {.raises: [Defect, IOError, LPError].} =
   var b = SwitchBuilder
     .new()
@@ -92,7 +95,7 @@ proc newWakuSwitch*(
     .withTcpTransport(transportFlags)
     .withNameResolver(nameResolver)
     .withSignedPeerRecord(sendSignedPeerRecord)
-    .withCircuitRelay()
+    .withCircuitRelay(relay)
     .withAutonat()
 
   if peerStoreCapacity.isSome():
diff --git a/waku/waku_relay/protocol.nim b/waku/waku_relay/protocol.nim
index fc8aa41725..b050b5f0bc 100644
--- a/waku/waku_relay/protocol.nim
+++ b/waku/waku_relay/protocol.nim
@@ -501,3 +501,10 @@ proc getNumConnectedPeers*(
     )
 
   return ok(peers.len)
+
+proc getSubscribedTopics*(w: WakuRelay): seq[PubsubTopic] =
+  ## Returns a seq containing the current list of subscribed topics
+  var topics: seq[PubsubTopic]
+  for t in w.validatorInserted.keys():
+    topics.add(t)
+  return topics

From 034b9dc839ab15d6009511ea8f4019ff70ad4815 Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Tue, 15 Oct 2024 21:03:01 +0200
Subject: [PATCH 02/23] undo apt install libpcre

---
 .github/workflows/ci.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3a8085a159..b567059f83 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -111,9 +111,6 @@ jobs:
         run: |
           postgres_enabled=0
           if [ ${{ runner.os }} == "Linux" ]; then
-            sudo apt-get update
-            sudo apt-get install -y libpcre3 libpcre3-dev
-
             sudo docker run --rm -d -e POSTGRES_PASSWORD=test123 -p 5432:5432 postgres:15.4-alpine3.18
             postgres_enabled=1
           fi

From 7fe1057062ccc42404ad7cb0767f604385c62cee Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Wed, 16 Oct 2024 14:35:29 +0200
Subject: [PATCH 03/23] nat.nim: protect against possible exceptions when
 calling getExternalIP

---
 waku/common/utils/nat.nim | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/waku/common/utils/nat.nim b/waku/common/utils/nat.nim
index 893e8d8a82..975dcec377 100644
--- a/waku/common/utils/nat.nim
+++ b/waku/common/utils/nat.nim
@@ -39,7 +39,12 @@ proc setupNat*(
       warn "NAT already initialized, skipping as cannot be done multiple times"
     else:
       singletonNat = true
-      let extIp = getExternalIP(strategy)
+      var extIp = none(IpAddress)
+      try:
+        extIp = getExternalIP(strategy)
+      except Exception:
+        warn "exception in setupNat", error = getCurrentExceptionMsg()
+
       if extIP.isSome():
         endpoint.ip = some(extIp.get())
         # RedirectPorts in considered a gcsafety violation

From 2fc9637281410b419901a413d1b040810785b0ab Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Sat, 19 Oct 2024 19:55:08 +0200
Subject: [PATCH 04/23] progress in circuit-relay addition

---
 waku/discovery/autonat_service.nim |  4 ++-
 waku/factory/waku.nim              |  2 +-
 waku/node/waku_node.nim            | 24 +++++++++----
 waku/waku_core/peers.nim           | 57 +++++++++++++++++++++++++++---
 4 files changed, 74 insertions(+), 13 deletions(-)

diff --git a/waku/discovery/autonat_service.nim b/waku/discovery/autonat_service.nim
index f801000ae8..c4e2dd8edc 100644
--- a/waku/discovery/autonat_service.nim
+++ b/waku/discovery/autonat_service.nim
@@ -6,6 +6,8 @@ import
   libp2p/protocols/connectivity/autonat/service,
   libp2p/protocols/connectivity/autonat/core
 
+const AutonatCheckInterval = Opt.some(chronos.seconds(30))
+
 proc getAutonatService*(rng: ref HmacDrbgContext): AutonatService =
   ## AutonatService request other peers to dial us back
   ## flagging us as Reachable or NotReachable.
@@ -15,7 +17,7 @@ proc getAutonatService*(rng: ref HmacDrbgContext): AutonatService =
   let autonatService = AutonatService.new(
     autonatClient = AutonatClient.new(),
     rng = rng,
-    scheduleInterval = Opt.some(chronos.seconds(120)),
+    scheduleInterval = AutonatCheckInterval,
     askNewConnectedPeers = false,
     numPeersToAsk = 3,
     maxQueueSize = 3,
diff --git a/waku/factory/waku.nim b/waku/factory/waku.nim
index 28dbc88a3d..cacbeabcf1 100644
--- a/waku/factory/waku.nim
+++ b/waku/factory/waku.nim
@@ -275,7 +275,7 @@ proc updateWaku(waku: ptr Waku): Result[void, string] =
 
     waku[].node.announcedAddresses = netConf.announcedAddresses
 
-    printNodeNetworkInfo(waku[].node)
+    ?updateAnnouncedAddrWithPrimaryIpAddr(waku[].node)
 
   return ok()
 
diff --git a/waku/node/waku_node.nim b/waku/node/waku_node.nim
index fc2b3f6065..b94150979c 100644
--- a/waku/node/waku_node.nim
+++ b/waku/node/waku_node.nim
@@ -17,6 +17,8 @@ import
   libp2p/protocols/pubsub/rpc/messages,
   libp2p/protocols/connectivity/autonat/client,
   libp2p/protocols/connectivity/autonat/service,
+  libp2p/protocols/connectivity/relay/relay,
+  libp2p/protocols/connectivity/relay/client,
   libp2p/protocols/rendezvous,
   libp2p/builders,
   libp2p/transports/transport,
@@ -1260,11 +1262,11 @@ proc isBindIpWithZeroPort(inputMultiAdd: MultiAddress): bool =
 
   return false
 
-proc printNodeNetworkInfo*(node: WakuNode): void =
+proc updateAnnouncedAddrWithPrimaryIpAddr*(node: WakuNode): Result[void, string] =
   let peerInfo = node.switch.peerInfo
   var announcedStr = ""
   var listenStr = ""
-  var localIp = ""
+  var localIp = "0.0.0.0"
 
   try:
     localIp = $getPrimaryIPAddr()
@@ -1273,20 +1275,29 @@ proc printNodeNetworkInfo*(node: WakuNode): void =
 
   info "PeerInfo", peerId = peerInfo.peerId, addrs = peerInfo.addrs
 
+  var newAnnouncedAddresses = newSeq[MultiAddress](0)
   for address in node.announcedAddresses:
-    var fulladdr = "[" & $address & "/p2p/" & $peerInfo.peerId & "]"
+    ## Replace "0.0.0.0" or "127.0.0.1" with the localIp
+    let newAddr = ($address).replace("0.0.0.0", localIp).replace("127.0.0.1", localIp)
+    let fulladdr = "[" & $newAddr & "/p2p/" & $peerInfo.peerId & "]"
     announcedStr &= fulladdr
+    let newMultiAddr = MultiAddress.init(newAddr).valueOr:
+      return err("error in updateAnnouncedAddrWithPrimaryIpAddr: " & $error)
+    newAnnouncedAddresses.add(newMultiAddr)
+
+  node.announcedAddresses = newAnnouncedAddresses
 
   for transport in node.switch.transports:
     for address in transport.addrs:
-      var fulladdr = "[" & $address & "/p2p/" & $peerInfo.peerId & "]"
+      let fulladdr = "[" & $address & "/p2p/" & $peerInfo.peerId & "]"
       listenStr &= fulladdr
 
-  ## XXX: this should be /ip4..., / stripped?
   info "Listening on", full = listenStr, localIp = localIp
   info "Announcing addresses", full = announcedStr
   info "DNS: discoverable ENR ", enr = node.enr.toUri()
 
+  return ok()
+
 proc start*(node: WakuNode) {.async.} =
   ## Starts a created Waku Node and
   ## all its mounted protocols.
@@ -1326,7 +1337,8 @@ proc start*(node: WakuNode) {.async.} =
   node.started = true
 
   if not zeroPortPresent:
-    printNodeNetworkInfo(node)
+    updateAnnouncedAddrWithPrimaryIpAddr(node).isOkOr:
+      error "failed update announced addr", error = $error
   else:
     info "Listening port is dynamically allocated, address and ENR generation postponed"
 
diff --git a/waku/waku_core/peers.nim b/waku/waku_core/peers.nim
index 9fff76d400..78f5163ad7 100644
--- a/waku/waku_core/peers.nim
+++ b/waku/waku_core/peers.nim
@@ -4,6 +4,7 @@ import
   std/[options, sequtils, strutils, uri, net],
   results,
   chronos,
+  chronicles,
   eth/keys,
   eth/p2p/discoveryv5/enr,
   eth/net/utils,
@@ -15,6 +16,7 @@ import
   libp2p/peerid,
   libp2p/peerinfo,
   libp2p/routing_record,
+  regex,
   json_serialization
 
 type
@@ -108,7 +110,7 @@ proc init*(
 
 ## Parse
 
-proc validWireAddr*(ma: MultiAddress): bool =
+proc validWireAddr(ma: MultiAddress): bool =
   ## Check if wire Address is supported
   const ValidTransports = mapOr(TCP, WebSockets)
   return ValidTransports.match(ma)
@@ -118,9 +120,44 @@ proc parsePeerInfo*(peer: RemotePeerInfo): Result[RemotePeerInfo, string] =
   ## format `(ip4|ip6)/tcp/p2p`, into dialable PeerInfo
   ok(peer)
 
-proc parsePeerInfo*(peer: MultiAddress): Result[RemotePeerInfo, string] =
-  ## Parses a fully qualified peer multiaddr, in the
-  ## format `(ip4|ip6)/tcp/p2p`, into dialable PeerInfo
+proc parsePeerInfoFromCircuitRelayAddr(
+    address: string
+): Result[RemotePeerInfo, string] =
+  var match: RegexMatch2
+  # Parse like: /ip4/162.19.247.156/tcp/60010/p2p/16Uiu2HAmCzWcYBCw3xKW8De16X9wtcbQrqD8x7CRRv4xpsFJ4oN8/p2p-circuit/p2p/16Uiu2HAm2eqzqp6xn32fzgGi8K4BuF88W4Xy6yxsmDcW8h1gj6ie
+  let maPattern =
+    re2"\/(ip4|ip6|dns|dnsaddr|dns4|dns6)\/[0-9a-fA-F:.]+\/(tcp|ws|wss)\/\d+\/p2p\/(.+)\/p2p-circuit\/p2p\/(.+)"
+  if not regex.match(address, maPattern, match):
+    return err("failed to parse ma: " & address)
+
+  if match.captures.len != 4:
+    return err(
+      "failed parsing p2p-circuit addr, expected 4 regex capture groups: " & address &
+        " found: " & $(match.namedGroups.len)
+    )
+
+  let relayPeerId = address[match.group(2)]
+  let targetPeerIdStr = address[match.group(3)]
+
+  discard PeerID.init(relayPeerId).valueOr:
+    return err("invalid relay peer id from p2p-circuit address: " & address)
+  let targetPeerId = PeerID.init(targetPeerIdStr).valueOr:
+    return err("invalid targetPeerId peer id from p2p-circuit address: " & address)
+
+  let pattern = "/p2p-circuit"
+  let idx = address.find(pattern)
+  let wireAddr: MultiAddress =
+    if idx != -1:
+      # Extract everything from the start up to and including "/p2p-circuit"
+      let adr = address[0 .. (idx + pattern.len - 1)]
+      MultiAddress.init(adr).valueOr:
+        return err("could not create multiaddress from: " & adr)
+    else:
+      return err("could not find /p2p-circuit pattern in: " & address)
+
+  return ok(RemotePeerInfo.init(targetPeerId, @[wireAddr]))
+
+proc parsePeerInfoFromRegularAddr(peer: MultiAddress): Result[RemotePeerInfo, string] =
   var p2pPart: MultiAddress
   var wireAddr = MultiAddress()
   for addrPart in peer.items():
@@ -161,6 +198,16 @@ proc parsePeerInfo*(peer: MultiAddress): Result[RemotePeerInfo, string] =
 
   return ok(RemotePeerInfo.init(peerId, @[wireAddr]))
 
+proc parsePeerInfo*(peer: MultiAddress): Result[RemotePeerInfo, string] =
+  ## Parses a fully qualified peer multiaddr into dialable RemotePeerInfo
+
+  let peerAddrStr = $peer
+
+  if "p2p-circuit" in peerAddrStr:
+    return parsePeerInfoFromCircuitRelayAddr(peerAddrStr)
+
+  return parsePeerInfoFromRegularAddr(peer)
+
 proc parsePeerInfo*(peer: string): Result[RemotePeerInfo, string] =
   ## Parses a fully qualified peer multiaddr, in the
   ## format `(ip4|ip6)/tcp/p2p`, into dialable PeerInfo
@@ -256,7 +303,7 @@ converter toRemotePeerInfo*(peerInfo: PeerInfo): RemotePeerInfo =
   RemotePeerInfo(
     peerId: peerInfo.peerId,
     addrs: peerInfo.listenAddrs,
-    enr: none(Record),
+    enr: none(enr.Record),
     protocols: peerInfo.protocols,
     agent: peerInfo.agentVersion,
     protoVersion: peerInfo.protoVersion,

From f415a9817abdc7e7724117ebb783dd3bcc810511 Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Sat, 19 Oct 2024 20:18:10 +0200
Subject: [PATCH 05/23] Minor change to adapt the isRelayClient param
 description

---
 waku/factory/external_config.nim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/waku/factory/external_config.nim b/waku/factory/external_config.nim
index 31cc4adc3a..cf5e861c51 100644
--- a/waku/factory/external_config.nim
+++ b/waku/factory/external_config.nim
@@ -249,9 +249,9 @@ type WakuNodeConf* = object
     isRelayClient* {.
       desc:
         """Set the node as a relay-client.
-Set it to true for nodes that might run behind a NAT or firewall and
+Set it to true for nodes that run behind a NAT or firewall and
 hence would have reachability issues.""",
-      defaultValue: false
+      defaultValue: false,
       name: "relay-client"
     .}: bool
 

From 7c30a047e818df9fd92408d84ef70e50f61164c9 Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Tue, 22 Oct 2024 12:51:31 +0200
Subject: [PATCH 06/23] circuit relay progress

---
 .../liteprotocoltester/liteprotocoltester.nim |  2 +-
 apps/wakunode2/wakunode2.nim                  |  4 +-
 examples/wakustealthcommitments/node_spec.nim |  2 +-
 .../requests/node_lifecycle_request.nim       |  2 +-
 waku/discovery/waku_discv5.nim                | 20 +++-
 waku/factory/builder.nim                      | 34 ++-----
 waku/factory/node_factory.nim                 | 22 ++---
 waku/factory/waku.nim                         | 97 ++++++++++++++++---
 waku/node/waku_node.nim                       |  9 +-
 waku/node/waku_switch.nim                     |  5 -
 10 files changed, 131 insertions(+), 66 deletions(-)

diff --git a/apps/liteprotocoltester/liteprotocoltester.nim b/apps/liteprotocoltester/liteprotocoltester.nim
index a109a7bb0e..7b595ab195 100644
--- a/apps/liteprotocoltester/liteprotocoltester.nim
+++ b/apps/liteprotocoltester/liteprotocoltester.nim
@@ -124,7 +124,7 @@ when isMainModule:
     error "Starting esential REST server failed.", error = $error
     quit(QuitFailure)
 
-  var wakuApp = Waku.init(wakuConf).valueOr:
+  var wakuApp = Waku.new(wakuConf).valueOr:
     error "Waku initialization failed", error = error
     quit(QuitFailure)
 
diff --git a/apps/wakunode2/wakunode2.nim b/apps/wakunode2/wakunode2.nim
index 70703f8ecd..b6e94c7477 100644
--- a/apps/wakunode2/wakunode2.nim
+++ b/apps/wakunode2/wakunode2.nim
@@ -42,7 +42,7 @@ when isMainModule:
     error "failure while loading the configuration", error = error
     quit(QuitFailure)
 
-  ## Also called within Waku.init. The call to startRestServerEsentials needs the following line
+  ## Also called within Waku.new. The call to startRestServerEsentials needs the following line
   logging.setupLog(conf.logLevel, conf.logFormat)
 
   case conf.cmd
@@ -66,7 +66,7 @@ when isMainModule:
       error "Starting esential REST server failed.", error = $error
       quit(QuitFailure)
 
-    var waku = Waku.init(confCopy).valueOr:
+    var waku = Waku.new(confCopy).valueOr:
       error "Waku initialization failed", error = error
       quit(QuitFailure)
 
diff --git a/examples/wakustealthcommitments/node_spec.nim b/examples/wakustealthcommitments/node_spec.nim
index dabaa0f753..dbab8a3b22 100644
--- a/examples/wakustealthcommitments/node_spec.nim
+++ b/examples/wakustealthcommitments/node_spec.nim
@@ -48,7 +48,7 @@ proc setup*(): Waku =
     conf.rlnRelay = twnClusterConf.rlnRelay
 
   debug "Starting node"
-  var waku = Waku.init(conf).valueOr:
+  var waku = Waku.new(conf).valueOr:
     error "Waku initialization failed", error = error
     quit(QuitFailure)
 
diff --git a/library/waku_thread/inter_thread_communication/requests/node_lifecycle_request.nim b/library/waku_thread/inter_thread_communication/requests/node_lifecycle_request.nim
index 841d47db23..2b2edf038f 100644
--- a/library/waku_thread/inter_thread_communication/requests/node_lifecycle_request.nim
+++ b/library/waku_thread/inter_thread_communication/requests/node_lifecycle_request.nim
@@ -59,7 +59,7 @@ proc createWaku(configJson: cstring): Future[Result[Waku, string]] {.async.} =
             formattedString & ". expected type: " & $typeof(confValue)
         )
 
-  let wakuRes = Waku.init(conf).valueOr:
+  let wakuRes = Waku.new(conf).valueOr:
     error "waku initialization failed", error = error
     return err("Failed setting up Waku: " & $error)
 
diff --git a/waku/discovery/waku_discv5.nim b/waku/discovery/waku_discv5.nim
index 5841b56859..e5665a1678 100644
--- a/waku/discovery/waku_discv5.nim
+++ b/waku/discovery/waku_discv5.nim
@@ -108,6 +108,19 @@ proc new*(
     topicSubscriptionQueue: queue,
   )
 
+proc updateAnnouncedMultiAddress*(
+    wd: WakuDiscoveryV5, addresses: seq[MultiAddress]
+): Result[void, string] =
+  let encodedAddrs = multiaddr.encodeMultiaddrs(addresses)
+
+  wd.protocol.updateRecord([(MultiaddrEnrField, encodedAddrs)]).isOkOr:
+    return err("failed to update multiaddress in ENR: " & $error)
+
+  debug "ENR updated successfully with new multiaddress",
+    enr = wd.protocol.localNode.record.toUri(), record = $(wd.protocol.localNode.record)
+
+  return ok()
+
 proc updateENRShards(
     wd: WakuDiscoveryV5, newTopics: seq[PubsubTopic], add: bool
 ): Result[void, string] =
@@ -286,7 +299,9 @@ proc subscriptionsListener(wd: WakuDiscoveryV5) {.async.} =
     if subRes.isErr() and unsubRes.isErr():
       continue
 
-    debug "ENR updated successfully"
+    debug "ENR updated successfully",
+      enrUri = wd.protocol.localNode.record.toUri(),
+      enr = $(wd.protocol.localNode.record)
 
     wd.predicate =
       shardingPredicate(wd.protocol.localNode.record, wd.protocol.bootstrapRecords)
@@ -314,7 +329,8 @@ proc start*(wd: WakuDiscoveryV5): Future[Result[void, string]] {.async: (raises:
   asyncSpawn wd.subscriptionsListener()
 
   debug "Successfully started discovery v5 service"
-  info "Discv5: discoverable ENR ", enr = wd.protocol.localNode.record.toUri()
+  info "Discv5: discoverable ENR ",
+    enrUri = wd.protocol.localNode.record.toUri(), enr = $(wd.protocol.localNode.record)
 
   ok()
 
diff --git a/waku/factory/builder.nim b/waku/factory/builder.nim
index b2907a9017..f25e70a428 100644
--- a/waku/factory/builder.nim
+++ b/waku/factory/builder.nim
@@ -9,16 +9,13 @@ import
   libp2p/nameresolving/nameresolver,
   libp2p/transports/wstransport,
   libp2p/protocols/connectivity/relay/client,
-  libp2p/protocols/connectivity/relay/relay,
-  libp2p/services/autorelayservice,
-  libp2p/services/hpservice
+  libp2p/protocols/connectivity/relay/relay
 import
   ../waku_enr,
   ../discovery/waku_discv5,
   ../waku_node,
   ../node/peer_manager,
-  ../common/rate_limit/setting,
-  ../discovery/autonat_service
+  ../common/rate_limit/setting
 
 type
   WakuNodeBuilder* = object # General
@@ -43,7 +40,8 @@ type
     switchSslSecureKey: Option[string]
     switchSslSecureCert: Option[string]
     switchSendSignedPeerRecord: Option[bool]
-    switchIsRelayClient: bool ## circuit-relay related
+    services: seq[Service]
+    relay: Relay
 
     #Rate limit configs for non-relay req-resp protocols
     rateLimitSettings: Option[seq[string]]
@@ -122,6 +120,9 @@ proc withColocationLimit*(builder: var WakuNodeBuilder, colocationLimit: int) =
 proc withRateLimit*(builder: var WakuNodeBuilder, limits: seq[string]) =
   builder.rateLimitSettings = some(limits)
 
+proc withRelay*(builder: var WakuNodeBuilder, relay: Relay) =
+  builder.relay = relay
+
 ## Waku switch
 
 proc withSwitchConfiguration*(
@@ -132,14 +133,12 @@ proc withSwitchConfiguration*(
     secureKey = none(string),
     secureCert = none(string),
     agentString = none(string),
-    isRelayClient = false,
 ) =
   builder.switchMaxConnections = maxConnections
   builder.switchSendSignedPeerRecord = some(sendSignedPeerRecord)
   builder.switchSslSecureKey = secureKey
   builder.switchSslSecureCert = secureCert
   builder.switchAgentString = agentString
-  builder.switchIsRelayClient = isRelayClient
 
   if not nameResolver.isNil():
     builder.switchNameResolver = some(nameResolver)
@@ -162,22 +161,6 @@ proc build*(builder: WakuNodeBuilder): Result[WakuNode, string] =
   if builder.record.isNone():
     return err("node record is required")
 
-  let autonatService = autonat_service.getAutonatService(rng)
-  var services: seq[Service]
-
-  var relay = Relay.new()
-    ## by default, the node is configured as a server relay-circuit node
-
-  if builder.switchIsRelayClient:
-    ## The node is considered to be behind a NAT or firewall and then it
-    ## should struggle to be reachable and establish connections to other nodes
-    relay = RelayClient.new()
-    let autoRelayService = AutoRelayService.new(1, RelayClient(relay), nil, rng)
-    let holePunchService = HPService.new(autonatService, autoRelayService)
-    services = @[Service(holePunchService)]
-  else:
-    services = @[Service(autonatService)]
-
   var switch: Switch
   try:
     switch = newWakuSwitch(
@@ -194,8 +177,7 @@ proc build*(builder: WakuNodeBuilder): Result[WakuNode, string] =
       sendSignedPeerRecord = builder.switchSendSignedPeerRecord.get(false),
       agentString = builder.switchAgentString,
       peerStoreCapacity = builder.peerStorageCapacity,
-      services = services,
-      relay = relay,
+      relay = builder.relay,
     )
   except CatchableError:
     return err("failed to create switch: " & getCurrentExceptionMsg())
diff --git a/waku/factory/node_factory.nim b/waku/factory/node_factory.nim
index 12af4656d1..d91e5802a6 100644
--- a/waku/factory/node_factory.nim
+++ b/waku/factory/node_factory.nim
@@ -4,6 +4,7 @@ import
   chronos,
   libp2p/peerid,
   libp2p/protocols/pubsub/gossipsub,
+  libp2p/protocols/connectivity/relay/relay,
   libp2p/nameresolving/dnsresolver,
   libp2p/crypto/crypto
 
@@ -59,6 +60,7 @@ proc initNode(
     nodeKey: crypto.PrivateKey,
     record: enr.Record,
     peerStore: Option[WakuPeerStorage],
+    relay: Relay,
     dynamicBootstrapNodes: openArray[RemotePeerInfo] = @[],
 ): Result[WakuNode, string] =
   ## Setup a basic Waku v2 node based on a supplied configuration
@@ -97,13 +99,13 @@ proc initNode(
     sendSignedPeerRecord = conf.relayPeerExchange,
       # We send our own signed peer record when peer exchange enabled
     agentString = some(conf.agentString),
-    isRelayClient = conf.isRelayClient,
   )
   builder.withColocationLimit(conf.colocationLimit)
   builder.withPeerManagerConfig(
     maxRelayPeers = conf.maxRelayPeers, shardAware = conf.relayShardedPeerManagement
   )
   builder.withRateLimit(conf.rateLimits)
+  builder.withRelay(relay)
 
   node =
     ?builder.build().mapErr(
@@ -433,21 +435,17 @@ proc startNode*(
   return ok()
 
 proc setupNode*(
-    conf: WakuNodeConf, rng: Option[ref HmacDrbgContext] = none(ref HmacDrbgContext)
+    conf: WakuNodeConf,
+    rng: ref HmacDrbgContext = crypto.newRng(),
+    relay: Relay = Relay.new(),
 ): Result[WakuNode, string] =
-  var nodeRng =
-    if rng.isSome():
-      rng.get()
-    else:
-      crypto.newRng()
-
   # Use provided key only if corresponding rng is also provided
   let key =
-    if conf.nodeKey.isSome() and rng.isSome():
+    if conf.nodeKey.isSome():
       conf.nodeKey.get()
     else:
-      warn "missing key or rng, generating new set"
-      crypto.PrivateKey.random(Secp256k1, nodeRng[]).valueOr:
+      warn "missing key, generating new"
+      crypto.PrivateKey.random(Secp256k1, rng[]).valueOr:
         error "Failed to generate key", error = error
         return err("Failed to generate key: " & $error)
 
@@ -474,7 +472,7 @@ proc setupNode*(
 
   debug "Initializing node"
 
-  let node = initNode(conf, netConfig, nodeRng, key, record, peerStore).valueOr:
+  let node = initNode(conf, netConfig, rng, key, record, peerStore, relay).valueOr:
     error "Initializing node failed", error = error
     return err("Initializing node failed: " & error)
 
diff --git a/waku/factory/waku.nim b/waku/factory/waku.nim
index cacbeabcf1..7ef2789b60 100644
--- a/waku/factory/waku.nim
+++ b/waku/factory/waku.nim
@@ -1,18 +1,22 @@
 {.push raises: [].}
 
 import
-  std/options,
+  std/[options, sequtils],
   results,
   chronicles,
   chronos,
+  libp2p/protocols/connectivity/relay/relay,
+  libp2p/protocols/connectivity/relay/client,
   libp2p/wire,
-  libp2p/multicodec,
   libp2p/crypto/crypto,
   libp2p/protocols/pubsub/gossipsub,
+  libp2p/services/autorelayservice,
+  libp2p/services/hpservice,
   libp2p/peerid,
   libp2p/discovery/discoverymngr,
   libp2p/discovery/rendezvousinterface,
   eth/keys,
+  eth/p2p/discoveryv5/enr,
   presto,
   metrics,
   metrics/chronos_httpserver
@@ -29,6 +33,7 @@ import
   ../waku_relay/protocol,
   ../discovery/waku_dnsdisc,
   ../discovery/waku_discv5,
+  ../discovery/autonat_service,
   ../waku_enr/sharding,
   ../waku_rln_relay,
   ../waku_store,
@@ -36,7 +41,8 @@ import
   ../factory/networks_config,
   ../factory/node_factory,
   ../factory/internal_config,
-  ../factory/external_config
+  ../factory/external_config,
+  ../waku_enr/multiaddr
 
 logScope:
   topics = "wakunode waku"
@@ -44,7 +50,7 @@ logScope:
 # Git version in git describe format (defined at compile time)
 const git_version* {.strdefine.} = "n/a"
 
-type Waku* = object
+type Waku* = ref object
   version: string
   conf: WakuNodeConf
   rng: ref HmacDrbgContext
@@ -103,9 +109,40 @@ proc validateShards(conf: WakuNodeConf): Result[void, string] =
 
   return ok()
 
+proc setupSwitchServices(
+    waku: Waku, conf: WakuNodeConf, circuitRelay: Relay, rng: ref HmacDrbgContext
+) =
+  proc onReservation(addresses: seq[MultiAddress]) {.gcsafe, raises: [].} =
+    debug "circuit relay handler new reserve event",
+      addrs_before = $(waku.node.announcedAddresses), addrs = $addresses
+
+    waku.node.announcedAddresses.setLen(0) ## remove previous addresses
+    waku.node.announcedAddresses.add(addresses)
+    debug "waku node announced addresses updated",
+      announcedAddresses = waku.node.announcedAddresses
+
+    waku.wakuDiscv5.updateAnnouncedMultiAddress(addresses).isOkOr:
+      error "failed to update announced multiaddress", error = $error
+
+  let autonatService = getAutonatService(rng)
+  if conf.isRelayClient:
+    ## The node is considered to be behind a NAT or firewall and then it
+    ## should struggle to be reachable and establish connections to other nodes
+    const MaxNumRelayServers = 2
+    let autoRelayService = AutoRelayService.new(
+      MaxNumRelayServers, RelayClient(circuitRelay), onReservation, rng
+    )
+    let holePunchService = HPService.new(autonatService, autoRelayService)
+    waku.node.switch.services = @[Service(holePunchService)]
+  else:
+    waku.node.switch.services = @[Service(autonatService)]
+
+    if conf.isRelayClient:
+      let relay = RelayClient.new()
+
 ## Initialisation
 
-proc init*(T: type Waku, confCopy: var WakuNodeConf): Result[Waku, string] =
+proc new*(T: type Waku, confCopy: var WakuNodeConf): Result[Waku, string] =
   let rng = crypto.newRng()
 
   logging.setupLog(confCopy.logLevel, confCopy.logFormat)
@@ -186,7 +223,11 @@ proc init*(T: type Waku, confCopy: var WakuNodeConf): Result[Waku, string] =
       "Retrieving dynamic bootstrap nodes failed: " & dynamicBootstrapNodesRes.error
     )
 
-  let nodeRes = setupNode(confCopy, some(rng))
+  var relay = Relay.new()
+  if confCopy.isRelayClient:
+    relay = RelayClient.new()
+
+  let nodeRes = setupNode(confCopy, rng, relay)
   if nodeRes.isErr():
     error "Failed setting up node", error = nodeRes.error
     return err("Failed setting up node: " & nodeRes.error)
@@ -217,6 +258,8 @@ proc init*(T: type Waku, confCopy: var WakuNodeConf): Result[Waku, string] =
     deliveryMonitor: deliveryMonitor,
   )
 
+  waku.setupSwitchServices(confCopy, relay, rng)
+
   ok(waku)
 
 proc getPorts(
@@ -254,7 +297,10 @@ proc getRunningNetConfig(waku: ptr Waku): Result[NetConfig, string] =
 
   return ok(netConf)
 
-proc updateEnr(waku: ptr Waku, netConf: NetConfig): Result[void, string] =
+proc updateEnr(waku: ptr Waku): Result[void, string] =
+  let netConf: NetConfig = getRunningNetConfig(waku).valueOr:
+    return err("error calling updateNetConfig: " & $error)
+
   let record = enrConfiguration(waku[].conf, netConf, waku[].key).valueOr:
     return err("ENR setup failed: " & error)
 
@@ -265,17 +311,42 @@ proc updateEnr(waku: ptr Waku, netConf: NetConfig): Result[void, string] =
 
   return ok()
 
+proc updateAddressInENR(waku: ptr Waku): Result[void, string] =
+  let addresses: seq[MultiAddress] = waku[].node.announcedAddresses
+  let encodedAddrs = multiaddr.encodeMultiaddrs(addresses)
+
+  ## First update the enr info contained in WakuNode
+  let keyBytes = waku[].key.getRawBytes().valueOr:
+    return err("failed to retrieve raw bytes from waku key: " & $error)
+
+  let parsedPk = keys.PrivateKey.fromHex(keyBytes.toHex()).valueOr:
+    return err("failed to parse the private key: " & $error)
+
+  let enrFields = @[toFieldPair(MultiaddrEnrField, encodedAddrs)]
+  waku[].node.enr.update(parsedPk, enrFields).isOkOr:
+    return err("failed to update multiaddress in ENR updateAddressInENR: " & $error)
+
+  debug "Waku node ENR updated successfully with new multiaddress",
+    enr = waku[].node.enr.toUri(), record = $(waku[].node.enr)
+
+  ## Now update the ENR infor in discv5
+  if not waku[].wakuDiscv5.isNil():
+    waku[].wakuDiscv5.protocol.localNode.record = waku[].node.enr
+    let enr = waku[].wakuDiscv5.protocol.localNode.record
+
+    debug "Waku discv5 ENR updated successfully with new multiaddress",
+      enr = enr.toUri(), record = $(enr)
+
+  return ok()
+
 proc updateWaku(waku: ptr Waku): Result[void, string] =
   if waku[].conf.tcpPort == Port(0) or waku[].conf.websocketPort == Port(0):
-    let netConf = getRunningNetConfig(waku).valueOr:
-      return err("error calling updateNetConfig: " & $error)
-
-    updateEnr(waku, netConf).isOkOr:
+    updateEnr(waku).isOkOr:
       return err("error calling updateEnr: " & $error)
 
-    waku[].node.announcedAddresses = netConf.announcedAddresses
+  ?updateAnnouncedAddrWithPrimaryIpAddr(waku[].node)
 
-    ?updateAnnouncedAddrWithPrimaryIpAddr(waku[].node)
+  ?updateAddressInENR(waku)
 
   return ok()
 
diff --git a/waku/node/waku_node.nim b/waku/node/waku_node.nim
index b94150979c..23ed608aa0 100644
--- a/waku/node/waku_node.nim
+++ b/waku/node/waku_node.nim
@@ -17,8 +17,6 @@ import
   libp2p/protocols/pubsub/rpc/messages,
   libp2p/protocols/connectivity/autonat/client,
   libp2p/protocols/connectivity/autonat/service,
-  libp2p/protocols/connectivity/relay/relay,
-  libp2p/protocols/connectivity/relay/client,
   libp2p/protocols/rendezvous,
   libp2p/builders,
   libp2p/transports/transport,
@@ -1275,6 +1273,7 @@ proc updateAnnouncedAddrWithPrimaryIpAddr*(node: WakuNode): Result[void, string]
 
   info "PeerInfo", peerId = peerInfo.peerId, addrs = peerInfo.addrs
 
+  ## Update the WakuNode addresses
   var newAnnouncedAddresses = newSeq[MultiAddress](0)
   for address in node.announcedAddresses:
     ## Replace "0.0.0.0" or "127.0.0.1" with the localIp
@@ -1287,12 +1286,16 @@ proc updateAnnouncedAddrWithPrimaryIpAddr*(node: WakuNode): Result[void, string]
 
   node.announcedAddresses = newAnnouncedAddresses
 
+  ## Update the Switch addresses
+  node.switch.peerInfo.addrs = newAnnouncedAddresses
+
   for transport in node.switch.transports:
     for address in transport.addrs:
       let fulladdr = "[" & $address & "/p2p/" & $peerInfo.peerId & "]"
       listenStr &= fulladdr
 
-  info "Listening on", full = listenStr, localIp = localIp
+  info "Listening on",
+    full = listenStr, localIp = localIp, switchAddress = $(node.switch.peerInfo.addrs)
   info "Announcing addresses", full = announcedStr
   info "DNS: discoverable ENR ", enr = node.enr.toUri()
 
diff --git a/waku/node/waku_switch.nim b/waku/node/waku_switch.nim
index 726e622d46..9b8a3651bc 100644
--- a/waku/node/waku_switch.nim
+++ b/waku/node/waku_switch.nim
@@ -77,9 +77,7 @@ proc newWakuSwitch*(
     secureCertPath: string = "",
     agentString = none(string), # defaults to nim-libp2p version
     peerStoreCapacity = none(int), # defaults to 1.25 maxConnections
-    services: seq[switch.Service] = @[],
     rendezvous: RendezVous = nil,
-    isRelayClient: bool = false,
     relay: Relay,
 ): Switch {.raises: [Defect, IOError, LPError].} =
   var b = SwitchBuilder
@@ -117,9 +115,6 @@ proc newWakuSwitch*(
   else:
     b = b.withAddress(address)
 
-  if services.len > 0:
-    b = b.withServices(services)
-
   if not rendezvous.isNil():
     b = b.withRendezVous(rendezvous)
 

From dfe23b497ac202dc571514e00559912276f64b8f Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Tue, 22 Oct 2024 22:23:56 +0200
Subject: [PATCH 07/23] waku_node: should start waku relay protocol

---
 waku/node/waku_node.nim | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/waku/node/waku_node.nim b/waku/node/waku_node.nim
index 23ed608aa0..a9afa86723 100644
--- a/waku/node/waku_node.nim
+++ b/waku/node/waku_node.nim
@@ -407,6 +407,9 @@ proc startRelay*(node: WakuNode) {.async.} =
 
     await node.peerManager.reconnectPeers(WakuRelayCodec, backoffPeriod)
 
+  # Start the WakuRelay protocol
+  await node.wakuRelay.start()
+
   info "relay started successfully"
 
 proc mountRelay*(

From b0b48bd83e760356b091180c7cca1cea732cd9e4 Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Wed, 23 Oct 2024 00:21:19 +0200
Subject: [PATCH 08/23] waku factory change to mount circuit hop proto by
 default

---
 waku/factory/builder.nim  | 14 ++++++++++----
 waku/node/waku_switch.nim |  4 ++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/waku/factory/builder.nim b/waku/factory/builder.nim
index f25e70a428..dd2a20dd0d 100644
--- a/waku/factory/builder.nim
+++ b/waku/factory/builder.nim
@@ -41,7 +41,7 @@ type
     switchSslSecureCert: Option[string]
     switchSendSignedPeerRecord: Option[bool]
     services: seq[Service]
-    relay: Relay
+    circuitRelay: Relay
 
     #Rate limit configs for non-relay req-resp protocols
     rateLimitSettings: Option[seq[string]]
@@ -120,8 +120,8 @@ proc withColocationLimit*(builder: var WakuNodeBuilder, colocationLimit: int) =
 proc withRateLimit*(builder: var WakuNodeBuilder, limits: seq[string]) =
   builder.rateLimitSettings = some(limits)
 
-proc withRelay*(builder: var WakuNodeBuilder, relay: Relay) =
-  builder.relay = relay
+proc withCircuitRelay*(builder: var WakuNodeBuilder, circuitRelay: Relay) =
+  builder.circuitRelay = circuitRelay
 
 ## Waku switch
 
@@ -161,6 +161,12 @@ proc build*(builder: WakuNodeBuilder): Result[WakuNode, string] =
   if builder.record.isNone():
     return err("node record is required")
 
+  let circuitRelay =
+    if builder.circuitRelay.isNil():
+      Relay.new()
+    else:
+      builder.circuitRelay
+
   var switch: Switch
   try:
     switch = newWakuSwitch(
@@ -177,7 +183,7 @@ proc build*(builder: WakuNodeBuilder): Result[WakuNode, string] =
       sendSignedPeerRecord = builder.switchSendSignedPeerRecord.get(false),
       agentString = builder.switchAgentString,
       peerStoreCapacity = builder.peerStorageCapacity,
-      relay = builder.relay,
+      circuitRelay = circuitRelay,
     )
   except CatchableError:
     return err("failed to create switch: " & getCurrentExceptionMsg())
diff --git a/waku/node/waku_switch.nim b/waku/node/waku_switch.nim
index 9b8a3651bc..48d3612e33 100644
--- a/waku/node/waku_switch.nim
+++ b/waku/node/waku_switch.nim
@@ -78,7 +78,7 @@ proc newWakuSwitch*(
     agentString = none(string), # defaults to nim-libp2p version
     peerStoreCapacity = none(int), # defaults to 1.25 maxConnections
     rendezvous: RendezVous = nil,
-    relay: Relay,
+    circuitRelay: Relay,
 ): Switch {.raises: [Defect, IOError, LPError].} =
   var b = SwitchBuilder
     .new()
@@ -93,7 +93,7 @@ proc newWakuSwitch*(
     .withTcpTransport(transportFlags)
     .withNameResolver(nameResolver)
     .withSignedPeerRecord(sendSignedPeerRecord)
-    .withCircuitRelay(relay)
+    .withCircuitRelay(circuitRelay)
     .withAutonat()
 
   if peerStoreCapacity.isSome():

From 8d2fcd386785af6adda3a73f42f5c2a2c8063be4 Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Wed, 23 Oct 2024 10:34:29 +0200
Subject: [PATCH 09/23] fix compilation issue in tests

---
 tests/test_waku_switch.nim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_waku_switch.nim b/tests/test_waku_switch.nim
index a471078498..1bf76e89c8 100644
--- a/tests/test_waku_switch.nim
+++ b/tests/test_waku_switch.nim
@@ -26,7 +26,7 @@ suite "Waku Switch":
     ## Given
     let
       sourceSwitch = newTestSwitch()
-      wakuSwitch = newWakuSwitch(rng = rng(), relay = Relay.new())
+      wakuSwitch = newWakuSwitch(rng = rng(), circuitRelay = Relay.new())
     await sourceSwitch.start()
     await wakuSwitch.start()
 
@@ -46,7 +46,7 @@ suite "Waku Switch":
   asyncTest "Waku Switch acts as circuit relayer":
     ## Setup
     let
-      wakuSwitch = newWakuSwitch(rng = rng(), relay = Relay.new())
+      wakuSwitch = newWakuSwitch(rng = rng(), circuitRelay = Relay.new())
       sourceClient = RelayClient.new()
       destClient = RelayClient.new()
       sourceSwitch = newCircuitRelayClientSwitch(sourceClient)

From 3e2a1d5fef4ae80cfbdb0ec1246414c146a67c3c Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Wed, 23 Oct 2024 11:03:35 +0200
Subject: [PATCH 10/23] fix compilation issue

---
 waku/factory/node_factory.nim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/waku/factory/node_factory.nim b/waku/factory/node_factory.nim
index d91e5802a6..5968f3ace3 100644
--- a/waku/factory/node_factory.nim
+++ b/waku/factory/node_factory.nim
@@ -105,7 +105,7 @@ proc initNode(
     maxRelayPeers = conf.maxRelayPeers, shardAware = conf.relayShardedPeerManagement
   )
   builder.withRateLimit(conf.rateLimits)
-  builder.withRelay(relay)
+  builder.withCircuitRelay(relay)
 
   node =
     ?builder.build().mapErr(

From 7112afc978e7708ebfee49cceb2b776736e46cdd Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Wed, 23 Oct 2024 15:05:47 +0200
Subject: [PATCH 11/23] update tests to use getPrimaryIPAddr

---
 tests/test_peer_manager.nim             | 10 +++++-----
 tests/test_wakunode.nim                 |  6 +++---
 tests/wakunode_rest/test_rest_admin.nim | 17 ++++++++++-------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/tests/test_peer_manager.nim b/tests/test_peer_manager.nim
index 31b04ebf43..4d4db24304 100644
--- a/tests/test_peer_manager.nim
+++ b/tests/test_peer_manager.nim
@@ -1,7 +1,7 @@
 {.used.}
 
 import
-  std/[options, sequtils, times, sugar],
+  std/[options, sequtils, times, sugar, net],
   stew/shims/net as stewNet,
   testutils/unittests,
   chronos,
@@ -270,12 +270,12 @@ procSuite "Peer Manager":
       storage = WakuPeerStorage.new(database)[]
       node1 = newTestWakuNode(
         generateSecp256k1Key(),
-        ValidIpAddress.init("127.0.0.1"),
+        ValidIpAddress.init($getPrimaryIPAddr()),
         Port(44048),
         peerStorage = storage,
       )
       node2 = newTestWakuNode(
-        generateSecp256k1Key(), ValidIpAddress.init("127.0.0.1"), Port(34023)
+        generateSecp256k1Key(), ValidIpAddress.init($getPrimaryIPAddr()), Port(34023)
       )
 
     node1.mountMetadata(0).expect("Mounted Waku Metadata")
@@ -345,12 +345,12 @@ procSuite "Peer Manager":
       storage = WakuPeerStorage.new(database)[]
       node1 = newTestWakuNode(
         generateSecp256k1Key(),
-        ValidIpAddress.init("127.0.0.1"),
+        ValidIpAddress.init($getPrimaryIPAddr()),
         Port(44048),
         peerStorage = storage,
       )
       node2 = newTestWakuNode(
-        generateSecp256k1Key(), ValidIpAddress.init("127.0.0.1"), Port(34023)
+        generateSecp256k1Key(), ValidIpAddress.init($getPrimaryIPAddr()), Port(34023)
       )
 
     node1.mountMetadata(0).expect("Mounted Waku Metadata")
diff --git a/tests/test_wakunode.nim b/tests/test_wakunode.nim
index 975070465a..caee743b6e 100644
--- a/tests/test_wakunode.nim
+++ b/tests/test_wakunode.nim
@@ -1,7 +1,7 @@
 {.used.}
 
 import
-  std/[sequtils, strutils],
+  std/[sequtils, strutils, net],
   stew/byteutils,
   stew/shims/net as stewNet,
   testutils/unittests,
@@ -169,7 +169,7 @@ suite "WakuNode":
       nodeKey = generateSecp256k1Key()
       bindIp = parseIpAddress("0.0.0.0")
       bindPort = Port(61006)
-      extIp = some(parseIpAddress("127.0.0.1"))
+      extIp = some(parseIpAddress($getPrimaryIPAddr()))
       extPort = some(Port(61008))
       node = newTestWakuNode(nodeKey, bindIp, bindPort, extIp, extPort)
 
@@ -205,7 +205,7 @@ suite "WakuNode":
       nodeKey = generateSecp256k1Key()
       bindIp = parseIpAddress("0.0.0.0")
       bindPort = Port(61010)
-      extIp = some(parseIpAddress("127.0.0.1"))
+      extIp = some(parseIpAddress($getPrimaryIPAddr()))
       extPort = some(Port(61012))
       domainName = "example.com"
       expectedDns4Addr =
diff --git a/tests/wakunode_rest/test_rest_admin.nim b/tests/wakunode_rest/test_rest_admin.nim
index b6c9336d08..f4310cf956 100644
--- a/tests/wakunode_rest/test_rest_admin.nim
+++ b/tests/wakunode_rest/test_rest_admin.nim
@@ -1,7 +1,7 @@
 {.used.}
 
 import
-  std/[sequtils, strformat],
+  std/[sequtils, strformat, net],
   stew/shims/net,
   testutils/unittests,
   presto,
@@ -38,12 +38,15 @@ suite "Waku v2 Rest API - Admin":
   var client {.threadvar.}: RestClientRef
 
   asyncSetup:
-    node1 =
-      newTestWakuNode(generateSecp256k1Key(), parseIpAddress("127.0.0.1"), Port(60600))
-    node2 =
-      newTestWakuNode(generateSecp256k1Key(), parseIpAddress("127.0.0.1"), Port(60602))
-    node3 =
-      newTestWakuNode(generateSecp256k1Key(), parseIpAddress("127.0.0.1"), Port(60604))
+    node1 = newTestWakuNode(
+      generateSecp256k1Key(), parseIpAddress($getPrimaryIPAddr()), Port(60600)
+    )
+    node2 = newTestWakuNode(
+      generateSecp256k1Key(), parseIpAddress($getPrimaryIPAddr()), Port(60602)
+    )
+    node3 = newTestWakuNode(
+      generateSecp256k1Key(), parseIpAddress($getPrimaryIPAddr()), Port(60604)
+    )
 
     await allFutures(node1.start(), node2.start(), node3.start())
     await allFutures(

From 748b083039a7b38beacb8c1afbb3f27c540b00b4 Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Wed, 23 Oct 2024 15:44:09 +0200
Subject: [PATCH 12/23] test_app compilation fix

---
 tests/wakunode2/test_app.nim | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/wakunode2/test_app.nim b/tests/wakunode2/test_app.nim
index 04057b1a1f..67a6556c8b 100644
--- a/tests/wakunode2/test_app.nim
+++ b/tests/wakunode2/test_app.nim
@@ -19,7 +19,7 @@ suite "Wakunode2 - Waku":
     ## Given
     var conf = defaultTestWakuNodeConf()
 
-    let waku = Waku.init(conf).valueOr:
+    let waku = Waku.new(conf).valueOr:
       raiseAssert error
 
     ## When
@@ -35,7 +35,7 @@ suite "Wakunode2 - Waku initialization":
     var conf = defaultTestWakuNodeConf()
     conf.peerPersistence = true
 
-    let waku = Waku.init(conf).valueOr:
+    let waku = Waku.new(conf).valueOr:
       raiseAssert error
 
     check:
@@ -46,7 +46,7 @@ suite "Wakunode2 - Waku initialization":
     var conf = defaultTestWakuNodeConf()
 
     ## When
-    var waku = Waku.init(conf).valueOr:
+    var waku = Waku.new(conf).valueOr:
       raiseAssert error
 
     (waitFor startWaku(addr waku)).isOkOr:
@@ -73,7 +73,7 @@ suite "Wakunode2 - Waku initialization":
     conf.tcpPort = Port(0)
 
     ## When
-    var waku = Waku.init(conf).valueOr:
+    var waku = Waku.new(conf).valueOr:
       raiseAssert error
 
     (waitFor startWaku(addr waku)).isOkOr:

From da6bdc1aff204f3183faa168ace5846f8e8559a7 Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Wed, 23 Oct 2024 18:52:17 +0200
Subject: [PATCH 13/23] builer: rm unnecessary line

---
 waku/factory/builder.nim | 1 -
 1 file changed, 1 deletion(-)

diff --git a/waku/factory/builder.nim b/waku/factory/builder.nim
index dd2a20dd0d..abd347b848 100644
--- a/waku/factory/builder.nim
+++ b/waku/factory/builder.nim
@@ -40,7 +40,6 @@ type
     switchSslSecureKey: Option[string]
     switchSslSecureCert: Option[string]
     switchSendSignedPeerRecord: Option[bool]
-    services: seq[Service]
     circuitRelay: Relay
 
     #Rate limit configs for non-relay req-resp protocols

From 7e8511cc93d846d230c7336ae7c4d24d42084754 Mon Sep 17 00:00:00 2001
From: Ivan FB <128452529+Ivansete-status@users.noreply.github.com>
Date: Thu, 24 Oct 2024 18:01:16 +0200
Subject: [PATCH 14/23] Update tests/wakunode_rest/test_rest_admin.nim

Co-authored-by: gabrielmer <101006718+gabrielmer@users.noreply.github.com>
---
 tests/wakunode_rest/test_rest_admin.nim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/wakunode_rest/test_rest_admin.nim b/tests/wakunode_rest/test_rest_admin.nim
index f4310cf956..5a44f16988 100644
--- a/tests/wakunode_rest/test_rest_admin.nim
+++ b/tests/wakunode_rest/test_rest_admin.nim
@@ -39,13 +39,13 @@ suite "Waku v2 Rest API - Admin":
 
   asyncSetup:
     node1 = newTestWakuNode(
-      generateSecp256k1Key(), parseIpAddress($getPrimaryIPAddr()), Port(60600)
+      generateSecp256k1Key(), getPrimaryIPAddr(), Port(60600)
     )
     node2 = newTestWakuNode(
-      generateSecp256k1Key(), parseIpAddress($getPrimaryIPAddr()), Port(60602)
+      generateSecp256k1Key(), getPrimaryIPAddr(), Port(60602)
     )
     node3 = newTestWakuNode(
-      generateSecp256k1Key(), parseIpAddress($getPrimaryIPAddr()), Port(60604)
+      generateSecp256k1Key(), getPrimaryIPAddr(), Port(60604)
     )
 
     await allFutures(node1.start(), node2.start(), node3.start())

From 16bdcb056e6e09db5d226c8fa509a425cf9bb312 Mon Sep 17 00:00:00 2001
From: Ivan FB <128452529+Ivansete-status@users.noreply.github.com>
Date: Thu, 24 Oct 2024 18:01:51 +0200
Subject: [PATCH 15/23] Update waku/discovery/waku_discv5.nim

Co-authored-by: gabrielmer <101006718+gabrielmer@users.noreply.github.com>
---
 waku/discovery/waku_discv5.nim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/waku/discovery/waku_discv5.nim b/waku/discovery/waku_discv5.nim
index e5665a1678..9e93b11c45 100644
--- a/waku/discovery/waku_discv5.nim
+++ b/waku/discovery/waku_discv5.nim
@@ -117,7 +117,7 @@ proc updateAnnouncedMultiAddress*(
     return err("failed to update multiaddress in ENR: " & $error)
 
   debug "ENR updated successfully with new multiaddress",
-    enr = wd.protocol.localNode.record.toUri(), record = $(wd.protocol.localNode.record)
+    enrUri = wd.protocol.localNode.record.toUri(), enr = $(wd.protocol.localNode.record)
 
   return ok()
 

From 28f317b026617242b0fbbb98c21934773d88c999 Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Fri, 25 Oct 2024 15:08:47 +0200
Subject: [PATCH 16/23] avoid default relay in setupNode proc

---
 tests/factory/test_node_factory.nim | 8 ++++----
 waku/factory/node_factory.nim       | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/tests/factory/test_node_factory.nim b/tests/factory/test_node_factory.nim
index 0b68338e23..c88050b434 100644
--- a/tests/factory/test_node_factory.nim
+++ b/tests/factory/test_node_factory.nim
@@ -8,7 +8,7 @@ suite "Node Factory":
   test "Set up a node based on default configurations":
     let conf = defaultTestWakuNodeConf()
 
-    let node = setupNode(conf).valueOr:
+    let node = setupNode(conf, relay = Relay.new()).valueOr:
       raiseAssert error
 
     check:
@@ -23,7 +23,7 @@ suite "Node Factory":
     var conf = defaultTestWakuNodeConf()
     conf.store = true
 
-    let node = setupNode(conf).valueOr:
+    let node = setupNode(conf, relay = Relay.new()).valueOr:
       raiseAssert error
 
     check:
@@ -35,7 +35,7 @@ test "Set up a node with Filter enabled":
   var conf = defaultTestWakuNodeConf()
   conf.filter = true
 
-  let node = setupNode(conf).valueOr:
+  let node = setupNode(conf, relay = Relay.new()).valueOr:
     raiseAssert error
 
   check:
@@ -45,7 +45,7 @@ test "Set up a node with Filter enabled":
 test "Start a node based on default configurations":
   let conf = defaultTestWakuNodeConf()
 
-  let node = setupNode(conf).valueOr:
+  let node = setupNode(conf, relay = Relay.new()).valueOr:
     raiseAssert error
 
   assert not node.isNil(), "Node can't be nil"
diff --git a/waku/factory/node_factory.nim b/waku/factory/node_factory.nim
index 5968f3ace3..d4ac364f31 100644
--- a/waku/factory/node_factory.nim
+++ b/waku/factory/node_factory.nim
@@ -435,9 +435,7 @@ proc startNode*(
   return ok()
 
 proc setupNode*(
-    conf: WakuNodeConf,
-    rng: ref HmacDrbgContext = crypto.newRng(),
-    relay: Relay = Relay.new(),
+    conf: WakuNodeConf, rng: ref HmacDrbgContext = crypto.newRng(), relay: Relay
 ): Result[WakuNode, string] =
   # Use provided key only if corresponding rng is also provided
   let key =

From 50905f01337e95b693153821ee35b7a20d5f9633 Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Fri, 25 Oct 2024 15:09:08 +0200
Subject: [PATCH 17/23] remove leftover unneeded code

---
 waku/factory/waku.nim | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/waku/factory/waku.nim b/waku/factory/waku.nim
index 7ef2789b60..4a4c76c834 100644
--- a/waku/factory/waku.nim
+++ b/waku/factory/waku.nim
@@ -137,9 +137,6 @@ proc setupSwitchServices(
   else:
     waku.node.switch.services = @[Service(autonatService)]
 
-    if conf.isRelayClient:
-      let relay = RelayClient.new()
-
 ## Initialisation
 
 proc new*(T: type Waku, confCopy: var WakuNodeConf): Result[Waku, string] =

From 49771f64eb78909bf21e59cd93b7e0788026045f Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Fri, 25 Oct 2024 15:34:24 +0200
Subject: [PATCH 18/23] fix nph format issue

---
 tests/wakunode_rest/test_rest_admin.nim | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/tests/wakunode_rest/test_rest_admin.nim b/tests/wakunode_rest/test_rest_admin.nim
index 5a44f16988..51d1133957 100644
--- a/tests/wakunode_rest/test_rest_admin.nim
+++ b/tests/wakunode_rest/test_rest_admin.nim
@@ -38,15 +38,9 @@ suite "Waku v2 Rest API - Admin":
   var client {.threadvar.}: RestClientRef
 
   asyncSetup:
-    node1 = newTestWakuNode(
-      generateSecp256k1Key(), getPrimaryIPAddr(), Port(60600)
-    )
-    node2 = newTestWakuNode(
-      generateSecp256k1Key(), getPrimaryIPAddr(), Port(60602)
-    )
-    node3 = newTestWakuNode(
-      generateSecp256k1Key(), getPrimaryIPAddr(), Port(60604)
-    )
+    node1 = newTestWakuNode(generateSecp256k1Key(), getPrimaryIPAddr(), Port(60600))
+    node2 = newTestWakuNode(generateSecp256k1Key(), getPrimaryIPAddr(), Port(60602))
+    node3 = newTestWakuNode(generateSecp256k1Key(), getPrimaryIPAddr(), Port(60604))
 
     await allFutures(node1.start(), node2.start(), node3.start())
     await allFutures(

From 7af2425398da10e543a4cfadd06fc554c483f4c7 Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Fri, 25 Oct 2024 15:46:12 +0200
Subject: [PATCH 19/23] missing import in test_node_factory

---
 tests/factory/test_node_factory.nim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/factory/test_node_factory.nim b/tests/factory/test_node_factory.nim
index c88050b434..bc3dc0f80d 100644
--- a/tests/factory/test_node_factory.nim
+++ b/tests/factory/test_node_factory.nim
@@ -1,6 +1,6 @@
 {.used.}
 
-import testutils/unittests, chronos
+import testutils/unittests, chronos, libp2p/protocols/connectivity/relay/relay
 
 import ../testlib/wakunode, waku/factory/node_factory, waku/waku_node
 

From 3f784cc8fbb1ced74239001cf97e234823eb3b09 Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Sat, 26 Oct 2024 01:36:04 +0200
Subject: [PATCH 20/23] waku_node: better import of autonat_service

---
 waku/node/waku_node.nim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/waku/node/waku_node.nim b/waku/node/waku_node.nim
index a9afa86723..f45db8d1da 100644
--- a/waku/node/waku_node.nim
+++ b/waku/node/waku_node.nim
@@ -51,7 +51,7 @@ import
   ./config,
   ./peer_manager,
   ../common/rate_limit/setting,
-  waku/discovery/autonat_service
+  ../discovery/autonat_service
 
 declarePublicCounter waku_node_messages, "number of messages received", ["type"]
 declarePublicHistogram waku_histogram_message_size,

From d69b6268705519be551469d1159be962acb59f6d Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Sat, 26 Oct 2024 01:37:27 +0200
Subject: [PATCH 21/23] waku: avoid compilation issue

---
 waku/factory/waku.nim | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/waku/factory/waku.nim b/waku/factory/waku.nim
index 4a4c76c834..062c9d4cd4 100644
--- a/waku/factory/waku.nim
+++ b/waku/factory/waku.nim
@@ -139,6 +139,11 @@ proc setupSwitchServices(
 
 ## Initialisation
 
+proc newCircuitRelay(isRelayClient: bool): Relay =
+  if isRelayClient:
+    return RelayClient.new()
+  return Relay.new()
+
 proc new*(T: type Waku, confCopy: var WakuNodeConf): Result[Waku, string] =
   let rng = crypto.newRng()
 
@@ -220,9 +225,7 @@ proc new*(T: type Waku, confCopy: var WakuNodeConf): Result[Waku, string] =
       "Retrieving dynamic bootstrap nodes failed: " & dynamicBootstrapNodesRes.error
     )
 
-  var relay = Relay.new()
-  if confCopy.isRelayClient:
-    relay = RelayClient.new()
+  var relay = newCircuitRelay(confCopy.isRelayClient)
 
   let nodeRes = setupNode(confCopy, rng, relay)
   if nodeRes.isErr():

From 16cf26be21ae8b7a2a350d3eaaf17bb1b95016a8 Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Sat, 26 Oct 2024 01:37:53 +0200
Subject: [PATCH 22/23] waku.nim: protect against possible crash if discv5 is
 not enabled

---
 waku/factory/waku.nim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/waku/factory/waku.nim b/waku/factory/waku.nim
index 062c9d4cd4..48d75cfd15 100644
--- a/waku/factory/waku.nim
+++ b/waku/factory/waku.nim
@@ -121,8 +121,9 @@ proc setupSwitchServices(
     debug "waku node announced addresses updated",
       announcedAddresses = waku.node.announcedAddresses
 
-    waku.wakuDiscv5.updateAnnouncedMultiAddress(addresses).isOkOr:
-      error "failed to update announced multiaddress", error = $error
+    if not isNil(waku.wakuDiscv5):
+      waku.wakuDiscv5.updateAnnouncedMultiAddress(addresses).isOkOr:
+        error "failed to update announced multiaddress", error = $error
 
   let autonatService = getAutonatService(rng)
   if conf.isRelayClient:

From eae4e8b66c4b2ffb46ded30436e94da9397acd86 Mon Sep 17 00:00:00 2001
From: Ivan Folgueira Bande <ivansete@status.im>
Date: Sat, 26 Oct 2024 09:52:46 +0200
Subject: [PATCH 23/23] apply Zoltan suggestion to simplify tests

---
 tests/test_peer_manager.nim | 18 ++++--------------
 tests/test_wakunode.nim     |  4 ++--
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/tests/test_peer_manager.nim b/tests/test_peer_manager.nim
index 4d4db24304..bcc3821cab 100644
--- a/tests/test_peer_manager.nim
+++ b/tests/test_peer_manager.nim
@@ -269,14 +269,9 @@ procSuite "Peer Manager":
       database = SqliteDatabase.new(":memory:")[]
       storage = WakuPeerStorage.new(database)[]
       node1 = newTestWakuNode(
-        generateSecp256k1Key(),
-        ValidIpAddress.init($getPrimaryIPAddr()),
-        Port(44048),
-        peerStorage = storage,
-      )
-      node2 = newTestWakuNode(
-        generateSecp256k1Key(), ValidIpAddress.init($getPrimaryIPAddr()), Port(34023)
+        generateSecp256k1Key(), getPrimaryIPAddr(), Port(44048), peerStorage = storage
       )
+      node2 = newTestWakuNode(generateSecp256k1Key(), getPrimaryIPAddr(), Port(34023))
 
     node1.mountMetadata(0).expect("Mounted Waku Metadata")
     node2.mountMetadata(0).expect("Mounted Waku Metadata")
@@ -344,14 +339,9 @@ procSuite "Peer Manager":
       database = SqliteDatabase.new(":memory:")[]
       storage = WakuPeerStorage.new(database)[]
       node1 = newTestWakuNode(
-        generateSecp256k1Key(),
-        ValidIpAddress.init($getPrimaryIPAddr()),
-        Port(44048),
-        peerStorage = storage,
-      )
-      node2 = newTestWakuNode(
-        generateSecp256k1Key(), ValidIpAddress.init($getPrimaryIPAddr()), Port(34023)
+        generateSecp256k1Key(), getPrimaryIPAddr(), Port(44048), peerStorage = storage
       )
+      node2 = newTestWakuNode(generateSecp256k1Key(), getPrimaryIPAddr(), Port(34023))
 
     node1.mountMetadata(0).expect("Mounted Waku Metadata")
     node2.mountMetadata(0).expect("Mounted Waku Metadata")
diff --git a/tests/test_wakunode.nim b/tests/test_wakunode.nim
index caee743b6e..dbb2d5d8db 100644
--- a/tests/test_wakunode.nim
+++ b/tests/test_wakunode.nim
@@ -169,7 +169,7 @@ suite "WakuNode":
       nodeKey = generateSecp256k1Key()
       bindIp = parseIpAddress("0.0.0.0")
       bindPort = Port(61006)
-      extIp = some(parseIpAddress($getPrimaryIPAddr()))
+      extIp = some(getPrimaryIPAddr())
       extPort = some(Port(61008))
       node = newTestWakuNode(nodeKey, bindIp, bindPort, extIp, extPort)
 
@@ -205,7 +205,7 @@ suite "WakuNode":
       nodeKey = generateSecp256k1Key()
       bindIp = parseIpAddress("0.0.0.0")
       bindPort = Port(61010)
-      extIp = some(parseIpAddress($getPrimaryIPAddr()))
+      extIp = some(getPrimaryIPAddr())
       extPort = some(Port(61012))
       domainName = "example.com"
       expectedDns4Addr =