Merge branch 'master' into release/v0.37

Author: darshankabariya

.github/workflows/ci.yml

@@ -54,9 +54,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, macos-13]
+        os: [ubuntu-22.04, macos-15]
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
+    timeout-minutes: 45
 
     name: build-${{ matrix.os }}
     steps:
@@ -92,9 +92,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, macos-13]
+        os: [ubuntu-22.04, macos-15]
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
+    timeout-minutes: 45
 
     name: test-${{ matrix.os }}
     steps:

.github/workflows/pre-release.yml

@@ -34,10 +34,10 @@ jobs:
     needs: tag-name
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-13]
+        os: [ubuntu-22.04, macos-15]
         arch: [amd64]
         include:
-        - os: macos-13
+        - os: macos-15
           arch: arm64
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/release-assets.yml

@@ -14,10 +14,10 @@ jobs:
   build-and-upload:
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-13]
+        os: [ubuntu-22.04, macos-15]
         arch: [amd64]
         include:
-        - os: macos-13
+        - os: macos-15
           arch: arm64
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60

Makefile

@@ -177,7 +177,7 @@ nimbus-build-system-nimble-dir:
 .PHONY: librln
 
 LIBRLN_BUILDDIR := $(CURDIR)/vendor/zerokit
-LIBRLN_VERSION := v0.7.0
+LIBRLN_VERSION := v0.8.0
 
 ifeq ($(detected_OS),Windows)
 LIBRLN_FILE := rln.lib

apps/benchmarks/benchmarks.nim

@@ -24,7 +24,7 @@ proc benchmark(
     except Exception, CatchableError:
       assert false, "exception raised: " & getCurrentExceptionMsg()
 
-    debug "registration finished",
+    info "registration finished",
       iter = i, elapsed_ms = (getTime() - start_time).inMilliseconds
 
   discard await manager.updateRoots()
@@ -33,7 +33,7 @@ proc benchmark(
     quit(QuitFailure)
 
   let epoch = default(Epoch)
-  debug "epoch in bytes", epochHex = epoch.inHex()
+  info "epoch in bytes", epochHex = epoch.inHex()
   let data: seq[byte] = newSeq[byte](1024)
 
   var proofGenTimes: seq[times.Duration] = @[]
@@ -50,7 +50,7 @@ proc benchmark(
     let ok = manager.verifyProof(data, proof).valueOr:
       raiseAssert $error
     proofVerTimes.add(getTime() - verify_time)
-    debug "iteration finished",
+    info "iteration finished",
       iter = i, elapsed_ms = (getTime() - start_time).inMilliseconds
 
   echo "Proof generation times: ", sum(proofGenTimes) div len(proofGenTimes)

apps/chat2/chat2.nim

@@ -194,9 +194,9 @@ proc publish(c: Chat, line: string) =
     # for future version when we support more than one rln protected content topic,
     # we should check the message content topic as well
     if c.node.wakuRlnRelay.appendRLNProof(message, float64(time)).isErr():
-      debug "could not append rate limit proof to the message"
+      info "could not append rate limit proof to the message"
     else:
-      debug "rate limit proof is appended to the message"
+      info "rate limit proof is appended to the message"
       let proof = RateLimitProof.init(message.proof).valueOr:
         error "could not decode the RLN proof"
         return
@@ -406,7 +406,7 @@ proc processInput(rfd: AsyncFD, rng: ref HmacDrbgContext) {.async.} =
       )
   elif conf.dnsDiscoveryUrl != "":
     # No pre-selected fleet. Discover nodes via DNS using user config
-    debug "Discovering nodes using Waku DNS discovery", url = conf.dnsDiscoveryUrl
+    info "Discovering nodes using Waku DNS discovery", url = conf.dnsDiscoveryUrl
     dnsDiscoveryUrl = some(conf.dnsDiscoveryUrl)
 
   var discoveredNodes: seq[RemotePeerInfo]
@@ -528,7 +528,7 @@ proc processInput(rfd: AsyncFD, rng: ref HmacDrbgContext) {.async.} =
       info "WakuRLNRelay is enabled"
 
       proc spamHandler(wakuMessage: WakuMessage) {.gcsafe, closure.} =
-        debug "spam handler is called"
+        info "spam handler is called"
         let chatLineResult = getChatLine(wakuMessage.payload)
         echo "spam message is found and discarded : " & chatLineResult
         chat.prompt = false

apps/chat2bridge/chat2bridge.nim

@@ -197,7 +197,7 @@ proc start*(cmb: Chat2MatterBridge) {.async.} =
 
   cmb.running = true
 
-  debug "Start polling Matterbridge"
+  info "Start polling Matterbridge"
 
   # Start Matterbridge polling (@TODO: use streaming interface)
   proc mbHandler(jsonNode: JsonNode) {.async.} =
@@ -207,7 +207,7 @@ proc start*(cmb: Chat2MatterBridge) {.async.} =
   asyncSpawn cmb.pollMatterbridge(mbHandler)
 
   # Start Waku v2 node
-  debug "Start listening on Waku v2"
+  info "Start listening on Waku v2"
   await cmb.nodev2.start()
 
   # Always mount relay for bridge

apps/chat2mix/chat2mix.nim

@@ -501,7 +501,7 @@ proc processInput(rfd: AsyncFD, rng: ref HmacDrbgContext) {.async.} =
       )
   elif conf.dnsDiscoveryUrl != "":
     # No pre-selected fleet. Discover nodes via DNS using user config
-    debug "Discovering nodes using Waku DNS discovery", url = conf.dnsDiscoveryUrl
+    info "Discovering nodes using Waku DNS discovery", url = conf.dnsDiscoveryUrl
     dnsDiscoveryUrl = some(conf.dnsDiscoveryUrl)
 
   var discoveredNodes: seq[RemotePeerInfo]

apps/liteprotocoltester/liteprotocoltester.nim

@@ -130,7 +130,7 @@ when isMainModule:
     error "Starting waku failed", error = error
     quit(QuitFailure)
 
-  debug "Setting up shutdown hooks"
+  info "Setting up shutdown hooks"
 
   proc asyncStopper(waku: Waku) {.async: (raises: [Exception]).} =
     await waku.stop()

apps/liteprotocoltester/service_peer_management.nim

@@ -73,7 +73,7 @@ proc selectRandomCapablePeer*(
     let rndPeerIndex = rand(0 .. supportivePeers.len - 1)
     let randomPeer = supportivePeers[rndPeerIndex]
 
-    debug "Dialing random peer",
+    info "Dialing random peer",
       idx = $rndPeerIndex, peer = constructMultiaddrStr(randomPeer)
 
     supportivePeers.delete(rndPeerIndex .. rndPeerIndex)
@@ -82,12 +82,12 @@ proc selectRandomCapablePeer*(
     if (await connOpt.withTimeout(10.seconds)):
       if connOpt.value().isSome():
         found = some(randomPeer)
-        debug "Dialing successful",
+        info "Dialing successful",
           peer = constructMultiaddrStr(randomPeer), codec = codec
       else:
-        debug "Dialing failed", peer = constructMultiaddrStr(randomPeer), codec = codec
+        info "Dialing failed", peer = constructMultiaddrStr(randomPeer), codec = codec
     else:
-      debug "Timeout dialing service peer",
+      info "Timeout dialing service peer",
         peer = constructMultiaddrStr(randomPeer), codec = codec
 
   return found
@@ -105,8 +105,8 @@ proc tryCallAllPxPeers*(
   var supportivePeers = pm.switch.peerStore.getPeersByCapability(capability)
 
   lpt_px_peers.set(supportivePeers.len)
-  debug "Found supportive peers count", count = supportivePeers.len()
-  debug "Found supportive peers", supportivePeers = $supportivePeers
+  info "Found supportive peers count", count = supportivePeers.len()
+  info "Found supportive peers", supportivePeers = $supportivePeers
   if supportivePeers.len == 0:
     return none(seq[RemotePeerInfo])
 
@@ -116,7 +116,7 @@ proc tryCallAllPxPeers*(
     let rndPeerIndex = rand(0 .. supportivePeers.len - 1)
     let randomPeer = supportivePeers[rndPeerIndex]
 
-    debug "Dialing random peer",
+    info "Dialing random peer",
       idx = $rndPeerIndex, peer = constructMultiaddrStr(randomPeer)
 
     supportivePeers.delete(rndPeerIndex, rndPeerIndex)