From 36993b481734fc48966ec6ff04041d734f099429 Mon Sep 17 00:00:00 2001
From: NagyZoltanPeter <113987313+NagyZoltanPeter@users.noreply.github.com>
Date: Tue, 6 Jan 2026 13:20:27 +0100
Subject: [PATCH] Adapt code and build to new libp2p

---
 tests/test_peer_manager.nim             | 5 +++++
 waku.nimble                             | 4 +++-
 waku/factory/builder.nim                | 1 +
 waku/factory/waku.nim                   | 1 -
 waku/node/peer_manager/peer_manager.nim | 7 ++++---
 waku/waku_rendezvous/protocol.nim       | 1 -
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/tests/test_peer_manager.nim b/tests/test_peer_manager.nim
index 1369f3f88..97df39582 100644
--- a/tests/test_peer_manager.nim
+++ b/tests/test_peer_manager.nim
@@ -997,6 +997,7 @@ procSuite "Peer Manager":
         .build(),
       maxFailedAttempts = 1,
       storage = nil,
+      maxConnections = 20,
     )
 
     # Create 30 peers and add them to the peerstore
@@ -1063,6 +1064,7 @@ procSuite "Peer Manager":
       backoffFactor = 2,
       maxFailedAttempts = 10,
       storage = nil,
+      maxConnections = 20,
     )
     var p1: PeerId
     require p1.init("QmeuZJbXrszW2jdT7GdduSjQskPU3S7vvGWKtKgDfkDvW" & "1")
@@ -1116,6 +1118,7 @@ procSuite "Peer Manager":
           .build(),
         maxFailedAttempts = 150,
         storage = nil,
+        maxConnections = 20,
       )
 
     # Should result in backoff > 1 week
@@ -1131,6 +1134,7 @@ procSuite "Peer Manager":
           .build(),
         maxFailedAttempts = 10,
         storage = nil,
+        maxConnections = 20,
       )
 
     let pm = PeerManager.new(
@@ -1144,6 +1148,7 @@ procSuite "Peer Manager":
         .build(),
       maxFailedAttempts = 5,
       storage = nil,
+      maxConnections = 20,
     )
 
   asyncTest "colocationLimit is enforced by pruneConnsByIp()":
diff --git a/waku.nimble b/waku.nimble
index 5c5c09763..608c2aaf1 100644
--- a/waku.nimble
+++ b/waku.nimble
@@ -31,7 +31,9 @@ requires "nim >= 2.2.4",
   "results",
   "db_connector",
   "minilru",
-  "ffi"
+  "ffi",
+  "lsquic",
+  "jwt"
 
 ### Helper functions
 proc buildModule(filePath, params = "", lang = "c"): bool =
diff --git a/waku/factory/builder.nim b/waku/factory/builder.nim
index 772cfbffd..f379f92bb 100644
--- a/waku/factory/builder.nim
+++ b/waku/factory/builder.nim
@@ -209,6 +209,7 @@ proc build*(builder: WakuNodeBuilder): Result[WakuNode, string] =
     maxServicePeers = some(builder.maxServicePeers),
     colocationLimit = builder.colocationLimit,
     shardedPeerManagement = builder.shardAware,
+    maxConnections = builder.switchMaxConnections.get(builders.MaxConnections),
   )
 
   var node: WakuNode
diff --git a/waku/factory/waku.nim b/waku/factory/waku.nim
index c0380ccc9..d55206f97 100644
--- a/waku/factory/waku.nim
+++ b/waku/factory/waku.nim
@@ -13,7 +13,6 @@ import
   libp2p/services/autorelayservice,
   libp2p/services/hpservice,
   libp2p/peerid,
-  libp2p/discovery/rendezvousinterface,
   eth/keys,
   eth/p2p/discoveryv5/enr,
   presto,
diff --git a/waku/node/peer_manager/peer_manager.nim b/waku/node/peer_manager/peer_manager.nim
index 1abcc1ac0..487d3894d 100644
--- a/waku/node/peer_manager/peer_manager.nim
+++ b/waku/node/peer_manager/peer_manager.nim
@@ -103,6 +103,7 @@ type PeerManager* = ref object of RootObj
   onConnectionChange*: ConnectionChangeHandler
   online: bool ## state managed by online_monitor module
   getShards: GetShards
+  maxConnections: int
 
 #~~~~~~~~~~~~~~~~~~~#
 # Helper Functions  #
@@ -748,7 +749,6 @@ proc logAndMetrics(pm: PeerManager) {.async.} =
     var peerStore = pm.switch.peerStore
     # log metrics
     let (inRelayPeers, outRelayPeers) = pm.connectedPeers(WakuRelayCodec)
-    let maxConnections = pm.switch.connManager.inSema.size
     let notConnectedPeers =
       peerStore.getDisconnectedPeers().mapIt(RemotePeerInfo.init(it.peerId, it.addrs))
     let outsideBackoffPeers = notConnectedPeers.filterIt(pm.canBeConnected(it.peerId))
@@ -758,7 +758,7 @@ proc logAndMetrics(pm: PeerManager) {.async.} =
     info "Relay peer connections",
       inRelayConns = $inRelayPeers.len & "/" & $pm.inRelayPeersTarget,
       outRelayConns = $outRelayPeers.len & "/" & $pm.outRelayPeersTarget,
-      totalConnections = $totalConnections & "/" & $maxConnections,
+      totalConnections = $totalConnections & "/" & $pm.maxConnections,
       notConnectedPeers = notConnectedPeers.len,
       outsideBackoffPeers = outsideBackoffPeers.len
 
@@ -1048,9 +1048,9 @@ proc new*(
     maxFailedAttempts = MaxFailedAttempts,
     colocationLimit = DefaultColocationLimit,
     shardedPeerManagement = false,
+    maxConnections: int = MaxConnections,
 ): PeerManager {.gcsafe.} =
   let capacity = switch.peerStore.capacity
-  let maxConnections = switch.connManager.inSema.size
   if maxConnections > capacity:
     error "Max number of connections can't be greater than PeerManager capacity",
       capacity = capacity, maxConnections = maxConnections
@@ -1099,6 +1099,7 @@ proc new*(
     colocationLimit: colocationLimit,
     shardedPeerManagement: shardedPeerManagement,
     online: true,
+    maxConnections: maxConnections,
   )
 
   proc peerHook(
diff --git a/waku/waku_rendezvous/protocol.nim b/waku/waku_rendezvous/protocol.nim
index 7b97375ff..00b5f1a5c 100644
--- a/waku/waku_rendezvous/protocol.nim
+++ b/waku/waku_rendezvous/protocol.nim
@@ -8,7 +8,6 @@ import
   stew/byteutils,
   libp2p/protocols/rendezvous,
   libp2p/protocols/rendezvous/protobuf,
-  libp2p/discovery/discoverymngr,
   libp2p/utils/semaphore,
   libp2p/utils/offsettedseq,
   libp2p/crypto/curve25519,