Merge branch 'master' into fix(service-disco)-fix-ticket-time-window-validation

Author: SionoiS

.github/workflows/cbindings.yml

@@ -124,7 +124,6 @@ jobs:
           cd cbind
           nimble install_pinned
           nimble setup
-          make -C .. nat_libs
           nimble buildffi
           nimble genbindings_c
           nimble genbindings_cddl

.github/workflows/coverage.yml

@@ -52,10 +52,10 @@ jobs:
           cd tests && nimble install_pinned
 
       - name: Build prerequisites
-        run: make nimble.paths tests/nimble.paths nat_libs
+        run: make nimble.paths tests/nimble.paths
 
       - name: Build prerequisites
-        run: make nimble.paths nat_libs
+        run: make nimble.paths
 
       - name: Restore build cache
         uses: actions/cache@v5

.github/workflows/daily_test_all_latest_deps.yml

@@ -192,8 +192,7 @@ jobs:
             exit 1
           fi
           echo "=== Installing resolved newest dependencies ==="
-          # nimbledeps/ switches nimble to local-dep mode so the Makefile's
-          # nat_libs step finds nimbledeps/pkgs2/nat_traversal-*.
+          # nimbledeps/ switches nimble to local-dep mode for the pinned build.
           rm -rf nimbledeps tests/nimbledeps
           mkdir nimbledeps
           echo "nimble install -y $DEPS"
@@ -203,7 +202,7 @@ jobs:
           (cd tests && nimble install -y $TEST_DEPS)
 
       - name: Build prerequisites
-        run: make nimble.paths tests/nimble.paths nat_libs
+        run: make nimble.paths tests/nimble.paths
 
       - name: Build test_all
         run: |

.github/workflows/daily_test_all_no_flags.yml

@@ -56,7 +56,7 @@ jobs:
           cd tests && nimble install_pinned
 
       - name: Build prerequisites
-        run: make nimble.paths tests/nimble.paths nat_libs
+        run: make nimble.paths tests/nimble.paths
 
       - name: Build without feature flags
         run: |

.github/workflows/examples.yml

@@ -55,7 +55,7 @@ jobs:
           nimble install_pinned
 
       - name: Build prerequisites
-        run: make nimble.paths nat_libs
+        run: make nimble.paths
 
       - name: Build and run examples
         run: |

.github/workflows/interop.yml

@@ -68,6 +68,7 @@ jobs:
 
       - name: Run Go and Nim together
         run: |
+          nimble install_pinned
           nimble setup
           cd interop/autonatv2/go-peer
           go mod tidy
@@ -93,7 +94,8 @@ jobs:
 
       - name: Run Nim and Rust together
         run: |
-          nimble install
+          nimble install_pinned
+          nimble setup
           cd interop/kad/rust-peer
           cargo run &
 
@@ -120,6 +122,7 @@ jobs:
       # the go peer runs in the background because the interop test logic is implemented in the nim peer.
       - name: Run Interop
         run: |
+          nimble install_pinned
           nimble setup
           cd interop/partial-message
           nim c ./nim-peer/src/peer.nim

.github/workflows/test_all.yml

@@ -111,13 +111,10 @@ jobs:
           path: |
             nimbledeps
             tests/nimbledeps
-          # Scope by os/cpu/cc: nimbledeps contains pre-built .a files for
-          # nim-nat-traversal's vendored miniupnpc/libnatpmp, rebuilt by
-          # `make nat_libs` against the host toolchain. Sharing the cache
-          # across mismatched toolchains (linux<->windows, gcc<->clang)
-          # produced broken artifacts last time. Keep this key in sync
-          # with the other workflows that cache nimbledeps so cache
-          # entries are reusable across them.
+          # Scope by os/cpu/cc so cache entries can't leak vendored/compiled
+          # artifacts across mismatched toolchains (linux<->windows,
+          # gcc<->clang). Keep this key in sync with the other workflows that
+          # cache nimbledeps so cache entries are reusable across them.
           key: nimbledeps-${{ matrix.platform.os }}-${{ matrix.platform.cpu }}-${{ matrix.platform.cc }}-${{ hashFiles('.pinned', 'tests/.pinned') }}
 
       - name: Restore llvm-mingw (Windows) from cache
@@ -169,7 +166,7 @@ jobs:
           cd tests && nimble install_pinned
 
       - name: Build prerequisites
-        run: make nimble.paths tests/nimble.paths nat_libs
+        run: make nimble.paths tests/nimble.paths
 
       - name: Restore build cache
         id: nimcache-restore

.github/workflows/test_multiformat_exts.yml

@@ -127,7 +127,7 @@ jobs:
           cd tests && nimble install_pinned
 
       - name: Build prerequisites
-        run: make nimble.paths tests/nimble.paths nat_libs
+        run: make nimble.paths tests/nimble.paths
 
       - name: Build test_multiformat_exts
         id: build-test

.pinned

@@ -15,5 +15,5 @@ stew;https://github.com/status-im/nim-stew@#b66168735d6f3841c5239c3169d3fe5fe98b
 websock;https://github.com/status-im/nim-websock@#387a8eb7e961e8fdd3b1a717d36bc53b55e4dc5d
 zlib;https://github.com/status-im/nim-zlib@#e680f269fb01af2c34a2ba879ff281795a5258fe
 protobuf_serialization;https://github.com/status-im/nim-protobuf-serialization@#8406e7287196661614ce6a8e8be20f755376af7f
-nat_traversal;https://github.com/status-im/nim-nat-traversal@#860e18c37667b5dd005b94c63264560c35d88004
+libplum;https://github.com/logos-storage/nim-libplum@#acefbe424cf9d1f05f2d93533790c9ac4e034df8
 npeg;https://github.com/zevv/npeg@#409f6796d0e880b3f0222c964d1da7de6e450811

Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build deps cbind clean test \
         test_multiformat_exts test_integration \
-        install_pinned pin unpin gen_multicodec format clean-nim nat_libs nat_pkg_dir_check
+        install_pinned pin unpin gen_multicodec format clean-nim
 
 NIM_VERSION  ?= 2.2.10
 NPH_VERSION  ?= 0.7.0
@@ -102,56 +102,11 @@ tests/nimble.paths: $(wildcard tests/nimbledeps/pkgs2/*/*.nimble) $(wildcard tes
 	  done; \
 	done
 
-# nim-nat-traversal vendors miniupnpc and libnatpmp as C sources. The package's
-# `before install` hook builds them, but the resulting .a files are not always
-# preserved alongside the package dir (cross-OS cache reuse, different gcc
-# versions). Rebuild them up-front against the host's toolchain.
-NAT_PKG_DIR := $(firstword $(wildcard nimbledeps/pkgs2/nat_traversal-*) $(wildcard nimbledeps/pkgs/nat_traversal-*))
-NAT_PMP_LIB := $(NAT_PKG_DIR)/vendor/libnatpmp-upstream/libnatpmp.a
-
-# Use gcc rather than `cc` so the linux-i386 wrapper (external/bin/gcc, which
-# injects -m32) is picked up. On macOS and llvm-mingw, `gcc` is a clang
-# compatibility shim, so this stays ABI-compatible with nim's choice.
-NAT_CC ?= gcc
-
-# miniupnpc's unix Makefile drops the .a under `build/`, but its Windows
-# Makefile.mingw drops it at the package root. Match each one.
-ifeq ($(OS),Windows_NT)
-  NAT_UPNP_LIB := $(NAT_PKG_DIR)/vendor/miniupnp/miniupnpc/libminiupnpc.a
-  NAT_UPNP_MAKE_ARGS := -f Makefile.mingw CC=$(NAT_CC) libminiupnpc.a
-  NAT_PMP_CFLAGS := -Wall -Os -fPIC -DENABLE_STRNATPMPERR -DNATPMP_MAX_RETRIES=4 -DWIN32 -DNATPMP_STATICLIB
-  # libnatpmp's Makefile only appends wingettimeofday.o to LIBOBJS when $(OS)
-  # contains mingw/cygwin/msys. The CI Windows runner passes through Windows_NT
-  # (the host env var), so that branch never matches — leaving
-  # natpmp_gettimeofday undefined at link time. Pass LIBOBJS explicitly.
-  NAT_PMP_MAKE_ARGS := LIBOBJS="natpmp.o getgateway.o wingettimeofday.o" libnatpmp.a
-else
-  NAT_UPNP_LIB := $(NAT_PKG_DIR)/vendor/miniupnp/miniupnpc/build/libminiupnpc.a
-  NAT_UPNP_MAKE_ARGS := CC=$(NAT_CC) CFLAGS="-Os -fPIC" build/libminiupnpc.a
-  NAT_PMP_CFLAGS := -Wall -Os -fPIC -DENABLE_STRNATPMPERR -DNATPMP_MAX_RETRIES=4
-  NAT_PMP_MAKE_ARGS := libnatpmp.a
-endif
-
-# Stamp-based rebuild: the stamp records "the .a files in this package dir were
-# built by our recipe with the right compiler". Re-running install_pinned wipes
-# the package dir (and thus the stamp), forcing a rebuild.
-NAT_LIBS_STAMP := $(NAT_PKG_DIR)/.libp2p-nat-libs.stamp
-
-nat_libs: $(NAT_LIBS_STAMP)
-
-nat_pkg_dir_check:
-	@test -n "$(NAT_PKG_DIR)" || \
-	  (echo "Error: nat_traversal package not found under nimbledeps/pkgs2/ or nimbledeps/pkgs/. Run 'nimble install_pinned' first." && exit 1)
-
-$(NAT_LIBS_STAMP): | nat_pkg_dir_check
-	rm -f "$(NAT_UPNP_LIB)" "$(NAT_PMP_LIB)"
-	-$(MAKE) -C "$(NAT_PKG_DIR)/vendor/miniupnp/miniupnpc" clean
-	-$(MAKE) -C "$(NAT_PKG_DIR)/vendor/libnatpmp-upstream" clean
-	$(MAKE) -C "$(NAT_PKG_DIR)/vendor/miniupnp/miniupnpc" $(NAT_UPNP_MAKE_ARGS)
-	$(MAKE) -C "$(NAT_PKG_DIR)/vendor/libnatpmp-upstream" CC=$(NAT_CC) CFLAGS="$(NAT_PMP_CFLAGS)" $(NAT_PMP_MAKE_ARGS)
-	touch "$@"
+# nim-libplum vendors libplum (PCP / NAT-PMP / UPnP-IGD) as a git submodule and
+# compiles its C sources into libp2p via nim's {.compile.} pragmas, so there is
+# no separate NAT library to build or link here.
 
-test: nimble.paths tests/nimble.paths nat_libs
+test: nimble.paths tests/nimble.paths
 ifeq ($(TEST_PATH),)
 	$(NIMC) c $(NIM_FLAGS) \
 	  $(if $(CICOV),--nimcache:nimcache/test_all,) \
@@ -166,7 +121,7 @@ else
 	./tests/test_all $(RUNNER_FLAGS) --xml:tests/results_test_all.xml
 endif
 
-test_multiformat_exts: nimble.paths tests/nimble.paths nat_libs
+test_multiformat_exts: nimble.paths tests/nimble.paths
 	$(NIMC) c $(NIM_FLAGS) \
 	  --nimcache:nimcache/test_all_multiformat \
 	  -d:libp2p_multicodec_exts=../tests/libp2p/multiformat_exts/multicodec_exts.nim \
@@ -178,7 +133,7 @@ test_multiformat_exts: nimble.paths tests/nimble.paths nat_libs
 	  tests/test_all.nim
 	./tests/test_all $(RUNNER_FLAGS) --xml:tests/results_test_all_multiformat.xml
 
-test_integration: nimble.paths tests/nimble.paths nat_libs
+test_integration: nimble.paths tests/nimble.paths
 	$(NIMC) c $(NIM_FLAGS) \
 	  $(if $(CICOV),--nimcache:nimcache/integration,) \
 	  tests/integration/test_all.nim