feat: bump nim-libp2p to v2.0.0 by fcecin · Pull Request #3929 · logos-messaging/logos-delivery

fcecin · 2026-06-03T17:23:46Z

Description

This PR bumps nim-libp2p to v2.0.0, which paves the way for adding QUIC support in logos-delivery.

This PR uses the libp2p v2 bump work in PR #3931 as a reference. Thanks @chaitanyaprem!

Changes

bump nim-libp2p pin to v2.0.0 tag
bump json_rpc to v0.6.1, lsquic to v0.5.1, boringssl to v0.0.8 (latest tags)
add libp2p_mix dep; repoint libp2p/protocols/mix -> libp2p_mix
pin nimble.lock: websock / protobuf_serialization / npeg / jwt
Makefile: add -d:libp2p_quic_support
regenerate nix/deps.nix (adds libp2p_mix, refreshes pins)
migrate rng ref HmacDrbgContext -> libp2p Rng across prod/channels/tests (interface-only; same DRBG)
waku_switch: TransportConfig factory; unified 2.0.0 connection limits (withMaxInOut, withMaxConnections); local MaxConnections
waku_relay/rendezvous/discv5/kademlia: v2.0.0 API (rng, config, ServiceDiscovery rename)
call Service.setup() on post-build switch services (2.0.0 split setup/start, fixes autonat addressMapper nil-deref segfault)
drop libp2p/utils/semaphore -> chronos AsyncSemaphore
add logos_delivery/waku/compat/option_valueor shim (Option[T] valueOr/withValue, dropped upstream)
add std/options where a transitive re-export was removed
add newStandardSwitch shim (libp2p removed it in 2.0.0); mounts yamux+mplex to match prod muxer
PeerId.random(rng); common.rng()/crypto.newRng(); hoist shared rng (instantiation cleanup)
update expectations for 2.0.0 defaults: DEFAULT_PROTOCOLS += /ipfs/id/push/1.0.0; agent "nim-libp2p"
drop relay reboot/reconnect test (asserted a Switch restart capability that is simply not supported)
fix up a few tests that were flaking on MacOS (libp2p upgrade may have exposed these)

Issue

iterates logos-messaging/pm#404

iterates logos-messaging/pm#324

closes #3634 (since nim-libp2p v2.0.0 contains vacp2p/nim-libp2p#2359)

* bump libp2p pin to release/v2.0.0 (c43199378) * pin nimble.lock: lsquic/websock/boringssl/protobuf_serialization/npeg/jwt * add libp2p_mix dep and point libp2p/protocols/mix -> libp2p_mix * migrate rng to libp2p Rng type (prod, channels, noise, tests) * noise: take Rng, extract bearSslDrbg internally * waku_switch: TransportConfig factory; withMaxInOut; local MaxConnections * waku_relay/rendezvous/discv5/kademlia: v2.0.0 API (rng, config, ServiceDiscovery) * tests: newStandardSwitch shim; PeerId.random(rng); common.rng()/crypto.newRng() * drop libp2p/utils/semaphore (use chronos AsyncSemaphore) * add waku/compat/option_valueor shim where needed * add std/options where transitive re-export dropped

* deps: json_rpc + web3 via websock-relaxed forks (WIP: revert on upstream fix) * fix: setup() post-build switch services (autonat nil segfault) * fix: unified 2.0.0 connection limits * test: 2.0.0 defaults (identify-push, agent string) * test: drop reboot/reconnect (unsupported Switch restart)

* add yamux to our newStandardSwitch to match prod behavior * test: rng instantiation cleanup

github-actions · 2026-06-03T17:24:03Z

This PR may contain changes to database schema of one of the drivers.

If you are introducing any changes to the schema, make sure the upgrade from the latest release to this change passes without any errors/issues.

Please make sure the label release-notes is added to make sure upgrade instructions properly highlight this change.

github-actions · 2026-06-03T17:37:10Z

You can find the image built from this PR at

quay.io/wakuorg/nwaku-pr:3929

Built from f8fb050

…lease-v2.0.0

* Fix libp2p bump to v2.0.0 tag * Fix libp2p_mix bump to commit that references libp2p v2.0.0 * Fix lint

* json_rpc: to v0.6.1 tag (latest) * lsquic: v0.5.1 (latest; QUIC connection-handling fixes) * boringssl: v0.0.8 (latest)

…lease-v2.0.0

Ivansete-status

LGTM in general, thanks so much for it!
The only reason why I don't approve yet is because we are removing one test.
Besides, we can replace Option (std/options) with Opt (results) everywhere now or can be done in a separate PR.

Ivansete-status · 2026-06-11T22:36:03Z

+## Polyfill: `valueOr` / `withValue` templates for `std/options.Option[T]`.
+##
+## Previously provided transitively by `libp2p/utility`, removed in
+## nim-libp2p PR #2162 (commit 8a9943145). logos-delivery uses these


We can avoid having that file by only using Opt instead of Option, similar to how has been done in vacp2p/nim-libp2p#2162.

Opt is defined in nim-results ( we usually get it with import result .)

I think swapping Option for Opt everywhere is going to be its own Issue/PR yep

Yes good idea thanks. #3955

Ivansete-status · 2026-06-11T22:46:06Z

    url = "https://github.com/vacp2p/nim-jwt.git";
-    rev = "18f8378de52b241f321c1f9ea905456e89b95c6f";
-    sha256 = "1986czmszdxj6g9yr7xn1fx8y2y9mwpb3f1bn9nc6973qawsdm0p";
+    rev = "057ec95eb5af0eea9c49bfe9025b3312c95dc5f2";


I would double-check that file as maybe it contains too many changes.

The nix/deps.nix file is auto-generated from the nimble.lock file. It can be redone locally to check that the result is identical (might need some extra nix tooling installed):

./tools/gen-nix-deps.sh nimble.lock /tmp/deps.regen.nix git diff --no-index nix/deps.nix /tmp/deps.regen.nix

The question then is whether the nimble.lock is correct. It's at least very similar to what Prem did in his PR.

Ivansete-status · 2026-06-11T22:51:59Z

      await allFutures(otherSwitch.stop(), otherNode.stop())

  suite "Security and Privacy":
-    asyncTest "Relay can receive messages after reboot and reconnect":


Why removing that test?

It's the "drop relay reboot/reconnect test (asserted a Switch restart capability that is simply not supported)" item in the PR desc.

It's basically that. Restarting a switch is not actually supported.

Ivansete-status · 2026-06-11T22:59:00Z

 NIM_PARAMS := $(NIM_PARAMS) -d:libp2p_mix_experimental_exit_is_dest

+# enable libp2p's QUIC transport
+NIM_PARAMS := $(NIM_PARAMS) -d:libp2p_quic_support


Maybe this line in particular should go for QUIC adoption. Not a big deal, though.

Right; I don't think "libp2p without quic" is a thing that makes much sense, we want it enabled always so I rolled this into the bump.

…lease-v2.0.0

jm-clius

I gave this only an overview, but satisfied myself that I have answers to the questions that came up (e.g. how setup() vs start9) is addressed, why MaxConnections are now explicit, etc.)

…lease-v2.0.0

fcecin · 2026-06-15T12:54:12Z

We will merge now but any later comments/reviews here are appreciated and will be addressed.

fcecin added 3 commits June 2, 2026 15:42

Bump fixes

d9592dc

* add yamux to our newStandardSwitch to match prod behavior * test: rng instantiation cleanup

github-actions Bot assigned fcecin Jun 3, 2026

fcecin added 9 commits June 4, 2026 15:24

Add -d:libp2p_quic_support to Makefile

5eed0f2

Fix CatchableError -> ServiceSetupError (copied from #3931)

b76556e

remove dep forks

93d4b3c

Merge remote-tracking branch 'origin/master' into feat/libp2p-bump-re…

69e4d95

…lease-v2.0.0

Fixes

1f5f4c2

* Fix libp2p bump to v2.0.0 tag * Fix libp2p_mix bump to commit that references libp2p v2.0.0 * Fix lint

Fix nix/deps.nix

5aebe3d

pin json_rpc, lsquic, boringssl to release tags

4038769

* json_rpc: to v0.6.1 tag (latest) * lsquic: v0.5.1 (latest; QUIC connection-handling fixes) * boringssl: v0.0.8 (latest)

Fix test problems exposed by MacOS CI runners

0f6e479

Merge remote-tracking branch 'origin/master' into feat/libp2p-bump-re…

96fc569

…lease-v2.0.0

fcecin marked this pull request as ready for review June 11, 2026 21:46

fcecin requested review from Ivansete-status, NagyZoltanPeter, chaitanyaprem, darshankabariya, igor-sirotin and stubbsta June 11, 2026 21:46

Ivansete-status reviewed Jun 11, 2026

View reviewed changes

Merge remote-tracking branch 'origin/master' into feat/libp2p-bump-re…

79716ba

…lease-v2.0.0

fcecin mentioned this pull request Jun 12, 2026

feat: QUIC transport support #3951

Merged

Merge branch 'master' into feat/libp2p-bump-release-v2.0.0

ab19ffc

jm-clius approved these changes Jun 15, 2026

View reviewed changes

fcecin requested a review from SionoiS June 15, 2026 11:57

Merge remote-tracking branch 'origin/master' into feat/libp2p-bump-re…

0767187

…lease-v2.0.0

Ivansete-status approved these changes Jun 15, 2026

View reviewed changes

fcecin merged commit 6837ae0 into master Jun 15, 2026
15 checks passed

fcecin deleted the feat/libp2p-bump-release-v2.0.0 branch June 15, 2026 12:56

Uh oh!

Conversation

fcecin commented Jun 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Changes

Issue

Uh oh!

github-actions Bot commented Jun 3, 2026

Uh oh!

github-actions Bot commented Jun 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Ivansete-status left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jm-clius left a comment

Choose a reason for hiding this comment

Uh oh!

fcecin commented Jun 15, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

fcecin commented Jun 3, 2026 •

edited

Loading

github-actions Bot commented Jun 3, 2026 •

edited

Loading