Merge branch 'master' into chore-merge-release-v0.33-to-master

waku-org · Sep 30, 2024 · eebce3c · eebce3c
2 parents 73c1d60 + 8b0884c
commit eebce3c
Show file tree

Hide file tree

Showing 25 changed files with 3,879 additions and 3,374 deletions.
diff --git a/.github/workflows/container-image.yml b/.github/workflows/container-image.yml
@@ -66,7 +66,7 @@ jobs:
         if: ${{ steps.secrets.outcome == 'success' }}
         run: |
 
-          make -j${NPROC} V=1 QUICK_AND_DIRTY_COMPILER=1 NIMFLAGS="-d:disableMarchNative -d:postgres" wakunode2
+          make -j${NPROC} V=1 QUICK_AND_DIRTY_COMPILER=1 NIMFLAGS="-d:disableMarchNative -d:postgres -d:chronicles_colors:none" wakunode2
 
           SHORT_REF=$(git rev-parse --short HEAD)
 

diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -123,7 +123,7 @@ jobs:
           ref: master
 
       - name: download artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
 
       - name: prep variables
         id: vars

diff --git a/.github/workflows/release-assets.yml b/.github/workflows/release-assets.yml
@@ -58,7 +58,7 @@ jobs:
           tar -cvzf ${{steps.vars.outputs.nwaku}} ./build/
 
       - name: Upload asset
-        uses: actions/upload-artifact@v2.2.3
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: ${{steps.vars.outputs.nwaku}}
           path: ${{steps.vars.outputs.nwaku}}

diff --git a/apps/liteprotocoltester/diagnose_connections.nim b/apps/liteprotocoltester/diagnose_connections.nim
@@ -37,9 +37,9 @@ logScope:
 proc logSelfPeersLoop(pm: PeerManager, interval: Duration) {.async.} =
   trace "Starting logSelfPeersLoop diagnosis loop"
   while true:
-    let selfLighpushPeers = pm.peerStore.getPeersByProtocol(WakuLightPushCodec)
-    let selfRelayPeers = pm.peerStore.getPeersByProtocol(WakuRelayCodec)
-    let selfFilterPeers = pm.peerStore.getPeersByProtocol(WakuFilterSubscribeCodec)
+    let selfLighpushPeers = pm.wakuPeerStore.getPeersByProtocol(WakuLightPushCodec)
+    let selfRelayPeers = pm.wakuPeerStore.getPeersByProtocol(WakuRelayCodec)
+    let selfFilterPeers = pm.wakuPeerStore.getPeersByProtocol(WakuFilterSubscribeCodec)
 
     let printable = catch:
       """*------------------------------------------------------------------------------------------*

diff --git a/apps/wakucanary/wakucanary.nim b/apps/wakucanary/wakucanary.nim
@@ -255,7 +255,7 @@ proc main(rng: ref HmacDrbgContext): Future[int] {.async.} =
     return 1
 
   let lp2pPeerStore = node.switch.peerStore
-  let conStatus = node.peerManager.peerStore[ConnectionBook][peer.peerId]
+  let conStatus = node.peerManager.wakuPeerStore[ConnectionBook][peer.peerId]
 
   if conf.ping:
     discard await pingFut

diff --git a/examples/publisher.nim b/examples/publisher.nim
@@ -95,8 +95,9 @@ proc setupAndPublish(rng: ref HmacDrbgContext) {.async.} =
 
   # wait for a minimum of peers to be connected, otherwise messages wont be gossiped
   while true:
-    let numConnectedPeers =
-      node.peerManager.peerStore[ConnectionBook].book.values().countIt(it == Connected)
+    let numConnectedPeers = node.peerManager.wakuPeerStore[ConnectionBook].book
+      .values()
+      .countIt(it == Connected)
     if numConnectedPeers >= 6:
       notice "publisher is ready", connectedPeers = numConnectedPeers, required = 6
       break

diff --git a/examples/subscriber.nim b/examples/subscriber.nim
@@ -93,8 +93,9 @@ proc setupAndSubscribe(rng: ref HmacDrbgContext) {.async.} =
 
   # wait for a minimum of peers to be connected, otherwise messages wont be gossiped
   while true:
-    let numConnectedPeers =
-      node.peerManager.peerStore[ConnectionBook].book.values().countIt(it == Connected)
+    let numConnectedPeers = node.peerManager.wakuPeerStore[ConnectionBook].book
+      .values()
+      .countIt(it == Connected)
     if numConnectedPeers >= 6:
       notice "subscriber is ready", connectedPeers = numConnectedPeers, required = 6
       break

diff --git a/library/waku_thread/inter_thread_communication/requests/peer_manager_request.nim b/library/waku_thread/inter_thread_communication/requests/peer_manager_request.nim
@@ -75,7 +75,8 @@ proc process*(
       return err(ret.error)
   of GET_ALL_PEER_IDS:
     ## returns a comma-separated string of peerIDs
-    let peerIDs = waku.node.peerManager.peerStore.peers().mapIt($it.peerId).join(",")
+    let peerIDs =
+      waku.node.peerManager.wakuPeerStore.peers().mapIt($it.peerId).join(",")
     return ok(peerIDs)
   of GET_PEER_IDS_BY_PROTOCOL:
     ## returns a comma-separated string of peerIDs that mount the given protocol