Merge branch 'master' into release/v0.37

Author: darshankabariya

.gitmodules

@@ -184,7 +184,3 @@
 	url = https://github.com/waku-org/waku-rlnv2-contract.git
 	ignore = untracked
 	branch = master
-[submodule "vendor/mix"]
-	path = vendor/mix
-	url = https://github.com/vacp2p/mix/
-	branch = main

apps/chat2/chat2.nim

@@ -317,27 +317,19 @@ proc processInput(rfd: AsyncFD, rng: ref HmacDrbgContext) {.async.} =
   if conf.logLevel != LogLevel.NONE:
     setLogLevel(conf.logLevel)
 
-  let natRes = setupNat(
+  let (extIp, extTcpPort, extUdpPort) = setupNat(
     conf.nat,
     clientId,
     Port(uint16(conf.tcpPort) + conf.portsShift),
     Port(uint16(conf.udpPort) + conf.portsShift),
-  )
-
-  if natRes.isErr():
-    raise newException(ValueError, "setupNat error " & natRes.error)
-
-  let (extIp, extTcpPort, extUdpPort) = natRes.get()
+  ).valueOr:
+    raise newException(ValueError, "setupNat error " & error)
 
   var enrBuilder = EnrBuilder.init(nodeKey)
 
-  let recordRes = enrBuilder.build()
-  let record =
-    if recordRes.isErr():
-      error "failed to create enr record", error = recordRes.error
-      quit(QuitFailure)
-    else:
-      recordRes.get()
+  let record = enrBuilder.build().valueOr:
+    error "failed to create enr record", error = error
+    quit(QuitFailure)
 
   let node = block:
     var builder = WakuNodeBuilder.init()

apps/chat2bridge/chat2bridge.nim

@@ -126,23 +126,20 @@ proc toMatterbridge(
 
   assert chat2Msg.isOk
 
-  let postRes = cmb.mbClient.postMessage(
-    text = string.fromBytes(chat2Msg[].payload), username = chat2Msg[].nick
-  )
-
-  if postRes.isErr() or (postRes[] == false):
+  if not cmb.mbClient
+  .postMessage(text = string.fromBytes(chat2Msg[].payload), username = chat2Msg[].nick)
+  .containsValue(true):
     chat2_mb_dropped.inc(labelValues = ["duplicate"])
     error "Matterbridge host unreachable. Dropping message."
 
 proc pollMatterbridge(cmb: Chat2MatterBridge, handler: MbMessageHandler) {.async.} =
   while cmb.running:
-    if (let getRes = cmb.mbClient.getMessages(); getRes.isOk()):
-      for jsonNode in getRes[]:
-        await handler(jsonNode)
-    else:
+    let msg = cmb.mbClient.getMessages().valueOr:
       error "Matterbridge host unreachable. Sleeping before retrying."
       await sleepAsync(chronos.seconds(10))
-
+      continue
+    for jsonNode in msg:
+      await handler(jsonNode)
     await sleepAsync(cmb.pollPeriod)
 
 ##############
@@ -243,7 +240,7 @@ proc stop*(cmb: Chat2MatterBridge) {.async: (raises: [Exception]).} =
 {.pop.}
   # @TODO confutils.nim(775, 17) Error: can raise an unlisted exception: ref IOError
 when isMainModule:
-  import waku/common/utils/nat, waku/waku_api/message_cache
+  import waku/common/utils/nat, waku/rest_api/message_cache
 
   let
     rng = newRng()
@@ -252,25 +249,21 @@ when isMainModule:
   if conf.logLevel != LogLevel.NONE:
     setLogLevel(conf.logLevel)
 
-  let natRes = setupNat(
+  let (nodev2ExtIp, nodev2ExtPort, _) = setupNat(
     conf.nat,
     clientId,
     Port(uint16(conf.libp2pTcpPort) + conf.portsShift),
     Port(uint16(conf.udpPort) + conf.portsShift),
-  )
-  if natRes.isErr():
-    error "Error in setupNat", error = natRes.error
-
-  # Load address configuration
-  let
-    (nodev2ExtIp, nodev2ExtPort, _) = natRes.get()
-    ## The following heuristic assumes that, in absence of manual
-    ## config, the external port is the same as the bind port.
-    extPort =
-      if nodev2ExtIp.isSome() and nodev2ExtPort.isNone():
-        some(Port(uint16(conf.libp2pTcpPort) + conf.portsShift))
-      else:
-        nodev2ExtPort
+  ).valueOr:
+    raise newException(ValueError, "setupNat error " & error)
+
+  ## The following heuristic assumes that, in absence of manual
+  ## config, the external port is the same as the bind port.
+  let extPort =
+    if nodev2ExtIp.isSome() and nodev2ExtPort.isNone():
+      some(Port(uint16(conf.libp2pTcpPort) + conf.portsShift))
+    else:
+      nodev2ExtPort
 
   let bridge = Chat2Matterbridge.new(
     mbHostUri = "http://" & $initTAddress(conf.mbHostAddress, Port(conf.mbHostPort)),

apps/chat2mix/chat2mix.nim

@@ -29,8 +29,8 @@ import
     peerid, # Implement how peers interact
     protobuf/minprotobuf, # message serialisation/deserialisation from and to protobufs
     nameresolving/dnsresolver,
+    protocols/mix/curve25519,
   ] # define DNS resolution
-import mix/curve25519
 import
   waku/[
     waku_core,
@@ -175,18 +175,16 @@ proc startMetricsServer(
 ): Result[MetricsHttpServerRef, string] =
   info "Starting metrics HTTP server", serverIp = $serverIp, serverPort = $serverPort
 
-  let metricsServerRes = MetricsHttpServerRef.new($serverIp, serverPort)
-  if metricsServerRes.isErr():
-    return err("metrics HTTP server start failed: " & $metricsServerRes.error)
+  let server = MetricsHttpServerRef.new($serverIp, serverPort).valueOr:
+    return err("metrics HTTP server start failed: " & $error)
 
-  let server = metricsServerRes.value
   try:
     waitFor server.start()
   except CatchableError:
     return err("metrics HTTP server start failed: " & getCurrentExceptionMsg())
 
   info "Metrics HTTP server started", serverIp = $serverIp, serverPort = $serverPort
-  ok(metricsServerRes.value)
+  ok(server)
 
 proc publish(c: Chat, line: string) {.async.} =
   # First create a Chat2Message protobuf with this line of text
@@ -333,57 +331,56 @@ proc maintainSubscription(
   const maxFailedServiceNodeSwitches = 10
   var noFailedSubscribes = 0
   var noFailedServiceNodeSwitches = 0
+  const RetryWaitMs = 2.seconds # Quick retry interval
+  const SubscriptionMaintenanceMs = 30.seconds # Subscription maintenance interval
   while true:
     info "maintaining subscription at", peer = constructMultiaddrStr(actualFilterPeer)
     # First use filter-ping to check if we have an active subscription
-    let pingRes = await wakuNode.wakuFilterClient.ping(actualFilterPeer)
-    if pingRes.isErr():
-      # No subscription found. Let's subscribe.
-      error "ping failed.", err = pingRes.error
-      trace "no subscription found. Sending subscribe request"
+    let pingErr = (await wakuNode.wakuFilterClient.ping(actualFilterPeer)).errorOr:
+      await sleepAsync(SubscriptionMaintenanceMs)
+      info "subscription is live."
+      continue
 
-      let subscribeRes = await wakuNode.filterSubscribe(
+    # No subscription found. Let's subscribe.
+    error "ping failed.", error = pingErr
+    trace "no subscription found. Sending subscribe request"
+
+    let subscribeErr = (
+      await wakuNode.filterSubscribe(
         some(filterPubsubTopic), filterContentTopic, actualFilterPeer
       )
+    ).errorOr:
+      await sleepAsync(SubscriptionMaintenanceMs)
+      if noFailedSubscribes > 0:
+        noFailedSubscribes -= 1
+      notice "subscribe request successful."
+      continue
 
-      if subscribeRes.isErr():
-        noFailedSubscribes += 1
-        error "Subscribe request failed.",
-          err = subscribeRes.error,
-          peer = actualFilterPeer,
-          failCount = noFailedSubscribes
-
-        # TODO: disconnet from failed actualFilterPeer
-        # asyncSpawn(wakuNode.peerManager.switch.disconnect(p))
-        # wakunode.peerManager.peerStore.delete(actualFilterPeer)
-
-        if noFailedSubscribes < maxFailedSubscribes:
-          await sleepAsync(2000) # Wait a bit before retrying
-          continue
-        elif not preventPeerSwitch:
-          let peerOpt = selectRandomServicePeer(
-            wakuNode.peerManager, some(actualFilterPeer), WakuFilterSubscribeCodec
-          )
-          peerOpt.isOkOr:
-            error "Failed to find new service peer. Exiting."
-            noFailedServiceNodeSwitches += 1
-            break
-
-          actualFilterPeer = peerOpt.get()
-          info "Found new peer for codec",
-            codec = filterPubsubTopic, peer = constructMultiaddrStr(actualFilterPeer)
-
-          noFailedSubscribes = 0
-          continue # try again with new peer without delay
-      else:
-        if noFailedSubscribes > 0:
-          noFailedSubscribes -= 1
-
-        notice "subscribe request successful."
+    noFailedSubscribes += 1
+    error "Subscribe request failed.",
+      error = subscribeErr, peer = actualFilterPeer, failCount = noFailedSubscribes
+
+    # TODO: disconnet from failed actualFilterPeer
+    # asyncSpawn(wakuNode.peerManager.switch.disconnect(p))
+    # wakunode.peerManager.peerStore.delete(actualFilterPeer)
+
+    if noFailedSubscribes < maxFailedSubscribes:
+      await sleepAsync(RetryWaitMs) # Wait a bit before retrying
+    elif not preventPeerSwitch:
+      # try again with new peer without delay
+      let actualFilterPeer = selectRandomServicePeer(
+        wakuNode.peerManager, some(actualFilterPeer), WakuFilterSubscribeCodec
+      ).valueOr:
+        error "Failed to find new service peer. Exiting."
+        noFailedServiceNodeSwitches += 1
+        break
+
+      info "Found new peer for codec",
+        codec = filterPubsubTopic, peer = constructMultiaddrStr(actualFilterPeer)
+
+      noFailedSubscribes = 0
     else:
-      info "subscription is live."
-
-    await sleepAsync(30000) # Subscription maintenance interval
+      await sleepAsync(SubscriptionMaintenanceMs)
 
 {.pop.}
   # @TODO confutils.nim(775, 17) Error: can raise an unlisted exception: ref IOError
@@ -401,17 +398,13 @@ proc processInput(rfd: AsyncFD, rng: ref HmacDrbgContext) {.async.} =
   if conf.logLevel != LogLevel.NONE:
     setLogLevel(conf.logLevel)
 
-  let natRes = setupNat(
+  let (extIp, extTcpPort, extUdpPort) = setupNat(
     conf.nat,
     clientId,
     Port(uint16(conf.tcpPort) + conf.portsShift),
     Port(uint16(conf.udpPort) + conf.portsShift),
-  )
-
-  if natRes.isErr():
-    raise newException(ValueError, "setupNat error " & natRes.error)
-
-  let (extIp, extTcpPort, extUdpPort) = natRes.get()
+  ).valueOr:
+    raise newException(ValueError, "setupNat error " & error)
 
   var enrBuilder = EnrBuilder.init(nodeKey)
 
@@ -421,13 +414,9 @@ proc processInput(rfd: AsyncFD, rng: ref HmacDrbgContext) {.async.} =
     error "failed to add sharded topics to ENR", error = error
     quit(QuitFailure)
 
-  let recordRes = enrBuilder.build()
-  let record =
-    if recordRes.isErr():
-      error "failed to create enr record", error = recordRes.error
-      quit(QuitFailure)
-    else:
-      recordRes.get()
+  let record = enrBuilder.build().valueOr:
+    error "failed to create enr record", error = error
+    quit(QuitFailure)
 
   let node = block:
     var builder = WakuNodeBuilder.init()

apps/liteprotocoltester/diagnose_connections.nim

@@ -14,7 +14,7 @@ import
   libp2p/wire
 
 import
-  ../../tools/confutils/cli_args,
+  tools/confutils/cli_args,
   waku/[
     node/peer_manager,
     waku_lightpush/common,
@@ -59,7 +59,4 @@ proc logSelfPeers*(pm: PeerManager) =
 {allPeers(pm)}
 *------------------------------------------------------------------------------------------*""".fmt()
 
-  if printable.isErr():
-    echo "Error while printing statistics: " & printable.error().msg
-  else:
-    echo printable.get()
+  echo printable.valueOr("Error while printing statistics: " & error.msg)

apps/liteprotocoltester/liteprotocoltester.nim

@@ -11,7 +11,7 @@ import
   confutils
 
 import
-  ../../tools/confutils/cli_args,
+  tools/confutils/cli_args,
   waku/[
     common/enr,
     common/logging,
@@ -49,13 +49,10 @@ when isMainModule:
 
   const versionString = "version / git commit hash: " & waku_factory.git_version
 
-  let confRes = LiteProtocolTesterConf.load(version = versionString)
-  if confRes.isErr():
-    error "failure while loading the configuration", error = confRes.error
+  let conf = LiteProtocolTesterConf.load(version = versionString).valueOr:
+    error "failure while loading the configuration", error = error
     quit(QuitFailure)
 
-  var conf = confRes.get()
-
   ## Logging setup
   logging.setupLog(conf.logLevel, conf.logFormat)
 
@@ -187,7 +184,7 @@ when isMainModule:
         error "Service node not found in time via PX"
         quit(QuitFailure)
 
-      if futForServiceNode.read().isErr():
+      futForServiceNode.read().isOkOr:
         error "Service node for test not found via PX"
         quit(QuitFailure)
 

apps/liteprotocoltester/publisher.nim

@@ -89,10 +89,7 @@ proc reportSentMessages() =
 |{numMessagesToSend+failedToSendCount:>11} |{messagesSent:>11} |{failedToSendCount:>11} |
 *----------------------------------------*""".fmt()
 
-  if report.isErr:
-    echo "Error while printing statistics"
-  else:
-    echo report.get()
+  echo report.valueOr("Error while printing statistics")
 
   echo "*--------------------------------------------------------------------------------------------------*"
   echo "|  Failure cause                                                                         |  count   |"