From cb6eb04728fca0db628ea3e6aa0050ca975965c3 Mon Sep 17 00:00:00 2001
From: darshankabariya <darshan@status.im>
Date: Mon, 12 Jan 2026 13:32:10 +0530
Subject: [PATCH] initial changes for deprect vendor

* update waku.nimble
* update add nimble lock
* remove vendor completly
* update nimble lock
* update process of makefile
---
 .github/workflows/ci.yml              |  99 +++--
 .github/workflows/container-image.yml |  26 +-
 .github/workflows/pre-release.yml     |   7 +-
 .github/workflows/release-assets.yml  |  22 +-
 .github/workflows/windows-build.yml   |  39 +-
 .gitmodules                           | 187 --------
 Makefile                              | 286 +++++--------
 apps/chat2/chat2.nim                  |   3 +-
 config.nims                           |   5 +
 nimble.lock                           | 586 ++++++++++++++++++++++++++
 tests/waku_core/test_peers.nim        |   7 +-
 vendor/db_connector                   |   1 -
 vendor/dnsclient.nim                  |   1 -
 vendor/nim-bearssl                    |   1 -
 vendor/nim-chronicles                 |   1 -
 vendor/nim-chronos                    |   1 -
 vendor/nim-confutils                  |   1 -
 vendor/nim-dnsdisc                    |   1 -
 vendor/nim-eth                        |   1 -
 vendor/nim-faststreams                |   1 -
 vendor/nim-ffi                        |   1 -
 vendor/nim-http-utils                 |   1 -
 vendor/nim-json-rpc                   |   1 -
 vendor/nim-json-serialization         |   1 -
 vendor/nim-jwt                        |   1 -
 vendor/nim-libbacktrace               |   1 -
 vendor/nim-libp2p                     |   1 -
 vendor/nim-lsquic                     |   1 -
 vendor/nim-metrics                    |   1 -
 vendor/nim-minilru                    |   1 -
 vendor/nim-nat-traversal              |   1 -
 vendor/nim-presto                     |   1 -
 vendor/nim-regex                      |   1 -
 vendor/nim-results                    |   1 -
 vendor/nim-secp256k1                  |   1 -
 vendor/nim-serialization              |   1 -
 vendor/nim-sqlite3-abi                |   1 -
 vendor/nim-stew                       |   1 -
 vendor/nim-stint                      |   1 -
 vendor/nim-taskpools                  |   1 -
 vendor/nim-testutils                  |   1 -
 vendor/nim-toml-serialization         |   1 -
 vendor/nim-unicodedb                  |   1 -
 vendor/nim-unittest2                  |   1 -
 vendor/nim-web3                       |   1 -
 vendor/nim-websock                    |   1 -
 vendor/nim-zlib                       |   1 -
 vendor/nimbus-build-system            |   1 -
 vendor/nimcrypto                      |   1 -
 vendor/nph                            |   1 -
 waku.nimble                           | 105 +++--
 51 files changed, 865 insertions(+), 546 deletions(-)
 create mode 100644 nimble.lock
 delete mode 160000 vendor/db_connector
 delete mode 160000 vendor/dnsclient.nim
 delete mode 160000 vendor/nim-bearssl
 delete mode 160000 vendor/nim-chronicles
 delete mode 160000 vendor/nim-chronos
 delete mode 160000 vendor/nim-confutils
 delete mode 160000 vendor/nim-dnsdisc
 delete mode 160000 vendor/nim-eth
 delete mode 160000 vendor/nim-faststreams
 delete mode 160000 vendor/nim-ffi
 delete mode 160000 vendor/nim-http-utils
 delete mode 160000 vendor/nim-json-rpc
 delete mode 160000 vendor/nim-json-serialization
 delete mode 160000 vendor/nim-jwt
 delete mode 160000 vendor/nim-libbacktrace
 delete mode 160000 vendor/nim-libp2p
 delete mode 160000 vendor/nim-lsquic
 delete mode 160000 vendor/nim-metrics
 delete mode 160000 vendor/nim-minilru
 delete mode 160000 vendor/nim-nat-traversal
 delete mode 160000 vendor/nim-presto
 delete mode 160000 vendor/nim-regex
 delete mode 160000 vendor/nim-results
 delete mode 160000 vendor/nim-secp256k1
 delete mode 160000 vendor/nim-serialization
 delete mode 160000 vendor/nim-sqlite3-abi
 delete mode 160000 vendor/nim-stew
 delete mode 160000 vendor/nim-stint
 delete mode 160000 vendor/nim-taskpools
 delete mode 160000 vendor/nim-testutils
 delete mode 160000 vendor/nim-toml-serialization
 delete mode 160000 vendor/nim-unicodedb
 delete mode 160000 vendor/nim-unittest2
 delete mode 160000 vendor/nim-web3
 delete mode 160000 vendor/nim-websock
 delete mode 160000 vendor/nim-zlib
 delete mode 160000 vendor/nimbus-build-system
 delete mode 160000 vendor/nimcrypto
 delete mode 160000 vendor/nph

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3de6eb4f5..c992d2320 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,31 +56,47 @@ jobs:
       matrix:
         os: [ubuntu-22.04, macos-15]
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 45
+    timeout-minutes: 90
 
     name: build-${{ matrix.os }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Get submodules hash
-        id: submodules
-        run: |
-          echo "hash=$(git submodule status | awk '{print $1}' | sort | shasum -a 256 | sed 's/[ -]*//g')" >> $GITHUB_OUTPUT
-
-      - name: Cache submodules
-        uses: actions/cache@v3
+      - name: Install Nim
+        uses: iffy/install-nim@v5
         with:
-          path: |
-            vendor/
-            .git/modules
-          key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }}
+          version: binary:2.2.4
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Cache nimble packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.nimble/pkgs2
+          key: ${{ runner.os }}-nimble-${{ hashFiles('nimble.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-nimble-
 
       - name: Make update
         run: make update
 
+      - name: Debug nimble.paths
+        run: |
+          echo "=== Nim version ==="
+          nim --version
+          echo "=== nimble version ==="
+          nimble --version
+          echo "=== nimble.paths content ==="
+          cat nimble.paths || echo "nimble.paths not found"
+          echo "=== Check for empty paths ==="
+          grep -n '""' nimble.paths || echo "No empty paths found"
+          grep -n '^--path:$' nimble.paths || echo "No empty --path: entries"
+          echo "=== Verify nimcrypto is in paths ==="
+          grep -c nimcrypto nimble.paths || echo "WARNING: nimcrypto not found in nimble.paths!"
+
       - name: Build binaries
-        run: make V=1 QUICK_AND_DIRTY_COMPILER=1 all
+        run: make V=1 QUICK_AND_DIRTY_COMPILER=1 USE_LIBBACKTRACE=0 all
 
   build-windows:
     needs: changes
@@ -97,39 +113,52 @@ jobs:
       matrix:
         os: [ubuntu-22.04, macos-15]
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 45
+    timeout-minutes: 90
 
     name: test-${{ matrix.os }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Get submodules hash
-        id: submodules
-        run: |
-          echo "hash=$(git submodule status | awk '{print $1}' | sort | shasum -a 256 | sed 's/[ -]*//g')" >> $GITHUB_OUTPUT
-
-      - name: Cache submodules
-        uses: actions/cache@v3
+      - name: Install Nim
+        uses: iffy/install-nim@v5
         with:
-          path: |
-            vendor/
-            .git/modules
-          key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }}
+          version: binary:2.2.4
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Cache nimble packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.nimble/pkgs2
+          key: ${{ runner.os }}-nimble-${{ hashFiles('nimble.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-nimble-
 
       - name: Make update
         run: make update
 
+      - name: Verify nimble.paths
+        run: |
+          echo "=== nimble.paths content ==="
+          cat nimble.paths || { echo "ERROR: nimble.paths not found!"; exit 1; }
+          echo "=== Verify critical dependencies ==="
+          grep -q nimcrypto nimble.paths || { echo "ERROR: nimcrypto not in paths!"; exit 1; }
+          grep -q libp2p nimble.paths || { echo "ERROR: libp2p not in paths!"; exit 1; }
+
       - name: Run tests
         run: |
           postgres_enabled=0
           if [ ${{ runner.os }} == "Linux" ]; then
             sudo docker run --rm -d -e POSTGRES_PASSWORD=test123 -p 5432:5432 postgres:15.4-alpine3.18
             postgres_enabled=1
+            # Disable march=native on Linux to avoid potential nimcrypto SHA2 issues
+            export NIMFLAGS="--colors:off -d:chronicles_colors:none -d:disableMarchNative"
+          else
+            export NIMFLAGS="--colors:off -d:chronicles_colors:none"
           fi
 
           export MAKEFLAGS="-j1"
-          export NIMFLAGS="--colors:off -d:chronicles_colors:none"
           export USE_LIBBACKTRACE=0
 
           make V=1 LOG_LEVEL=DEBUG QUICK_AND_DIRTY_COMPILER=1 POSTGRES=$postgres_enabled test
@@ -138,7 +167,7 @@ jobs:
   build-docker-image:
     needs: changes
     if: ${{ needs.changes.outputs.v2 == 'true' || needs.changes.outputs.common == 'true' || needs.changes.outputs.docker == 'true' }}
-    uses: logos-messaging/logos-messaging-nim/.github/workflows/container-image.yml@10dc3d3eb4b6a3d4313f7b2cc4a85a925e9ce039
+    uses: ./.github/workflows/container-image.yml
     secrets: inherit
 
   nwaku-nwaku-interop-tests:
@@ -171,18 +200,12 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Get submodules hash
-        id: submodules
-        run: |
-          echo "hash=$(git submodule status | awk '{print $1}' | sort | shasum -a 256 | sed 's/[ -]*//g')" >> $GITHUB_OUTPUT
-
-      - name: Cache submodules
-        uses: actions/cache@v3
+      - name: Install Nim
+        uses: iffy/install-nim@v5
         with:
-          path: |
-            vendor/
-            .git/modules
-          key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }}
+          version: binary:2.2.4
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build nph
         run: |
diff --git a/.github/workflows/container-image.yml b/.github/workflows/container-image.yml
index 2bc08be2f..37fe8e732 100644
--- a/.github/workflows/container-image.yml
+++ b/.github/workflows/container-image.yml
@@ -46,20 +46,20 @@ jobs:
         if: ${{ steps.secrets.outcome == 'success' }}
         uses: actions/checkout@v4
 
-      - name: Get submodules hash
-        id: submodules
+      - name: Install Nim
         if: ${{ steps.secrets.outcome == 'success' }}
-        run: |
-          echo "hash=$(git submodule status | awk '{print $1}' | sort | shasum -a 256 | sed 's/[ -]*//g')" >> $GITHUB_OUTPUT
-
-      - name: Cache submodules
-        if: ${{ steps.secrets.outcome == 'success' }}
-        uses: actions/cache@v3
+        uses: iffy/install-nim@v5
         with:
-          path: |
-            vendor/
-            .git/modules
-          key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }}
+          version: binary:2.2.4
+
+      - name: Cache nimble packages
+        if: ${{ steps.secrets.outcome == 'success' }}
+        uses: actions/cache@v4
+        with:
+          path: ~/.nimble/pkgs2
+          key: ${{ runner.os }}-nimble-${{ hashFiles('nimble.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-nimble-
 
       - name: Build binaries
         id: build
@@ -67,7 +67,7 @@ jobs:
         run: |
           make update
 
-          make -j${NPROC} V=1 QUICK_AND_DIRTY_COMPILER=1 NIMFLAGS="-d:disableMarchNative -d:postgres -d:chronicles_colors:none" wakunode2
+          make -j${NPROC} V=1 QUICK_AND_DIRTY_COMPILER=1 USE_LIBBACKTRACE=0 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
index faded198b..4871a6857 100644
--- a/.github/workflows/pre-release.yml
+++ b/.github/workflows/pre-release.yml
@@ -44,6 +44,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Install Nim
+        uses: iffy/install-nim@v5
+        with:
+          version: binary:2.2.4
+
       - name: prep variables
         id: vars
         run: |
@@ -66,7 +71,7 @@ jobs:
           make QUICK_AND_DIRTY_COMPILER=1 V=1 CI=false NIMFLAGS="-d:disableMarchNative --os:${OS} --cpu:${{matrix.arch}}" \
             update
 
-          make QUICK_AND_DIRTY_COMPILER=1 V=1 CI=false\
+          make QUICK_AND_DIRTY_COMPILER=1 V=1 CI=false USE_LIBBACKTRACE=0\
             NIMFLAGS="-d:disableMarchNative --os:${OS} --cpu:${{matrix.arch}} -d:postgres" \
             wakunode2\
             chat2\
diff --git a/.github/workflows/release-assets.yml b/.github/workflows/release-assets.yml
index 50e3c4c3d..046982502 100644
--- a/.github/workflows/release-assets.yml
+++ b/.github/workflows/release-assets.yml
@@ -28,18 +28,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Get submodules hash
-        id: submodules
-        run: |
-          echo "hash=$(git submodule status | awk '{print $1}' | sort | shasum -a 256 | sed 's/[ -]*//g')" >> $GITHUB_OUTPUT
-
-      - name: Cache submodules
-        uses: actions/cache@v3
+      - name: Install Nim
+        uses: iffy/install-nim@v5
         with:
-          path: |
-            vendor/
-            .git/modules
-          key: ${{ runner.os }}-${{matrix.arch}}-submodules-${{ steps.submodules.outputs.hash }}
+          version: binary:2.2.4
 
       - name: Get tag
         id: version
@@ -76,12 +68,12 @@ jobs:
           OS=$([[ "${{runner.os}}" == "macOS" ]] && echo "macosx" || echo "linux")
 
           make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC} -d:disableMarchNative --os:${OS} --cpu:${{matrix.arch}}" V=1 update
-          make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC} -d:disableMarchNative --os:${OS} --cpu:${{matrix.arch}} -d:postgres" CI=false wakunode2
-          make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC} -d:disableMarchNative --os:${OS} --cpu:${{matrix.arch}}" CI=false chat2
+          make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC} -d:disableMarchNative --os:${OS} --cpu:${{matrix.arch}} -d:postgres" CI=false USE_LIBBACKTRACE=0 wakunode2
+          make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC} -d:disableMarchNative --os:${OS} --cpu:${{matrix.arch}}" CI=false USE_LIBBACKTRACE=0 chat2
           tar -cvzf ${{steps.vars.outputs.waku}} ./build/
 
-          make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC} -d:disableMarchNative --os:${OS} --cpu:${{matrix.arch}} -d:postgres" CI=false libwaku
-          make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC} -d:disableMarchNative --os:${OS} --cpu:${{matrix.arch}} -d:postgres" CI=false STATIC=1 libwaku
+          make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC} -d:disableMarchNative --os:${OS} --cpu:${{matrix.arch}} -d:postgres" CI=false USE_LIBBACKTRACE=0 libwaku
+          make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC} -d:disableMarchNative --os:${OS} --cpu:${{matrix.arch}} -d:postgres" CI=false USE_LIBBACKTRACE=0 STATIC=1 libwaku
 
       - name: Create distributable libwaku package
         run: |
diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
index 9c1b1eab0..8b32a81b3 100644
--- a/.github/workflows/windows-build.yml
+++ b/.github/workflows/windows-build.yml
@@ -45,14 +45,22 @@ jobs:
           mingw-w64-x86_64-cmake
           mingw-w64-x86_64-llvm
           mingw-w64-x86_64-clang
+          mingw-w64-x86_64-nimble
           mingw-w64-x86_64-nasm
 
     - name: Manually install nasm
       run: |
         bash scripts/install_nasm_in_windows.sh
         source $HOME/.bashrc
-      
-    - name: Add UPX to PATH
+
+    - name: Install Nim
+      uses: iffy/install-nim@v5
+      with:
+        version: binary:2.2.4
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Add paths
       run: |
         echo "/usr/bin:$PATH" >> $GITHUB_PATH
         echo "/mingw64/bin:$PATH" >> $GITHUB_PATH
@@ -61,31 +69,10 @@ jobs:
 
     - name: Verify dependencies
       run: |
-        which upx gcc g++ make cmake cargo rustc python nasm
+        which upx gcc g++ make cmake cargo rustc python nasm nimble
 
-    - name: Updating submodules
-      run: git submodule update --init --recursive
-
-    - name: Creating tmp directory
-      run: mkdir -p tmp
-
-    - name: Building Nim
-      run: |
-        cd vendor/nimbus-build-system/vendor/Nim
-        ./build_all.bat
-        cd ../../../..
-
-    - name: Building miniupnpc
-      run: |
-        cd vendor/nim-nat-traversal/vendor/miniupnp/miniupnpc
-        make -f Makefile.mingw CC=gcc CXX=g++ libminiupnpc.a V=1
-        cd ../../../../..
-
-    - name: Building libnatpmp
-      run: |
-        cd ./vendor/nim-nat-traversal/vendor/libnatpmp-upstream
-        make CC="gcc -fPIC -D_WIN32_WINNT=0x0600 -DNATPMP_STATICLIB" libnatpmp.a V=1
-        cd ../../../../
+    - name: Make update
+      run: make update
 
     - name: Building wakunode2.exe
       run: |
diff --git a/.gitmodules b/.gitmodules
index 6a63491e3..ac07235b8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,197 +1,10 @@
-[submodule "vendor/nim-eth"]
-	path = vendor/nim-eth
-	url = https://github.com/status-im/nim-eth.git
-	ignore = dirty
-	branch = master
-[submodule "vendor/nim-secp256k1"]
-	path = vendor/nim-secp256k1
-	url = https://github.com/status-im/nim-secp256k1.git
-	ignore = dirty
-	branch = master
-[submodule "vendor/nim-libp2p"]
-	path = vendor/nim-libp2p
-	url = https://github.com/vacp2p/nim-libp2p.git
-	ignore = dirty
-	branch = master
-[submodule "vendor/nim-stew"]
-	path = vendor/nim-stew
-	url = https://github.com/status-im/nim-stew.git
-	ignore = dirty
-	branch = master
-[submodule "vendor/nimbus-build-system"]
-	path = vendor/nimbus-build-system
-	url = https://github.com/status-im/nimbus-build-system.git
-	ignore = dirty
-	branch = master
-[submodule "vendor/nim-nat-traversal"]
-	path = vendor/nim-nat-traversal
-	url = https://github.com/status-im/nim-nat-traversal.git
-	ignore = dirty
-	branch = master
-[submodule "vendor/nim-libbacktrace"]
-	path = vendor/nim-libbacktrace
-	url = https://github.com/status-im/nim-libbacktrace.git
-	ignore = dirty
-	branch = master
-[submodule "vendor/nim-confutils"]
-	path = vendor/nim-confutils
-	url = https://github.com/status-im/nim-confutils.git
-	ignore = dirty
-	branch = master
-[submodule "vendor/nim-chronicles"]
-	path = vendor/nim-chronicles
-	url = https://github.com/status-im/nim-chronicles.git
-	ignore = dirty
-	branch = master
-[submodule "vendor/nim-faststreams"]
-	path = vendor/nim-faststreams
-	url = https://github.com/status-im/nim-faststreams.git
-	ignore = dirty
-	branch = master
-[submodule "vendor/nim-chronos"]
-	path = vendor/nim-chronos
-	url = https://github.com/status-im/nim-chronos.git
-	ignore = dirty
-	branch = master
-[submodule "vendor/nim-json-serialization"]
-	path = vendor/nim-json-serialization
-	url = https://github.com/status-im/nim-json-serialization.git
-	ignore = dirty
-	branch = master
-[submodule "vendor/nim-serialization"]
-	path = vendor/nim-serialization
-	url = https://github.com/status-im/nim-serialization.git
-	ignore = dirty
-	branch = master
-[submodule "vendor/nimcrypto"]
-	path = vendor/nimcrypto
-	url = https://github.com/cheatfate/nimcrypto.git
-	ignore = dirty
-	branch = master
-[submodule "vendor/nim-metrics"]
-	path = vendor/nim-metrics
-	url = https://github.com/status-im/nim-metrics.git
-	ignore = dirty
-	branch = master
-[submodule "vendor/nim-stint"]
-	path = vendor/nim-stint
-	url = https://github.com/status-im/nim-stint.git
-	ignore = dirty
-	branch = master
-[submodule "vendor/nim-json-rpc"]
-	path = vendor/nim-json-rpc
-	url = https://github.com/status-im/nim-json-rpc.git
-	ignore = dirty
-	branch = master
-[submodule "vendor/nim-http-utils"]
-	path = vendor/nim-http-utils
-	url = https://github.com/status-im/nim-http-utils.git
-	ignore = dirty
-	branch = master
-[submodule "vendor/nim-bearssl"]
-	path = vendor/nim-bearssl
-	url = https://github.com/status-im/nim-bearssl.git
-	ignore = dirty
-	branch = master
-[submodule "vendor/nim-sqlite3-abi"]
-	path = vendor/nim-sqlite3-abi
-	url = https://github.com/arnetheduck/nim-sqlite3-abi.git
-	ignore = dirty
-	branch = master
-[submodule "vendor/nim-web3"]
-	path = vendor/nim-web3
-	url = https://github.com/status-im/nim-web3.git
-[submodule "vendor/nim-testutils"]
-	path = vendor/nim-testutils
-	url = https://github.com/status-im/nim-testutils.git
-	ignore = untracked
-	branch = master
-[submodule "vendor/nim-unittest2"]
-	path = vendor/nim-unittest2
-	url = https://github.com/status-im/nim-unittest2.git
-	ignore = untracked
-	branch = master
-[submodule "vendor/nim-websock"]
-	path = vendor/nim-websock
-	url = https://github.com/status-im/nim-websock.git
-	ignore = untracked
-	branch = main
-[submodule "vendor/nim-zlib"]
-	path = vendor/nim-zlib
-	url = https://github.com/status-im/nim-zlib.git
-	ignore = untracked
-	branch = master
-[submodule "vendor/nim-dnsdisc"]
-	path = vendor/nim-dnsdisc
-	url = https://github.com/status-im/nim-dnsdisc.git
-	ignore = untracked
-	branch = main
-[submodule "vendor/dnsclient.nim"]
-	path = vendor/dnsclient.nim
-	url = https://github.com/ba0f3/dnsclient.nim.git
-	ignore = untracked
-	branch = master
-[submodule "vendor/nim-toml-serialization"]
-	path = vendor/nim-toml-serialization
-	url = https://github.com/status-im/nim-toml-serialization.git
-[submodule "vendor/nim-presto"]
-	path = vendor/nim-presto
-	url = https://github.com/status-im/nim-presto.git
-	ignore = untracked
-	branch = master
 [submodule "vendor/zerokit"]
 	path = vendor/zerokit
 	url = https://github.com/vacp2p/zerokit.git
 	ignore = dirty
 	branch = v0.5.1
-[submodule "vendor/nim-regex"]
-	path = vendor/nim-regex
-	url = https://github.com/nitely/nim-regex.git
-	ignore = untracked
-	branch = master
-[submodule "vendor/nim-unicodedb"]
-	path = vendor/nim-unicodedb
-	url = https://github.com/nitely/nim-unicodedb.git
-	ignore = untracked
-	branch = master
-[submodule "vendor/nim-taskpools"]
-	path = vendor/nim-taskpools
-	url = https://github.com/status-im/nim-taskpools.git
-	ignore = untracked
-	branch = stable
-[submodule "vendor/nim-results"]
-	ignore = untracked
-	branch = master
-	path = vendor/nim-results
-	url = https://github.com/arnetheduck/nim-results.git
-[submodule "vendor/db_connector"]
-	path = vendor/db_connector
-	url = https://github.com/nim-lang/db_connector.git
-	ignore = untracked
-	branch = devel
-[submodule "vendor/nph"]
-	ignore = untracked
-	branch = master
-	path = vendor/nph
-	url = https://github.com/arnetheduck/nph.git
-[submodule "vendor/nim-minilru"]
-	path = vendor/nim-minilru
-	url = https://github.com/status-im/nim-minilru.git
-	ignore = untracked
-	branch = master
 [submodule "vendor/waku-rlnv2-contract"]
 	path = vendor/waku-rlnv2-contract
 	url = https://github.com/logos-messaging/waku-rlnv2-contract.git
 	ignore = untracked
 	branch = master
-[submodule "vendor/nim-lsquic"]
-	path = vendor/nim-lsquic
-	url = https://github.com/vacp2p/nim-lsquic
-[submodule "vendor/nim-jwt"]
-	path = vendor/nim-jwt
-	url = https://github.com/vacp2p/nim-jwt.git
-[submodule "vendor/nim-ffi"]
-	path = vendor/nim-ffi
-	url = https://github.com/logos-messaging/nim-ffi/
-	ignore = untracked
-	branch = master
diff --git a/Makefile b/Makefile
index 6457b3c0f..dead03e98 100644
--- a/Makefile
+++ b/Makefile
@@ -4,28 +4,10 @@
 # - MIT license
 # at your option. This file may not be copied, modified, or distributed except
 # according to those terms.
-export BUILD_SYSTEM_DIR := vendor/nimbus-build-system
-export EXCLUDED_NIM_PACKAGES := vendor/nim-dnsdisc/vendor
+
 LINK_PCRE := 0
 FORMAT_MSG := "\\x1B[95mFormatting:\\x1B[39m"
-# we don't want an error here, so we can handle things later, in the ".DEFAULT" target
--include $(BUILD_SYSTEM_DIR)/makefiles/variables.mk
-
-
-ifeq ($(NIM_PARAMS),)
-# "variables.mk" was not included, so we update the submodules.
-GIT_SUBMODULE_UPDATE := git submodule update --init --recursive
-.DEFAULT:
-	+@ echo -e "Git submodules not found. Running '$(GIT_SUBMODULE_UPDATE)'.\n"; \
-		$(GIT_SUBMODULE_UPDATE); \
-		echo
-# Now that the included *.mk files appeared, and are newer than this file, Make will restart itself:
-# https://www.gnu.org/software/make/manual/make.html#Remaking-Makefiles
-#
-# After restarting, it will execute its original goal, so we don't have to start a child Make here
-# with "$(MAKE) $(MAKECMDGOALS)". Isn't hidden control flow great?
-
-else # "variables.mk" was included. Business as usual until the end of this file.
+BUILD_MSG := "\\x1B[92mBuilding:\\x1B[39m"
 
 # Determine the OS
 detected_OS := $(shell uname -s)
@@ -33,28 +15,29 @@ ifneq (,$(findstring MINGW,$(detected_OS)))
   detected_OS := Windows
 endif
 
+# NIM binary location
+NIM_BINARY := $(shell which nim)
+NPH := $(shell dirname $(NIM_BINARY))/nph
+
+# Compilation parameters
+NIM_PARAMS ?=
+
 ifeq ($(detected_OS),Windows)
-  # Update MINGW_PATH to standard MinGW location
   MINGW_PATH = /mingw64
   NIM_PARAMS += --passC:"-I$(MINGW_PATH)/include"
   NIM_PARAMS += --passL:"-L$(MINGW_PATH)/lib"
-  NIM_PARAMS += --passL:"-Lvendor/nim-nat-traversal/vendor/miniupnp/miniupnpc"
-  NIM_PARAMS += --passL:"-Lvendor/nim-nat-traversal/vendor/libnatpmp-upstream"
-
-  LIBS = -lws2_32 -lbcrypt -liphlpapi -luserenv -lntdll -lminiupnpc -lnatpmp -lpq
+  LIBS = -lws2_32 -lbcrypt -liphlpapi -luserenv -lntdll -lpq
   NIM_PARAMS += $(foreach lib,$(LIBS),--passL:"$(lib)")
   NIM_PARAMS += --passL:"-Wl,--allow-multiple-definition"
-
   export PATH := /c/msys64/usr/bin:/c/msys64/mingw64/bin:/c/msys64/usr/lib:/c/msys64/mingw64/lib:$(PATH)
-
 endif
 
 ##########
 ## Main ##
 ##########
-.PHONY: all test update clean examples
+.PHONY: all test update clean examples deps
 
-# default target, because it's the first one that doesn't start with '.'
+# default target
 all: | wakunode2 libwaku
 
 examples: | example2 chat2 chat2bridge
@@ -71,78 +54,49 @@ ifeq ($(strip $(test_file)),)
 else
 	$(MAKE) compile-test TEST_FILE="$(test_file)" TEST_NAME="$(call test_name)"
 endif
-# this prevents make from erroring on unknown targets like "Index"
+
+# this prevents make from erroring on unknown targets
 %:
 	@true
 
 waku.nims:
 	ln -s waku.nimble $@
 
-update: | update-common
-	rm -rf waku.nims && \
-		$(MAKE) waku.nims $(HANDLE_OUTPUT)
+update: | waku.nims
+	git submodule update --init --recursive
+	nimble setup -y
 	$(MAKE) build-nph
 
 clean:
 	rm -rf build
+	rm -rf ~/.nimble/pkgs2
+	rm -rf ~/.nimble/pkgcache
 
-# must be included after the default target
--include $(BUILD_SYSTEM_DIR)/makefiles/targets.mk
+build:
+	mkdir -p build
 
 ## Possible values: prod; debug
 TARGET ?= prod
 
 ## Git version
 GIT_VERSION ?= $(shell git describe --abbrev=6 --always --tags)
-## Compilation parameters. If defined in the CLI the assignments won't be executed
 NIM_PARAMS := $(NIM_PARAMS) -d:git_version=\"$(GIT_VERSION)\"
 
 ## Heaptracker options
 HEAPTRACKER ?= 0
 HEAPTRACKER_INJECT ?= 0
 ifeq ($(HEAPTRACKER), 1)
-# Assumes Nim's lib/system/alloc.nim is patched!
 TARGET := debug-with-heaptrack
-
 ifeq ($(HEAPTRACKER_INJECT), 1)
-# the Nim compiler will load 'libheaptrack_inject.so'
 HEAPTRACK_PARAMS := -d:heaptracker -d:heaptracker_inject
 NIM_PARAMS := $(NIM_PARAMS) -d:heaptracker -d:heaptracker_inject
 else
-# the Nim compiler will load 'libheaptrack_preload.so'
 HEAPTRACK_PARAMS := -d:heaptracker
 NIM_PARAMS := $(NIM_PARAMS) -d:heaptracker
 endif
-
-endif
-## end of Heaptracker options
-
-##################
-## Dependencies ##
-##################
-.PHONY: deps libbacktrace
-
-FOUNDRY_VERSION := 1.5.0
-PNPM_VERSION := 10.23.0
-
-
-rustup:
-ifeq (, $(shell which cargo))
-# Install Rustup if it's not installed
-# -y: Assume "yes" for all prompts
-# --default-toolchain stable: Install the stable toolchain
-	curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable
 endif
 
-rln-deps: rustup
-	./scripts/install_rln_tests_dependencies.sh $(FOUNDRY_VERSION) $(PNPM_VERSION)
-
-deps: | deps-common nat-libs waku.nims
-
-
-### nim-libbacktrace
-
-# "-d:release" implies "--stacktrace:off" and it cannot be added to config.nims
+# Debug/Release mode
 ifeq ($(DEBUG), 0)
 NIM_PARAMS := $(NIM_PARAMS) -d:release
 else
@@ -156,17 +110,6 @@ endif
 # enable experimental exit is dest feature in libp2p mix
 NIM_PARAMS := $(NIM_PARAMS) -d:libp2p_mix_experimental_exit_is_dest
 
-libbacktrace:
-	+ $(MAKE) -C vendor/nim-libbacktrace --no-print-directory BUILD_CXX_LIB=0
-
-clean-libbacktrace:
-	+ $(MAKE) -C vendor/nim-libbacktrace clean $(HANDLE_OUTPUT)
-
-# Extend deps and clean targets
-ifneq ($(USE_LIBBACKTRACE), 0)
-deps: | libbacktrace
-endif
-
 ifeq ($(POSTGRES), 1)
 NIM_PARAMS := $(NIM_PARAMS) -d:postgres -d:nimDebugDlOpen
 endif
@@ -175,14 +118,28 @@ ifeq ($(DEBUG_DISCV5), 1)
 NIM_PARAMS := $(NIM_PARAMS) -d:debugDiscv5
 endif
 
-clean: | clean-libbacktrace
+# Export NIM_PARAMS so nimble can access it
+export NIM_PARAMS
 
-### Create nimble links (used when building with Nix)
+##################
+## Dependencies ##
+##################
+.PHONY: deps
 
-nimbus-build-system-nimble-dir:
-	NIMBLE_DIR="$(CURDIR)/$(NIMBLE_DIR)" \
-	PWD_CMD="$(PWD)" \
-	$(CURDIR)/scripts/generate_nimble_links.sh
+FOUNDRY_VERSION := 1.5.0
+PNPM_VERSION := 10.23.0
+
+rustup:
+ifeq (, $(shell which cargo))
+	curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable
+endif
+
+rln-deps: rustup
+	./scripts/install_rln_tests_dependencies.sh $(FOUNDRY_VERSION) $(PNPM_VERSION)
+
+# Install nimble dependencies
+deps: | build waku.nims
+	nimble install -d -y
 
 ##################
 ##     RLN      ##
@@ -209,7 +166,6 @@ clean-librln:
 	cargo clean --manifest-path vendor/zerokit/rln/Cargo.toml
 	rm -f $(LIBRLN_FILE)
 
-# Extend clean target
 clean: | clean-librln
 
 #################
@@ -219,59 +175,56 @@ clean: | clean-librln
 
 testcommon: | build deps
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim testcommon $(NIM_PARAMS) waku.nims
-
+		nimble testcommon
 
 ##########
 ## Waku ##
 ##########
 .PHONY: testwaku wakunode2 testwakunode2 example2 chat2 chat2bridge liteprotocoltester
 
-# install rln-deps only for the testwaku target
 testwaku: | build deps rln-deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim test -d:os=$(shell uname) $(NIM_PARAMS) waku.nims
+		nimble test
 
 wakunode2: | build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-	\
-		$(ENV_SCRIPT) nim wakunode2 $(NIM_PARAMS) waku.nims
+		nimble wakunode2
 
 benchmarks: | build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim benchmarks $(NIM_PARAMS) waku.nims
+		nimble benchmarks
 
 testwakunode2: | build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim testwakunode2 $(NIM_PARAMS) waku.nims
+		nimble testwakunode2
 
 example2: | build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim example2 $(NIM_PARAMS) waku.nims
+		nimble example2
 
 chat2: | build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim chat2 $(NIM_PARAMS) waku.nims
+		nimble chat2
 
 chat2mix: | build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim chat2mix $(NIM_PARAMS) waku.nims
+		nimble chat2mix
 
 rln-db-inspector: | build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-	$(ENV_SCRIPT) nim rln_db_inspector $(NIM_PARAMS) waku.nims
+		nimble rln_db_inspector
 
 chat2bridge: | build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim chat2bridge $(NIM_PARAMS) waku.nims
+		nimble chat2bridge
 
 liteprotocoltester: | build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim liteprotocoltester $(NIM_PARAMS) waku.nims
+		nimble liteprotocoltester
 
 lightpushwithmix: | build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim lightpushwithmix $(NIM_PARAMS) waku.nims
+		nimble lightpushwithmix
 
 api_example: | build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
@@ -279,12 +232,12 @@ api_example: | build deps librln
 
 build/%: | build deps librln
 	echo -e $(BUILD_MSG) "build/$*" && \
-		$(ENV_SCRIPT) nim buildone $(NIM_PARAMS) waku.nims $*
+		nimble buildone $*
 
 compile-test: | build deps librln
 	echo -e $(BUILD_MSG) "$(TEST_FILE)" "\"$(TEST_NAME)\"" && \
-		$(ENV_SCRIPT) nim buildTest $(NIM_PARAMS) waku.nims $(TEST_FILE) && \
-		$(ENV_SCRIPT) nim execTest $(NIM_PARAMS) waku.nims $(TEST_FILE) "\"$(TEST_NAME)\""; \
+		nimble buildTest $(TEST_FILE) && \
+		nimble execTest $(TEST_FILE) "\"$(TEST_NAME)\""
 
 ################
 ## Waku tools ##
@@ -295,27 +248,23 @@ tools: networkmonitor wakucanary
 
 wakucanary: | build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim wakucanary $(NIM_PARAMS) waku.nims
+		nimble wakucanary
 
 networkmonitor: | build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim networkmonitor $(NIM_PARAMS) waku.nims
+		nimble networkmonitor
 
 ############
 ## Format ##
 ############
 .PHONY: build-nph install-nph clean-nph print-nph-path
 
-# Default location for nph binary shall be next to nim binary to make it available on the path.
-NPH:=$(shell dirname $(NIM_BINARY))/nph
-
 build-nph: | build deps
 ifeq ("$(wildcard $(NPH))","")
-		$(ENV_SCRIPT) nim c --skipParentCfg:on vendor/nph/src/nph.nim && \
-		mv vendor/nph/src/nph $(shell dirname $(NPH))
-		echo "nph utility is available at " $(NPH)
+	nimble install nph -y
+	echo "nph utility is available"
 else
-		echo "nph utility already exists at " $(NPH)
+	echo "nph utility already exists at " $(NPH)
 endif
 
 GIT_PRE_COMMIT_HOOK := .git/hooks/pre-commit
@@ -335,9 +284,8 @@ nph/%: | build-nph
 clean-nph:
 	rm -f $(NPH)
 
-# To avoid hardcoding nph binary location in several places
 print-nph-path:
-	echo "$(NPH)"
+	@echo "$(NPH)"
 
 clean: | clean-nph
 
@@ -346,25 +294,20 @@ clean: | clean-nph
 ###################
 .PHONY: docs coverage
 
-# TODO: Remove unused target
 docs: | build deps
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim doc --run --index:on --project --out:.gh-pages waku/waku.nim waku.nims
+		nimble doc --run --index:on --project --out:.gh-pages waku/waku.nim waku.nims
 
 coverage:
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) ./scripts/run_cov.sh -y
-
+		./scripts/run_cov.sh -y
 
 #####################
 ## Container image ##
 #####################
-# -d:insecure - Necessary to enable Prometheus HTTP endpoint for metrics
-# -d:chronicles_colors:none - Necessary to disable colors in logs for Docker
 DOCKER_IMAGE_NIMFLAGS ?= -d:chronicles_colors:none -d:insecure -d:postgres
 DOCKER_IMAGE_NIMFLAGS := $(DOCKER_IMAGE_NIMFLAGS) $(HEAPTRACK_PARAMS)
 
-# build a docker image for the fleet
 docker-image: MAKE_TARGET ?= wakunode2
 docker-image: DOCKER_IMAGE_TAG ?= $(MAKE_TARGET)-$(GIT_VERSION)
 docker-image: DOCKER_IMAGE_NAME ?= wakuorg/nwaku:$(DOCKER_IMAGE_TAG)
@@ -372,7 +315,6 @@ docker-image:
 	docker build \
 		--build-arg="MAKE_TARGET=$(MAKE_TARGET)" \
 		--build-arg="NIMFLAGS=$(DOCKER_IMAGE_NIMFLAGS)" \
-		--build-arg="NIM_COMMIT=$(DOCKER_NIM_COMMIT)" \
 		--build-arg="LOG_LEVEL=$(LOG_LEVEL)" \
 		--build-arg="HEAPTRACK_BUILD=$(HEAPTRACKER)" \
 		--label="commit=$(shell git rev-parse HEAD)" \
@@ -398,19 +340,14 @@ docker-push:
 ####################################
 ## Container lite-protocol-tester ##
 ####################################
-# -d:insecure - Necessary to enable Prometheus HTTP endpoint for metrics
-# -d:chronicles_colors:none - Necessary to disable colors in logs for Docker
 DOCKER_LPT_NIMFLAGS ?= -d:chronicles_colors:none -d:insecure
 
-# build a docker image for the fleet
 docker-liteprotocoltester: DOCKER_LPT_TAG ?= latest
 docker-liteprotocoltester: DOCKER_LPT_NAME ?= wakuorg/liteprotocoltester:$(DOCKER_LPT_TAG)
-# --no-cache
 docker-liteprotocoltester:
 	docker build \
 		--build-arg="MAKE_TARGET=liteprotocoltester" \
 		--build-arg="NIMFLAGS=$(DOCKER_LPT_NIMFLAGS)" \
-		--build-arg="NIM_COMMIT=$(DOCKER_NIM_COMMIT)" \
 		--build-arg="LOG_LEVEL=TRACE" \
 		--label="commit=$(shell git rev-parse HEAD)" \
 		--label="version=$(GIT_VERSION)" \
@@ -430,7 +367,6 @@ docker-quick-liteprotocoltester: | liteprotocoltester
 docker-liteprotocoltester-push:
 	docker push $(DOCKER_LPT_NAME)
 
-
 ################
 ## C Bindings ##
 ################
@@ -457,19 +393,37 @@ ifeq ($(STATIC), 1)
 endif
 
 libwaku: | build deps librln
-	echo -e $(BUILD_MSG) "build/$@.$(LIB_EXT)" && $(ENV_SCRIPT) nim $(BUILD_COMMAND) $(NIM_PARAMS) waku.nims $@.$(LIB_EXT)
+	echo -e $(BUILD_MSG) "build/$@.$(LIB_EXT)" && nimble $(BUILD_COMMAND) $@.$(LIB_EXT)
+
+cwaku_example: | build libwaku
+	echo -e $(BUILD_MSG) "build/$@" && \
+		cc -o "build/$@" \
+		./examples/cbindings/waku_example.c \
+		./examples/cbindings/base64.c \
+		-lwaku -Lbuild/ \
+		-pthread -ldl -lm
+
+cppwaku_example: | build libwaku
+	echo -e $(BUILD_MSG) "build/$@" && \
+		g++ -o "build/$@" \
+		./examples/cpp/waku.cpp \
+		./examples/cpp/base64.cpp \
+		-lwaku -Lbuild/ \
+		-pthread -ldl -lm
+
+nodejswaku: | build deps
+	echo -e $(BUILD_MSG) "build/$@" && \
+		node-gyp build --directory=examples/nodejs/
 
 #####################
 ## Mobile Bindings ##
 #####################
 .PHONY: libwaku-android \
-				libwaku-android-precheck \
-				libwaku-android-arm64 \
-				libwaku-android-amd64 \
-				libwaku-android-x86 \
-				libwaku-android-arm \
-				rebuild-nat-libs \
-				build-libwaku-for-android-arch
+		libwaku-android-precheck \
+		libwaku-android-arm64 \
+		libwaku-android-amd64 \
+		libwaku-android-x86 \
+		libwaku-android-arm
 
 ANDROID_TARGET ?= 30
 ifeq ($(detected_OS),Darwin)
@@ -478,22 +432,18 @@ else
 	ANDROID_TOOLCHAIN_DIR := $(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/linux-x86_64
 endif
 
-rebuild-nat-libs: | clean-cross nat-libs
-
 libwaku-android-precheck:
 ifndef ANDROID_NDK_HOME
-		$(error ANDROID_NDK_HOME is not set)
+	$(error ANDROID_NDK_HOME is not set)
 endif
 
 build-libwaku-for-android-arch:
-ifneq ($(findstring /nix/store,$(LIBRLN_FILE)),)
 	mkdir -p $(CURDIR)/build/android/$(ABIDIR)/
-	cp $(LIBRLN_FILE) $(CURDIR)/build/android/$(ABIDIR)/
+	CPU=$(CPU) ABIDIR=$(ABIDIR) ANDROID_ARCH=$(ANDROID_ARCH) ANDROID_COMPILER=$(ANDROID_COMPILER) ANDROID_TOOLCHAIN_DIR=$(ANDROID_TOOLCHAIN_DIR) nimble libWakuAndroid
 else
 	./scripts/build_rln_android.sh $(CURDIR)/build $(LIBRLN_BUILDDIR) $(LIBRLN_VERSION) $(CROSS_TARGET) $(ABIDIR)
 endif
 	$(MAKE) rebuild-nat-libs CC=$(ANDROID_TOOLCHAIN_DIR)/bin/$(ANDROID_COMPILER)
-	CPU=$(CPU) ABIDIR=$(ABIDIR) ANDROID_ARCH=$(ANDROID_ARCH) ANDROID_COMPILER=$(ANDROID_COMPILER) ANDROID_TOOLCHAIN_DIR=$(ANDROID_TOOLCHAIN_DIR) $(ENV_SCRIPT) nim libWakuAndroid $(NIM_PARAMS) waku.nims
 
 libwaku-android-arm64: ANDROID_ARCH=aarch64-linux-android
 libwaku-android-arm64: CPU=arm64
@@ -517,29 +467,23 @@ libwaku-android-arm: ANDROID_ARCH=armv7a-linux-androideabi
 libwaku-android-arm: CPU=arm
 libwaku-android-arm: ABIDIR=armeabi-v7a
 libwaku-android-arm: | libwaku-android-precheck build deps
-# cross-rs target architecture name does not match the one used in android
 	$(MAKE) build-libwaku-for-android-arch ANDROID_ARCH=$(ANDROID_ARCH) CROSS_TARGET=armv7-linux-androideabi CPU=$(CPU) ABIDIR=$(ABIDIR) ANDROID_COMPILER=$(ANDROID_ARCH)$(ANDROID_TARGET)-clang
 
 libwaku-android:
 	$(MAKE) libwaku-android-amd64
 	$(MAKE) libwaku-android-arm64
 	$(MAKE) libwaku-android-x86
-# This target is disabled because on recent versions of cross-rs complain with the following error
-# relocation R_ARM_THM_ALU_PREL_11_0 cannot be used against symbol 'stack_init_trampoline_return'; recompile with -fPIC
-# It's likely this architecture is not used so we might just not support it.
-#	$(MAKE) libwaku-android-arm
 
 #################
 ## iOS Bindings #
 #################
 .PHONY: libwaku-ios-precheck \
-				libwaku-ios-device \
-				libwaku-ios-simulator \
-				libwaku-ios
+		libwaku-ios-device \
+		libwaku-ios-simulator \
+		libwaku-ios
 
 IOS_DEPLOYMENT_TARGET ?= 18.0
 
-# Get SDK paths dynamically using xcrun
 define get_ios_sdk_path
 $(shell xcrun --sdk $(1) --show-sdk-path 2>/dev/null)
 endef
@@ -551,59 +495,25 @@ else
 	$(error iOS builds are only supported on macOS)
 endif
 
-# Build for iOS architecture
 build-libwaku-for-ios-arch:
-	IOS_SDK=$(IOS_SDK) IOS_ARCH=$(IOS_ARCH) IOS_SDK_PATH=$(IOS_SDK_PATH) $(ENV_SCRIPT) nim libWakuIOS $(NIM_PARAMS) waku.nims
+	IOS_SDK=$(IOS_SDK) IOS_ARCH=$(IOS_ARCH) IOS_SDK_PATH=$(IOS_SDK_PATH) nimble libWakuIOS
 
-# iOS device (arm64)
 libwaku-ios-device: IOS_ARCH=arm64
 libwaku-ios-device: IOS_SDK=iphoneos
 libwaku-ios-device: IOS_SDK_PATH=$(call get_ios_sdk_path,iphoneos)
 libwaku-ios-device: | libwaku-ios-precheck build deps
 	$(MAKE) build-libwaku-for-ios-arch IOS_ARCH=$(IOS_ARCH) IOS_SDK=$(IOS_SDK) IOS_SDK_PATH=$(IOS_SDK_PATH)
 
-# iOS simulator (arm64 - Apple Silicon Macs)
 libwaku-ios-simulator: IOS_ARCH=arm64
 libwaku-ios-simulator: IOS_SDK=iphonesimulator
 libwaku-ios-simulator: IOS_SDK_PATH=$(call get_ios_sdk_path,iphonesimulator)
 libwaku-ios-simulator: | libwaku-ios-precheck build deps
 	$(MAKE) build-libwaku-for-ios-arch IOS_ARCH=$(IOS_ARCH) IOS_SDK=$(IOS_SDK) IOS_SDK_PATH=$(IOS_SDK_PATH)
 
-# Build all iOS targets
 libwaku-ios:
 	$(MAKE) libwaku-ios-device
 	$(MAKE) libwaku-ios-simulator
 
-cwaku_example: | build libwaku
-	echo -e $(BUILD_MSG) "build/$@" && \
-		cc -o "build/$@" \
-		./examples/cbindings/waku_example.c \
-		./examples/cbindings/base64.c \
-		-lwaku -Lbuild/ \
-		-pthread -ldl -lm \
-		-lminiupnpc -Lvendor/nim-nat-traversal/vendor/miniupnp/miniupnpc/build/ \
-		-lnatpmp -Lvendor/nim-nat-traversal/vendor/libnatpmp-upstream/ \
-		vendor/nim-libbacktrace/libbacktrace_wrapper.o \
-		vendor/nim-libbacktrace/install/usr/lib/libbacktrace.a
-
-cppwaku_example: | build libwaku
-	echo -e $(BUILD_MSG) "build/$@" && \
-		g++ -o "build/$@" \
-		./examples/cpp/waku.cpp \
-		./examples/cpp/base64.cpp \
-		-lwaku -Lbuild/ \
-		-pthread -ldl -lm \
-		-lminiupnpc -Lvendor/nim-nat-traversal/vendor/miniupnp/miniupnpc/build/ \
-		-lnatpmp -Lvendor/nim-nat-traversal/vendor/libnatpmp-upstream/ \
-		vendor/nim-libbacktrace/libbacktrace_wrapper.o \
-		vendor/nim-libbacktrace/install/usr/lib/libbacktrace.a
-
-nodejswaku: | build deps
-		echo -e $(BUILD_MSG) "build/$@" && \
-		node-gyp build --directory=examples/nodejs/
-
-endif # "variables.mk" was not included
-
 ###################
 # Release Targets #
 ###################
@@ -617,5 +527,3 @@ release-notes:
 		docker.io/wakuorg/sv4git:latest \
 			release-notes |\
 			sed -E 's@#([0-9]+)@[#\1](https://github.com/waku-org/nwaku/issues/\1)@g'
-# I could not get the tool to replace issue ids with links, so using sed for now,
-# asked here: https://github.com/bvieira/sv4git/discussions/101
diff --git a/apps/chat2/chat2.nim b/apps/chat2/chat2.nim
index 71d8a4e6a..e5a0efa33 100644
--- a/apps/chat2/chat2.nim
+++ b/apps/chat2/chat2.nim
@@ -13,7 +13,8 @@ import
   chronos,
   eth/keys,
   bearssl,
-  stew/[byteutils, results],
+  stew/byteutils,
+  results,
   metrics,
   metrics/chronos_httpserver
 import
diff --git a/config.nims b/config.nims
index f74fe183f..ba2ae98d4 100644
--- a/config.nims
+++ b/config.nims
@@ -125,3 +125,8 @@ if defined(android):
   switch("passC", "--sysroot=" & sysRoot)
   switch("passL", "--sysroot=" & sysRoot)
   switch("cincludes", sysRoot & "/usr/include/")
+# begin Nimble config (version 2)
+--noNimblePath
+when withDir(thisDir(), system.fileExists("nimble.paths")):
+  include "nimble.paths"
+# end Nimble config
diff --git a/nimble.lock b/nimble.lock
new file mode 100644
index 000000000..054ddafce
--- /dev/null
+++ b/nimble.lock
@@ -0,0 +1,586 @@
+{
+  "version": 2,
+  "packages": {
+    "unittest2": {
+      "version": "0.2.5",
+      "vcsRevision": "26f2ef3ae0ec72a2a75bfe557e02e88f6a31c189",
+      "url": "https://github.com/status-im/nim-unittest2",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "02bb3751ba9ddc3c17bfd89f2e41cb6bfb8fc0c9"
+      }
+    },
+    "bearssl": {
+      "version": "0.2.6",
+      "vcsRevision": "11e798b62b8e6beabe958e048e9e24c7e0f9ee63",
+      "url": "https://github.com/status-im/nim-bearssl",
+      "downloadMethod": "git",
+      "dependencies": [
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "7e068f119664cf47ad0cfb74ef4c56fb6b616523"
+      }
+    },
+    "bearssl_pkey_decoder": {
+      "version": "0.1.0",
+      "vcsRevision": "21dd3710df9345ed2ad8bf8f882761e07863b8e0",
+      "url": "https://github.com/vacp2p/bearssl_pkey_decoder",
+      "downloadMethod": "git",
+      "dependencies": [
+        "bearssl"
+      ],
+      "checksums": {
+        "sha1": "21b42e2e6ddca6c875d3fc50f36a5115abf51714"
+      }
+    },
+    "results": {
+      "version": "0.5.1",
+      "vcsRevision": "df8113dda4c2d74d460a8fa98252b0b771bf1f27",
+      "url": "https://github.com/arnetheduck/nim-results",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "a9c011f74bc9ed5c91103917b9f382b12e82a9e7"
+      }
+    },
+    "stew": {
+      "version": "0.4.2",
+      "vcsRevision": "b66168735d6f3841c5239c3169d3fe5fe98b1257",
+      "url": "https://github.com/status-im/nim-stew",
+      "downloadMethod": "git",
+      "dependencies": [
+        "results",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "928e82cb8d2f554e8f10feb2349ee9c32fee3a8c"
+      }
+    },
+    "faststreams": {
+      "version": "0.5.0",
+      "vcsRevision": "ce27581a3e881f782f482cb66dc5b07a02bd615e",
+      "url": "https://github.com/status-im/nim-faststreams",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "ee61e507b805ae1df7ec936f03f2d101b0d72383"
+      }
+    },
+    "serialization": {
+      "version": "0.5.2",
+      "vcsRevision": "b0f2fa32960ea532a184394b0f27be37bd80248b",
+      "url": "https://github.com/status-im/nim-serialization",
+      "downloadMethod": "git",
+      "dependencies": [
+        "faststreams",
+        "unittest2",
+        "stew"
+      ],
+      "checksums": {
+        "sha1": "fa35c1bb76a0a02a2379fe86eaae0957c7527cb8"
+      }
+    },
+    "json_serialization": {
+      "version": "0.4.4",
+      "vcsRevision": "c343b0e243d9e17e2c40f3a8a24340f7c4a71d44",
+      "url": "https://github.com/status-im/nim-json-serialization",
+      "downloadMethod": "git",
+      "dependencies": [
+        "faststreams",
+        "serialization",
+        "stew",
+        "results"
+      ],
+      "checksums": {
+        "sha1": "8b3115354104858a0ac9019356fb29720529c2bd"
+      }
+    },
+    "testutils": {
+      "version": "0.8.0",
+      "vcsRevision": "e4d37dc1652d5c63afb89907efb5a5e812261797",
+      "url": "https://github.com/status-im/nim-testutils",
+      "downloadMethod": "git",
+      "dependencies": [
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "d1678f50aa47d113b4e77d41eec2190830b523fa"
+      }
+    },
+    "chronicles": {
+      "version": "0.12.2",
+      "vcsRevision": "27ec507429a4eb81edc20f28292ee8ec420be05b",
+      "url": "https://github.com/status-im/nim-chronicles",
+      "downloadMethod": "git",
+      "dependencies": [
+        "faststreams",
+        "serialization",
+        "json_serialization",
+        "testutils"
+      ],
+      "checksums": {
+        "sha1": "02febb20d088120b2836d3306cfa21f434f88f65"
+      }
+    },
+    "httputils": {
+      "version": "0.4.0",
+      "vcsRevision": "c53852d9e24205b6363bba517fa8ee7bde823691",
+      "url": "https://github.com/status-im/nim-http-utils",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "results",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "298bc5b6fe4e5aa9c3b7e2ebfa17191675020f10"
+      }
+    },
+    "chronos": {
+      "version": "4.0.4",
+      "vcsRevision": "712f9937e46a9ba1949230e8e119d776aea1c6bb",
+      "url": "https://github.com/status-im/nim-chronos",
+      "downloadMethod": "git",
+      "dependencies": [
+        "results",
+        "stew",
+        "bearssl",
+        "httputils",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "03e96742e7148c38767c028c23a99cf316672f1c"
+      }
+    },
+    "confutils": {
+      "version": "0.1.0",
+      "vcsRevision": "5286ed67d363a3630ece85a0e8c1141d1d52b434",
+      "url": "https://github.com/status-im/nim-confutils",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "serialization",
+        "results"
+      ],
+      "checksums": {
+        "sha1": "591f70a7e803788d34ae99e8be71a30f2a2a028d"
+      }
+    },
+    "db_connector": {
+      "version": "0.1.0",
+      "vcsRevision": "74aef399e5c232f95c9fc5c987cebac846f09d62",
+      "url": "https://github.com/nim-lang/db_connector",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "b20053975976f94afac253d67cc6ef9200b32d02"
+      }
+    },
+    "dnsclient": {
+      "version": "0.3.4",
+      "vcsRevision": "23214235d4784d24aceed99bbfe153379ea557c8",
+      "url": "https://github.com/ba0f3/dnsclient.nim",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "65262c7e533ff49d6aca5539da4bc6c6ce132f40"
+      }
+    },
+    "nimcrypto": {
+      "version": "0.7.3",
+      "vcsRevision": "423ea4fed8de6f4544b7e3b30d868f527ed3b947",
+      "url": "https://github.com/cheatfate/nimcrypto",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "580910605aca0ea60b40bfaa116d0b8af1091314"
+      }
+    },
+    "stint": {
+      "version": "0.8.2",
+      "vcsRevision": "470b7892561b5179ab20bd389a69217d6213fe58",
+      "url": "https://github.com/status-im/nim-stint",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "d8f871fd617e7857192d4609fe003b48942a8ae5"
+      }
+    },
+    "secp256k1": {
+      "version": "0.6.0.3.2",
+      "vcsRevision": "b526c4b436809aa1cfe650026d796cf7b8328b91",
+      "url": "https://github.com/status-im/nim-secp256k1",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "results",
+        "nimcrypto"
+      ],
+      "checksums": {
+        "sha1": "e6e50bd4a29cb473b070eb5359d87d8946d96075"
+      }
+    },
+    "nat_traversal": {
+      "version": "0.0.1",
+      "vcsRevision": "860e18c37667b5dd005b94c63264560c35d88004",
+      "url": "https://github.com/status-im/nim-nat-traversal",
+      "downloadMethod": "git",
+      "dependencies": [
+        "results"
+      ],
+      "checksums": {
+        "sha1": "1a376d3e710590ef2c48748a546369755f0a7c97"
+      }
+    },
+    "metrics": {
+      "version": "0.1.2",
+      "vcsRevision": "11d0cddfb0e711aa2a8c75d1892ae24a64c299fc",
+      "url": "https://github.com/status-im/nim-metrics",
+      "downloadMethod": "git",
+      "dependencies": [
+        "chronos",
+        "results",
+        "stew"
+      ],
+      "checksums": {
+        "sha1": "5cdac99d85d3c146d170e85064c88fb28f377842"
+      }
+    },
+    "sqlite3_abi": {
+      "version": "3.51.1.0",
+      "vcsRevision": "6797c31836bff377bf50f1ac7bf8122449bf99ba",
+      "url": "https://github.com/arnetheduck/nim-sqlite3-abi",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "6e108cbacb20ba361ebd1de9f3da6e4b30f9181d"
+      }
+    },
+    "minilru": {
+      "version": "0.1.0",
+      "vcsRevision": "e3d6e6eb5f119a0b22fdab418f7a588be462ea66",
+      "url": "https://github.com/status-im/nim-minilru",
+      "downloadMethod": "git",
+      "dependencies": [
+        "results",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "a2981b7ff1b7e0fd61e64844f35fe98fd35de1b2"
+      }
+    },
+    "snappy": {
+      "version": "0.1.0",
+      "vcsRevision": "00bfcef94f8ef6981df5d5b994897f6695badfb2",
+      "url": "https://github.com/status-im/nim-snappy",
+      "downloadMethod": "git",
+      "dependencies": [
+        "faststreams",
+        "unittest2",
+        "results",
+        "stew"
+      ],
+      "checksums": {
+        "sha1": "e572d60d6a3178c5b1cde2400c51ad771812cd3d"
+      }
+    },
+    "eth": {
+      "version": "0.9.0",
+      "vcsRevision": "d9135e6c3c5d6d819afdfb566aa8d958756b73a8",
+      "url": "https://github.com/status-im/nim-eth",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nimcrypto",
+        "stint",
+        "secp256k1",
+        "chronos",
+        "chronicles",
+        "stew",
+        "nat_traversal",
+        "metrics",
+        "sqlite3_abi",
+        "confutils",
+        "testutils",
+        "unittest2",
+        "results",
+        "minilru",
+        "snappy"
+      ],
+      "checksums": {
+        "sha1": "2e01b0cfff9523d110562af70d19948280f8013e"
+      }
+    },
+    "dnsdisc": {
+      "version": "0.1.0",
+      "vcsRevision": "203abd2b3e758e0ea3ae325769b20a7e1bcd1010",
+      "url": "https://github.com/status-im/nim-dnsdisc",
+      "downloadMethod": "git",
+      "dependencies": [
+        "bearssl",
+        "chronicles",
+        "chronos",
+        "eth",
+        "secp256k1",
+        "stew",
+        "testutils",
+        "unittest2",
+        "nimcrypto",
+        "results"
+      ],
+      "checksums": {
+        "sha1": "c8aeb7a29b378d9ed5201c8f0273000b46552e26"
+      }
+    },
+    "ffi": {
+      "version": "0.1.0",
+      "vcsRevision": "c2cc2d7ea1e0f7eb6f64661b7777ec0c2fd1d753",
+      "url": "https://github.com/logos-messaging/nim-ffi",
+      "downloadMethod": "git",
+      "dependencies": [
+        "chronos"
+      ],
+      "checksums": {
+        "sha1": "4c96b0a56f219e86037662f4ddd89d0483852ae8"
+      }
+    },
+    "zlib": {
+      "version": "0.1.0",
+      "vcsRevision": "c71efff5fd1721362b3363dc7d0e2a4c0dbc6453",
+      "url": "https://github.com/status-im/nim-zlib",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "results"
+      ],
+      "checksums": {
+        "sha1": "b98773348eda614ff6b252213dcd852fc9d68e89"
+      }
+    },
+    "websock": {
+      "version": "0.2.1",
+      "vcsRevision": "35ae76f1559e835c80f9c1a3943bf995d3dd9eb5",
+      "url": "https://github.com/status-im/nim-websock",
+      "downloadMethod": "git",
+      "dependencies": [
+        "chronos",
+        "httputils",
+        "chronicles",
+        "stew",
+        "nimcrypto",
+        "bearssl",
+        "results",
+        "zlib"
+      ],
+      "checksums": {
+        "sha1": "1cb5efa10cd389bc01d0707c242ae010c76a03cd"
+      }
+    },
+    "json_rpc": {
+      "version": "0.5.4",
+      "vcsRevision": "b6e40a776fa2d00b97a9366761fb7da18f31ae5c",
+      "url": "https://github.com/status-im/nim-json-rpc",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "nimcrypto",
+        "stint",
+        "chronos",
+        "httputils",
+        "chronicles",
+        "websock",
+        "serialization",
+        "json_serialization",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "d8e8be795fcf098f4ce03b5826f6b3153f6a6e07"
+      }
+    },
+    "jwt": {
+      "version": "0.2",
+      "vcsRevision": "18f8378de52b241f321c1f9ea905456e89b95c6f",
+      "url": "https://github.com/vacp2p/nim-jwt.git",
+      "downloadMethod": "git",
+      "dependencies": [
+        "bearssl",
+        "bearssl_pkey_decoder"
+      ],
+      "checksums": {
+        "sha1": "bcfd6fc9c5e10a52b87117219b7ab5c98136bc8e"
+      }
+    },
+    "libbacktrace": {
+      "version": "0.0.9",
+      "vcsRevision": "d8bd4ce5c46bb6d2f984f6b3f3d7380897d95ecb",
+      "url": "https://github.com/status-im/nim-libbacktrace",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "ae3e8ecc27d80fd02b4538c7bdc9edf470d5023e"
+      }
+    },
+    "ngtcp2": {
+      "version": "0.39.0",
+      "vcsRevision": "791eb859145f9f268eb23eb9cbe777bdd7699c4d",
+      "url": "https://github.com/status-im/nim-ngtcp2",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "48fa97d200e6d4213ae389a2a6e0677f5d8795a5"
+      }
+    },
+    "quic": {
+      "version": "0.5.2",
+      "vcsRevision": "6d8678a159bfb902f9725f0081d542134cd93916",
+      "url": "https://github.com/vacp2p/nim-quic",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "chronos",
+        "nimcrypto",
+        "ngtcp2",
+        "unittest2",
+        "chronicles",
+        "bearssl"
+      ],
+      "checksums": {
+        "sha1": "a32e3d6a43b2552ebe8f27457094feb9bf3f6651"
+      }
+    },
+    "libp2p": {
+      "version": "1.14.3",
+      "vcsRevision": "eb7e6ff89889e41b57515f891ba82986c54809fb",
+      "url": "https://github.com/vacp2p/nim-libp2p",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nimcrypto",
+        "dnsclient",
+        "bearssl",
+        "chronicles",
+        "chronos",
+        "metrics",
+        "secp256k1",
+        "stew",
+        "websock",
+        "unittest2",
+        "results",
+        "quic",
+        "jwt"
+      ],
+      "checksums": {
+        "sha1": "04eed030305ed9ec128b6699066f0988eb75ec89"
+      }
+    },
+    "lsquic": {
+      "version": "0.0.1",
+      "vcsRevision": "f3fe33462601ea34eb2e8e9c357c92e61f8d121b",
+      "url": "https://github.com/vacp2p/nim-lsquic",
+      "downloadMethod": "git",
+      "dependencies": [
+        "zlib",
+        "stew",
+        "chronos",
+        "nimcrypto",
+        "unittest2",
+        "chronicles"
+      ],
+      "checksums": {
+        "sha1": "407b39ad3e84ad794b76df8d63ecafb749af6f4f"
+      }
+    },
+    "presto": {
+      "version": "0.1.1",
+      "vcsRevision": "d66043dd7ede146442e6c39720c76a20bde5225f",
+      "url": "https://github.com/status-im/nim-presto",
+      "downloadMethod": "git",
+      "dependencies": [
+        "chronos",
+        "chronicles",
+        "metrics",
+        "results",
+        "stew"
+      ],
+      "checksums": {
+        "sha1": "8df97c45683abe2337bdff43b844c4fbcc124ca2"
+      }
+    },
+    "unicodedb": {
+      "version": "0.13.2",
+      "vcsRevision": "66f2458710dc641dd4640368f9483c8a0ec70561",
+      "url": "https://github.com/nitely/nim-unicodedb",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "739102d885d99bb4571b1955f5f12aee423c935b"
+      }
+    },
+    "regex": {
+      "version": "0.26.3",
+      "vcsRevision": "4593305ed1e49731fc75af1dc572dd2559aad19c",
+      "url": "https://github.com/nitely/nim-regex",
+      "downloadMethod": "git",
+      "dependencies": [
+        "unicodedb"
+      ],
+      "checksums": {
+        "sha1": "4d24e7d7441137cd202e16f2359a5807ddbdc31f"
+      }
+    },
+    "taskpools": {
+      "version": "0.1.0",
+      "vcsRevision": "9e8ccc754631ac55ac2fd495e167e74e86293edb",
+      "url": "https://github.com/status-im/nim-taskpools",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "09e1b2fdad55b973724d61227971afc0df0b7a81"
+      }
+    },
+    "toml_serialization": {
+      "version": "0.2.18",
+      "vcsRevision": "b5b387e6fb2a7cc75d54a269b07cc6218361bd46",
+      "url": "https://github.com/status-im/nim-toml-serialization",
+      "downloadMethod": "git",
+      "dependencies": [
+        "faststreams",
+        "serialization",
+        "stew"
+      ],
+      "checksums": {
+        "sha1": "76ae1c2af5dd092849b41750ff29217980dc9ca3"
+      }
+    },
+    "web3": {
+      "version": "0.8.0",
+      "vcsRevision": "cdfe5601d2812a58e54faf53ee634452d01e5918",
+      "url": "https://github.com/status-im/nim-web3",
+      "downloadMethod": "git",
+      "dependencies": [
+        "chronicles",
+        "chronos",
+        "bearssl",
+        "eth",
+        "faststreams",
+        "json_rpc",
+        "serialization",
+        "json_serialization",
+        "nimcrypto",
+        "stew",
+        "stint",
+        "results"
+      ],
+      "checksums": {
+        "sha1": "26a112af032ef1536f97da2ca7364af618a11b80"
+      }
+    }
+  },
+  "tasks": {}
+}
diff --git a/tests/waku_core/test_peers.nim b/tests/waku_core/test_peers.nim
index 59ae2e2f3..3779da80e 100644
--- a/tests/waku_core/test_peers.nim
+++ b/tests/waku_core/test_peers.nim
@@ -1,5 +1,6 @@
 {.used.}
 
+import std/options
 import
   results,
   testutils/unittests,
@@ -155,9 +156,9 @@ suite "Waku Core - Peers":
     ## When
     var builder = EnrBuilder.init(enrPrivKey, seqNum = enrSeqNum)
     builder.withIpAddressAndPorts(
-      ipAddr = some(parseIpAddress("127.0.0.1")),
-      tcpPort = some(Port(0)),
-      udpPort = some(Port(0)),
+      ipAddr = options.some(parseIpAddress("127.0.0.1")),
+      tcpPort = options.some(Port(0)),
+      udpPort = options.some(Port(0)),
     )
     builder.withWakuCapabilities(Capabilities.Relay, Capabilities.Store)
 
diff --git a/vendor/db_connector b/vendor/db_connector
deleted file mode 160000
index 74aef399e..000000000
--- a/vendor/db_connector
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 74aef399e5c232f95c9fc5c987cebac846f09d62
diff --git a/vendor/dnsclient.nim b/vendor/dnsclient.nim
deleted file mode 160000
index 23214235d..000000000
--- a/vendor/dnsclient.nim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 23214235d4784d24aceed99bbfe153379ea557c8
diff --git a/vendor/nim-bearssl b/vendor/nim-bearssl
deleted file mode 160000
index 11e798b62..000000000
--- a/vendor/nim-bearssl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 11e798b62b8e6beabe958e048e9e24c7e0f9ee63
diff --git a/vendor/nim-chronicles b/vendor/nim-chronicles
deleted file mode 160000
index 54f5b7260..000000000
--- a/vendor/nim-chronicles
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 54f5b726025e8c7385e3a6529d3aa27454c6e6ff
diff --git a/vendor/nim-chronos b/vendor/nim-chronos
deleted file mode 160000
index 85af4db76..000000000
--- a/vendor/nim-chronos
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 85af4db764ecd3573c4704139560df3943216cf1
diff --git a/vendor/nim-confutils b/vendor/nim-confutils
deleted file mode 160000
index e214b3992..000000000
--- a/vendor/nim-confutils
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e214b3992a31acece6a9aada7d0a1ad37c928f3b
diff --git a/vendor/nim-dnsdisc b/vendor/nim-dnsdisc
deleted file mode 160000
index 203abd2b3..000000000
--- a/vendor/nim-dnsdisc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 203abd2b3e758e0ea3ae325769b20a7e1bcd1010
diff --git a/vendor/nim-eth b/vendor/nim-eth
deleted file mode 160000
index d9135e6c3..000000000
--- a/vendor/nim-eth
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d9135e6c3c5d6d819afdfb566aa8d958756b73a8
diff --git a/vendor/nim-faststreams b/vendor/nim-faststreams
deleted file mode 160000
index ce27581a3..000000000
--- a/vendor/nim-faststreams
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ce27581a3e881f782f482cb66dc5b07a02bd615e
diff --git a/vendor/nim-ffi b/vendor/nim-ffi
deleted file mode 160000
index 06111de15..000000000
--- a/vendor/nim-ffi
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 06111de155253b34e47ed2aaed1d61d08d62cc1b
diff --git a/vendor/nim-http-utils b/vendor/nim-http-utils
deleted file mode 160000
index c53852d9e..000000000
--- a/vendor/nim-http-utils
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c53852d9e24205b6363bba517fa8ee7bde823691
diff --git a/vendor/nim-json-rpc b/vendor/nim-json-rpc
deleted file mode 160000
index 9665c2650..000000000
--- a/vendor/nim-json-rpc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9665c265035f49f5ff94bbffdeadde68e19d6221
diff --git a/vendor/nim-json-serialization b/vendor/nim-json-serialization
deleted file mode 160000
index c343b0e24..000000000
--- a/vendor/nim-json-serialization
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c343b0e243d9e17e2c40f3a8a24340f7c4a71d44
diff --git a/vendor/nim-jwt b/vendor/nim-jwt
deleted file mode 160000
index 18f8378de..000000000
--- a/vendor/nim-jwt
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 18f8378de52b241f321c1f9ea905456e89b95c6f
diff --git a/vendor/nim-libbacktrace b/vendor/nim-libbacktrace
deleted file mode 160000
index d8bd4ce5c..000000000
--- a/vendor/nim-libbacktrace
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d8bd4ce5c46bb6d2f984f6b3f3d7380897d95ecb
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
deleted file mode 160000
index ca48c3718..000000000
--- a/vendor/nim-libp2p
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ca48c3718246bb411ff0e354a70cb82d9a28de0d
diff --git a/vendor/nim-lsquic b/vendor/nim-lsquic
deleted file mode 160000
index 4fb03ee7b..000000000
--- a/vendor/nim-lsquic
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4fb03ee7bfb39aecb3316889fdcb60bec3d0936f
diff --git a/vendor/nim-metrics b/vendor/nim-metrics
deleted file mode 160000
index 11d0cddfb..000000000
--- a/vendor/nim-metrics
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 11d0cddfb0e711aa2a8c75d1892ae24a64c299fc
diff --git a/vendor/nim-minilru b/vendor/nim-minilru
deleted file mode 160000
index 0c4b2bce9..000000000
--- a/vendor/nim-minilru
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0c4b2bce959591f0a862e9b541ba43c6d0cf3476
diff --git a/vendor/nim-nat-traversal b/vendor/nim-nat-traversal
deleted file mode 160000
index 860e18c37..000000000
--- a/vendor/nim-nat-traversal
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 860e18c37667b5dd005b94c63264560c35d88004
diff --git a/vendor/nim-presto b/vendor/nim-presto
deleted file mode 160000
index d66043dd7..000000000
--- a/vendor/nim-presto
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d66043dd7ede146442e6c39720c76a20bde5225f
diff --git a/vendor/nim-regex b/vendor/nim-regex
deleted file mode 160000
index 4593305ed..000000000
--- a/vendor/nim-regex
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4593305ed1e49731fc75af1dc572dd2559aad19c
diff --git a/vendor/nim-results b/vendor/nim-results
deleted file mode 160000
index df8113dda..000000000
--- a/vendor/nim-results
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit df8113dda4c2d74d460a8fa98252b0b771bf1f27
diff --git a/vendor/nim-secp256k1 b/vendor/nim-secp256k1
deleted file mode 160000
index 9dd3df621..000000000
--- a/vendor/nim-secp256k1
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9dd3df62124aae79d564da636bb22627c53c7676
diff --git a/vendor/nim-serialization b/vendor/nim-serialization
deleted file mode 160000
index b0f2fa329..000000000
--- a/vendor/nim-serialization
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b0f2fa32960ea532a184394b0f27be37bd80248b
diff --git a/vendor/nim-sqlite3-abi b/vendor/nim-sqlite3-abi
deleted file mode 160000
index 89ba51f55..000000000
--- a/vendor/nim-sqlite3-abi
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 89ba51f557414d3a3e17ab3df8270e1bdaa3ca2a
diff --git a/vendor/nim-stew b/vendor/nim-stew
deleted file mode 160000
index b66168735..000000000
--- a/vendor/nim-stew
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b66168735d6f3841c5239c3169d3fe5fe98b1257
diff --git a/vendor/nim-stint b/vendor/nim-stint
deleted file mode 160000
index 470b78925..000000000
--- a/vendor/nim-stint
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 470b7892561b5179ab20bd389a69217d6213fe58
diff --git a/vendor/nim-taskpools b/vendor/nim-taskpools
deleted file mode 160000
index 9e8ccc754..000000000
--- a/vendor/nim-taskpools
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9e8ccc754631ac55ac2fd495e167e74e86293edb
diff --git a/vendor/nim-testutils b/vendor/nim-testutils
deleted file mode 160000
index e4d37dc16..000000000
--- a/vendor/nim-testutils
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e4d37dc1652d5c63afb89907efb5a5e812261797
diff --git a/vendor/nim-toml-serialization b/vendor/nim-toml-serialization
deleted file mode 160000
index b5b387e6f..000000000
--- a/vendor/nim-toml-serialization
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b5b387e6fb2a7cc75d54a269b07cc6218361bd46
diff --git a/vendor/nim-unicodedb b/vendor/nim-unicodedb
deleted file mode 160000
index 66f245871..000000000
--- a/vendor/nim-unicodedb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 66f2458710dc641dd4640368f9483c8a0ec70561
diff --git a/vendor/nim-unittest2 b/vendor/nim-unittest2
deleted file mode 160000
index 26f2ef3ae..000000000
--- a/vendor/nim-unittest2
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 26f2ef3ae0ec72a2a75bfe557e02e88f6a31c189
diff --git a/vendor/nim-web3 b/vendor/nim-web3
deleted file mode 160000
index 81ee8ce47..000000000
--- a/vendor/nim-web3
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 81ee8ce479d86acb73be7c4f365328e238d9b4a3
diff --git a/vendor/nim-websock b/vendor/nim-websock
deleted file mode 160000
index 35ae76f15..000000000
--- a/vendor/nim-websock
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 35ae76f1559e835c80f9c1a3943bf995d3dd9eb5
diff --git a/vendor/nim-zlib b/vendor/nim-zlib
deleted file mode 160000
index daa8723fd..000000000
--- a/vendor/nim-zlib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit daa8723fd32299d4ca621c837430c29a5a11e19a
diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system
deleted file mode 160000
index e6c2c9da3..000000000
--- a/vendor/nimbus-build-system
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e6c2c9da39c2d368d9cf420ac22692e99715d22c
diff --git a/vendor/nimcrypto b/vendor/nimcrypto
deleted file mode 160000
index 721fb99ee..000000000
--- a/vendor/nimcrypto
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 721fb99ee099b632eb86dfad1f0d96ee87583774
diff --git a/vendor/nph b/vendor/nph
deleted file mode 160000
index c6e03162d..000000000
--- a/vendor/nph
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c6e03162dc2820d3088660f644818d7040e95791
diff --git a/waku.nimble b/waku.nimble
index 7368ba74b..db398e30e 100644
--- a/waku.nimble
+++ b/waku.nimble
@@ -12,28 +12,54 @@ license = "MIT or Apache License 2.0"
 
 ### Dependencies
 requires "nim >= 2.2.4",
+  # Async & Concurrency
+  "chronos",
+  "taskpools",
+  # Logging & Configuration
   "chronicles",
   "confutils",
-  "chronos",
-  "dnsdisc",
-  "eth",
-  "json_rpc",
-  "libbacktrace",
-  "nimcrypto",
+  # Serialization
   "serialization",
+  "json_serialization",
+  "toml_serialization",
+  "faststreams",
+  # Networking & P2P
+  "libp2p >= 1.14.3",
+  "eth",
+  "nat_traversal",
+  "websock",
+  "dnsdisc",
+  "dnsclient",
+  "httputils",
+  # Cryptography
+  "nimcrypto",
+  "secp256k1",
+  "bearssl",
+  # RPC & APIs
+  "json_rpc",
+  "presto",
+  "web3",
+  "jwt",
+  # Database
+  "db_connector",
+  "sqlite3_abi",
+  # Utilities
   "stew",
   "stint",
   "metrics",
-  "libp2p >= 1.14.3",
-  "web3",
-  "presto",
   "regex",
+  "unicodedb",
   "results",
-  "db_connector",
   "minilru",
-  "lsquic",
-  "jwt",
-  "ffi"
+  "zlib",
+  # Debug & Testing
+  "libbacktrace",
+  "testutils",
+  "unittest2"
+
+# Packages not on nimble (use git URLs)
+requires "https://github.com/vacp2p/nim-lsquic"
+requires "https://github.com/logos-messaging/nim-ffi"
 
 ### Helper functions
 proc buildModule(filePath, params = "", lang = "c"): bool =
@@ -57,20 +83,22 @@ proc buildModule(filePath, params = "", lang = "c"): bool =
 proc buildBinary(name: string, srcDir = "./", params = "", lang = "c") =
   if not dirExists "build":
     mkDir "build"
-  # allow something like "nim nimbus --verbosity:0 --hints:off nimbus.nims"
+  # Get extra params from NIM_PARAMS environment variable
   var extra_params = params
-  for i in 2 ..< paramCount():
-    extra_params &= " " & paramStr(i)
+  let nimParams = getEnv("NIM_PARAMS")
+  if nimParams.len > 0:
+    extra_params &= " " & nimParams
   exec "nim " & lang & " --out:build/" & name & " --mm:refc " & extra_params & " " &
     srcDir & name & ".nim"
 
 proc buildLibrary(lib_name: string, srcDir = "./", params = "", `type` = "static") =
   if not dirExists "build":
     mkDir "build"
-  # allow something like "nim nimbus --verbosity:0 --hints:off nimbus.nims"
+  # Get extra params from NIM_PARAMS environment variable
   var extra_params = params
-  for i in 2 ..< (paramCount() - 1):
-    extra_params &= " " & paramStr(i)
+  let nimParams = getEnv("NIM_PARAMS")
+  if nimParams.len > 0:
+    extra_params &= " " & nimParams
   if `type` == "static":
     exec "nim c" & " --out:build/" & lib_name &
       " --threads:on --app:staticlib --opt:size --noMain --mm:refc --header -d:metrics --nimMainPrefix:libwaku --skipParentCfg:on -d:discv5_protocol_id=d5waku " &
@@ -235,6 +263,15 @@ proc buildMobileIOS(srcDir = ".", params = "") =
   if sdkPath.len == 0:
     quit "Error: IOS_SDK_PATH not set. Set it to the path of the iOS SDK"
 
+  # Get nimble package paths
+  let bearsslPath = gorge("nimble path bearssl").strip()
+  let secp256k1Path = gorge("nimble path secp256k1").strip()
+  let natTraversalPath = gorge("nimble path nat_traversal").strip()
+
+  # Get Nim standard library path
+  let nimPath = gorge("nim --fullhelp 2>&1 | head -1 | sed 's/.*\\[//' | sed 's/\\].*//'").strip()
+  let nimLibPath = nimPath.parentDir.parentDir / "lib"
+
   # Use SDK name in path to differentiate device vs simulator
   let outDir = "build/ios/" & iosSdk & "-" & iosArch
   if not dirExists outDir:
@@ -277,8 +314,8 @@ proc buildMobileIOS(srcDir = ".", params = "") =
 
   # --- BearSSL ---
   echo "Compiling BearSSL for iOS..."
-  let bearSslSrcDir = "./vendor/nim-bearssl/bearssl/csources/src"
-  let bearSslIncDir = "./vendor/nim-bearssl/bearssl/csources/inc"
+  let bearSslSrcDir = bearsslPath / "bearssl/csources/src"
+  let bearSslIncDir = bearsslPath / "bearssl/csources/inc"
   for path in walkDirRec(bearSslSrcDir):
     if path.endsWith(".c"):
       let relPath = path.replace(bearSslSrcDir & "/", "").replace("/", "_")
@@ -289,7 +326,7 @@ proc buildMobileIOS(srcDir = ".", params = "") =
 
   # --- secp256k1 ---
   echo "Compiling secp256k1 for iOS..."
-  let secp256k1Dir = "./vendor/nim-secp256k1/vendor/secp256k1"
+  let secp256k1Dir = secp256k1Path / "vendor/secp256k1"
   let secp256k1Flags = " -I" & secp256k1Dir & "/include" &
         " -I" & secp256k1Dir & "/src" &
         " -I" & secp256k1Dir &
@@ -314,9 +351,9 @@ proc buildMobileIOS(srcDir = ".", params = "") =
 
   # --- miniupnpc ---
   echo "Compiling miniupnpc for iOS..."
-  let miniupnpcSrcDir = "./vendor/nim-nat-traversal/vendor/miniupnp/miniupnpc/src"
-  let miniupnpcIncDir = "./vendor/nim-nat-traversal/vendor/miniupnp/miniupnpc/include"
-  let miniupnpcBuildDir = "./vendor/nim-nat-traversal/vendor/miniupnp/miniupnpc/build"
+  let miniupnpcSrcDir = natTraversalPath / "vendor/miniupnp/miniupnpc/src"
+  let miniupnpcIncDir = natTraversalPath / "vendor/miniupnp/miniupnpc/include"
+  let miniupnpcBuildDir = natTraversalPath / "vendor/miniupnp/miniupnpc/build"
   let miniupnpcFiles = @[
     "addr_is_reserved.c", "connecthostport.c", "igd_desc_parse.c",
     "minisoap.c", "minissdpc.c", "miniupnpc.c", "miniwget.c",
@@ -337,7 +374,7 @@ proc buildMobileIOS(srcDir = ".", params = "") =
 
   # --- libnatpmp ---
   echo "Compiling libnatpmp for iOS..."
-  let natpmpSrcDir = "./vendor/nim-nat-traversal/vendor/libnatpmp-upstream"
+  let natpmpSrcDir = natTraversalPath / "vendor/libnatpmp-upstream"
   # Only compile natpmp.c - getgateway.c uses net/route.h which is not available on iOS
   let natpmpObj = vendorObjDir / "natpmp_natpmp.o"
   if not fileExists(natpmpObj):
@@ -371,13 +408,13 @@ proc buildMobileIOS(srcDir = ".", params = "") =
     let oFile = objDir / baseName
     exec clangBase &
         " -DENABLE_STRNATPMPERR" &
-        " -I./vendor/nimbus-build-system/vendor/Nim/lib/" &
-        " -I./vendor/nim-bearssl/bearssl/csources/inc/" &
-        " -I./vendor/nim-bearssl/bearssl/csources/tools/" &
-        " -I./vendor/nim-bearssl/bearssl/abi/" &
-        " -I./vendor/nim-secp256k1/vendor/secp256k1/include/" &
-        " -I./vendor/nim-nat-traversal/vendor/miniupnp/miniupnpc/include/" &
-        " -I./vendor/nim-nat-traversal/vendor/libnatpmp-upstream/" &
+        " -I" & nimLibPath &
+        " -I" & bearsslPath & "/bearssl/csources/inc/" &
+        " -I" & bearsslPath & "/bearssl/csources/tools/" &
+        " -I" & bearsslPath & "/bearssl/abi/" &
+        " -I" & secp256k1Path & "/vendor/secp256k1/include/" &
+        " -I" & natTraversalPath & "/vendor/miniupnp/miniupnpc/include/" &
+        " -I" & natTraversalPath & "/vendor/libnatpmp-upstream/" &
         " -I" & nimcacheDir &
         " -c " & cFile &
         " -o " & oFile
@@ -394,7 +431,7 @@ proc buildMobileIOS(srcDir = ".", params = "") =
 
   exec "libtool -static -o " & aFile & " " & objFiles.join(" ")
 
-  echo "✔ iOS library created: " & aFile
+  echo "iOS library created: " & aFile
 
 task libWakuIOS, "Build the mobile bindings for iOS":
   let srcDir = "./library"