Start using nimble and deprecate vendor dependencies (#3798)

Co-authored-by: NagyZoltanPeter <113987313+NagyZoltanPeter@users.noreply.github.com> Co-authored-by: Darshan K <35736874+darshankabariya@users.noreply.github.com>
2026-04-10 13:53:11 +00:00 · 2026-04-08 12:42:14 +02:00 · 2026-04-08 12:42:14 +02:00 · f5762af4c4
commit f5762af4c4
parent 9a344553e7
69 changed files with 1916 additions and 1100 deletions
--- a/.github/ISSUE_TEMPLATE/bump_dependencies.md
+++ b/.github/ISSUE_TEMPLATE/bump_dependencies.md
@ -1,7 +1,7 @@
 ---
 name: Bump dependencies
-about: Bump vendor dependencies for release
-title: 'Bump vendor dependencies for release 0.0.0'
+about: Bump dependencies for release
+title: 'Bump dependencies for release 0.X.0'
 labels: dependencies
 assignees: ''

@ -9,40 +9,10 @@ assignees: ''

 <!-- Add appropriate release number to title! -->

-Update `nwaku` "vendor" dependencies.
+### Bumped items
+- [ ] Update nimble dependencies
+  1. Edit manually waku.nimble. For some dependencies, we want to bump versions manually and use a pinned version, f.e., nim-libp2p and all its dependencies.
+  2. Run `nimble lock` (make sure `nimble --version` shows the Nimble version pinned in waku.nimble)
+  3. Run `./tools/gen-nix-deps.sh nimble.lock nix/deps.nix` to update nix deps

-### Items to bump
- [ ] dnsclient.nim ( update to the latest tag version )
- [ ] nim-bearssl
- [ ] nimbus-build-system
- [ ] nim-chronicles
- [ ] nim-chronos
- [ ] nim-confutils
- [ ] nimcrypto
- [ ] nim-dnsdisc
- [ ] nim-eth
- [ ] nim-faststreams
- [ ] nim-http-utils
- [ ] nim-json-rpc
- [ ] nim-json-serialization
- [ ] nim-libbacktrace
- [ ] nim-libp2p ( update to the latest tag version )
- [ ] nim-metrics
- [ ] nim-nat-traversal
- [ ] nim-presto
- [ ] nim-regex ( update to the latest tag version )
- [ ] nim-results
- [ ] nim-secp256k1
- [ ] nim-serialization
- [ ] nim-sqlite3-abi ( update to the latest tag version )
- [ ] nim-stew
- [ ] nim-stint
- [ ] nim-taskpools ( update to the latest tag version )
- [ ] nim-testutils ( update to the latest tag version )
- [ ] nim-toml-serialization
- [ ] nim-unicodedb
- [ ] nim-unittest2 ( update to the latest tag version )
- [ ] nim-web3 ( update to the latest tag version )
- [ ] nim-websock ( update to the latest tag version )
- [ ] nim-zlib
- [ ] zerokit ( this should be kept in version `v0.7.0` )
+- [ ] Update vendor/zerokit dependency.
--- a/.github/ISSUE_TEMPLATE/prepare_release.md
+++ b/.github/ISSUE_TEMPLATE/prepare_release.md
@ -18,6 +18,7 @@ For detailed info on the release process refer to https://github.com/logos-messa
 All items below are to be completed by the owner of the given release.

 - [ ] Create release branch with major and minor only ( e.g. release/v0.X ) if it doesn't exist.
+- [ ] Update the `version` field in `waku.nimble` to match the release version (e.g. `version = "0.X.0"`).
 - [ ] Assign release candidate tag to the release branch HEAD (e.g. `v0.X.0-rc.0`, `v0.X.0-rc.1`, ... `v0.X.0-rc.N`).
 - [ ] Generate and edit release notes in CHANGELOG.md.

--- a/.github/workflows/ci-daily.yml
+++ b/.github/workflows/ci-daily.yml
@ -40,7 +40,7 @@ jobs:
        run: make update

      - name: Build binaries
-        run: make V=1 QUICK_AND_DIRTY_COMPILER=1 examples tools
+        run: make V=1 examples tools

      - name: Notify Discord
        if: always()
--- a/.github/workflows/ci-nix.yml
+++ b/.github/workflows/ci-nix.yml
@ -16,14 +16,7 @@ jobs:
          - aarch64-darwin
          - x86_64-linux
        nixpkg:
-          - libwaku
-          - libwaku-android-arm64
-          - wakucanary
-
-        exclude:
-          # Android SDK limitation
-          - system: aarch64-darwin
-            nixpkg: libwaku-android-arm64
+          - liblogosdelivery

        include:
          - system: aarch64-darwin
@ -36,12 +29,10 @@ jobs:
    runs-on: ${{ matrix.runs_on }}
    steps:
      - uses: actions/checkout@v4
-        with:
-          submodules: recursive

-      - name: 'Run Nix build for {{ matrix.nixpkg }}'
+      - name: 'Run Nix build for ${{ matrix.nixpkg }}'
        shell: bash
-        run: nix build -L '.?submodules=1#${{ matrix.nixpkg }}'
+        run: nix build -L '.#${{ matrix.nixpkg }}'

      - name: 'Show result contents'
        shell: bash
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -14,6 +14,8 @@ env:
  NPROC: 2
  MAKEFLAGS: "-j${NPROC}"
  NIMFLAGS: "--parallelBuild:${NPROC} --colors:off -d:chronicles_colors:none"
+  NIM_VERSION: '2.2.4'
+  NIMBLE_VERSION: '0.18.2'

 jobs:
  changes: # changes detection
@ -30,9 +32,9 @@ jobs:
        filters: |
          common:
          - '.github/workflows/**'
-          - 'vendor/**'
-          - 'Makefile'
+          - 'nimble.lock'
          - 'waku.nimble'
+          - 'Makefile'
          - 'library/**'
          v2:
          - 'waku/**'
@ -63,24 +65,36 @@ 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: Install Nim ${{ env.NIM_VERSION }}
+        uses: jiro4989/setup-nim-action@v2
+        with:
+          nim-version: ${{ env.NIM_VERSION }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

-      - name: Cache submodules
+      - name: Install Nimble ${{ env.NIMBLE_VERSION }}
+        run: |
+          cd /tmp && nimble install "nimble@${{ env.NIMBLE_VERSION }}" -y
+          echo "$HOME/.nimble/bin" >> $GITHUB_PATH
+
+      - name: Cache nimble deps
+        id: cache-nimbledeps
        uses: actions/cache@v3
        with:
          path: |
-            vendor/
-            .git/modules
-          key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }}
+            nimbledeps/
+            nimble.paths
+          key: ${{ runner.os }}-nimbledeps-${{ hashFiles('nimble.lock') }}

-      - name: Make update
-        run: make update
+      - name: Install nimble deps
+        if: steps.cache-nimbledeps.outputs.cache-hit != 'true'
+        run: |
+          nimble setup --localdeps -y
+          make rebuild-nat-libs-nimbledeps
+          make rebuild-bearssl-nimbledeps
+          touch nimbledeps/.nimble-setup

      - name: Build binaries
-        run: make V=1 QUICK_AND_DIRTY_COMPILER=1 all
+        run: make V=1 all

  build-windows:
    needs: changes
@ -104,21 +118,33 @@ 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: Install Nim ${{ env.NIM_VERSION }}
+        uses: jiro4989/setup-nim-action@v2
+        with:
+          nim-version: ${{ env.NIM_VERSION }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

-      - name: Cache submodules
+      - name: Install Nimble ${{ env.NIMBLE_VERSION }}
+        run: |
+          cd /tmp && nimble install "nimble@${{ env.NIMBLE_VERSION }}" -y
+          echo "$HOME/.nimble/bin" >> $GITHUB_PATH
+
+      - name: Cache nimble deps
+        id: cache-nimbledeps
        uses: actions/cache@v3
        with:
          path: |
-            vendor/
-            .git/modules
-          key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }}
+            nimbledeps/
+            nimble.paths
+          key: ${{ runner.os }}-nimbledeps-${{ hashFiles('nimble.lock') }}

-      - name: Make update
-        run: make update
+      - name: Install nimble deps
+        if: steps.cache-nimbledeps.outputs.cache-hit != 'true'
+        run: |
+          nimble setup --localdeps -y
+          make rebuild-nat-libs-nimbledeps
+          make rebuild-bearssl-nimbledeps
+          touch nimbledeps/.nimble-setup

      - name: Run tests
        run: |
@ -132,13 +158,13 @@ jobs:
          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
-          make V=1 LOG_LEVEL=DEBUG QUICK_AND_DIRTY_COMPILER=1 POSTGRES=$postgres_enabled testwakunode2
+          make V=1 POSTGRES=$postgres_enabled test
+          make V=1 POSTGRES=$postgres_enabled testwakunode2

  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-delivery/.github/workflows/container-image.yml@10dc3d3eb4b6a3d4313f7b2cc4a85a925e9ce039
+    uses: ./.github/workflows/container-image.yml
    secrets: inherit

  nwaku-nwaku-interop-tests:
@ -171,18 +197,33 @@ 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: Install Nim ${{ env.NIM_VERSION }}
+        uses: jiro4989/setup-nim-action@v2
+        with:
+          nim-version: ${{ env.NIM_VERSION }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

-      - name: Cache submodules
+      - name: Install Nimble ${{ env.NIMBLE_VERSION }}
+        run: |
+          cd /tmp && nimble install "nimble@${{ env.NIMBLE_VERSION }}" -y
+          echo "$HOME/.nimble/bin" >> $GITHUB_PATH
+
+      - name: Cache nimble deps
+        id: cache-nimbledeps
        uses: actions/cache@v3
        with:
          path: |
-            vendor/
-            .git/modules
-          key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }}
+            nimbledeps/
+            nimble.paths
+          key: ${{ runner.os }}-nimbledeps-${{ hashFiles('nimble.lock') }}
+
+      - name: Install nimble deps
+        if: steps.cache-nimbledeps.outputs.cache-hit != 'true'
+        run: |
+          nimble setup --localdeps -y
+          make rebuild-nat-libs-nimbledeps
+          make rebuild-bearssl-nimbledeps
+          touch nimbledeps/.nimble-setup

      - name: Build nph
        run: |
--- a/.github/workflows/container-image.yml
+++ b/.github/workflows/container-image.yml
@ -15,6 +15,8 @@ env:
  NPROC: 2
  MAKEFLAGS: "-j${NPROC}"
  NIMFLAGS: "--parallelBuild:${NPROC}"
+  NIM_VERSION: '2.2.4'
+  NIMBLE_VERSION: '0.18.2'

 # This workflow should not run for outside contributors
 # If org secrets are not available, we'll avoid building and publishing the docker image and we'll pass the workflow
@ -46,28 +48,42 @@ jobs:
        if: ${{ steps.secrets.outcome == 'success' }}
        uses: actions/checkout@v4

-      - name: Get submodules hash
-        id: submodules
+      - name: Install Nim ${{ env.NIM_VERSION }}
+        if: ${{ steps.secrets.outcome == 'success' }}
+        uses: jiro4989/setup-nim-action@v2
+        with:
+          nim-version: ${{ env.NIM_VERSION }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install Nimble ${{ env.NIMBLE_VERSION }}
        if: ${{ steps.secrets.outcome == 'success' }}
        run: |
-          echo "hash=$(git submodule status | awk '{print $1}' | sort | shasum -a 256 | sed 's/[ -]*//g')" >> $GITHUB_OUTPUT
+          cd /tmp && nimble install "nimble@${{ env.NIMBLE_VERSION }}" -y
+          echo "$HOME/.nimble/bin" >> $GITHUB_PATH

-      - name: Cache submodules
+      - name: Cache nimble deps
        if: ${{ steps.secrets.outcome == 'success' }}
+        id: cache-nimbledeps
        uses: actions/cache@v3
        with:
          path: |
-            vendor/
-            .git/modules
-          key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }}
+            nimbledeps/
+            nimble.paths
+          key: ${{ runner.os }}-nimbledeps-${{ hashFiles('nimble.lock') }}
+
+      - name: Install nimble deps
+        if: ${{ steps.secrets.outcome == 'success' && steps.cache-nimbledeps.outputs.cache-hit != 'true' }}
+        run: |
+          nimble setup --localdeps -y
+          make rebuild-nat-libs-nimbledeps
+          make rebuild-bearssl-nimbledeps
+          touch nimbledeps/.nimble-setup

      - name: Build binaries
        id: build
        if: ${{ steps.secrets.outcome == 'success' }}
        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 NIMFLAGS="-d:disableMarchNative -d:postgres -d:chronicles_colors:none" wakunode2

          SHORT_REF=$(git rev-parse --short HEAD)

--- a/.github/workflows/pre-release.yml
+++ b/.github/workflows/pre-release.yml
@ -63,10 +63,10 @@ jobs:
        run: |
          OS=$([[ "${{runner.os}}" == "macOS" ]] && echo "macosx" || echo "linux")

-          make QUICK_AND_DIRTY_COMPILER=1 V=1 CI=false NIMFLAGS="-d:disableMarchNative --os:${OS} --cpu:${{matrix.arch}}" \
+          make V=1 CI=false NIMFLAGS="-d:disableMarchNative --os:${OS} --cpu:${{matrix.arch}}" \
            update

-          make QUICK_AND_DIRTY_COMPILER=1 V=1 CI=false\
+          make V=1 CI=false\
            NIMFLAGS="-d:disableMarchNative --os:${OS} --cpu:${{matrix.arch}} -d:postgres" \
            wakunode2\
            chat2\
--- a/.github/workflows/windows-build.yml
+++ b/.github/workflows/windows-build.yml
@ -7,20 +7,25 @@ on:
        required: true
        type: string

+env:
+  NPROC: 4
+  NIM_VERSION: '2.2.4'
+  NIMBLE_VERSION: '0.18.2'
+
 jobs:
  build:
    runs-on: windows-latest

    defaults:
      run:
-        shell: msys2 {0}  
+        shell: msys2 {0}

    env:
      MSYSTEM: MINGW64

    steps:
    - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4

    - name: Setup MSYS2
      uses: msys2/setup-msys2@v2
@ -51,50 +56,61 @@ jobs:
      run: |
        bash scripts/install_nasm_in_windows.sh
        source $HOME/.bashrc
-      
+
    - name: Add UPX to PATH
      run: |
        echo "/usr/bin:$PATH" >> $GITHUB_PATH
        echo "/mingw64/bin:$PATH" >> $GITHUB_PATH
        echo "/usr/lib:$PATH" >> $GITHUB_PATH
-        echo "/mingw64/lib:$PATH" >> $GITHUB_PATH 
+        echo "/mingw64/lib:$PATH" >> $GITHUB_PATH

    - name: Verify dependencies
      run: |
        which upx gcc g++ make cmake cargo rustc python nasm

-    - name: Updating submodules
-      run: git submodule update --init --recursive
+    - name: Install Nim ${{ env.NIM_VERSION }}
+      uses: jiro4989/setup-nim-action@v2
+      with:
+        nim-version: ${{ env.NIM_VERSION }}
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Install Nimble ${{ env.NIMBLE_VERSION }}
+      run: |
+        export PATH="$GITHUB_WORKSPACE/.nim_runtime/bin:$PATH"
+        cd /tmp && nimble install "nimble@${{ env.NIMBLE_VERSION }}" -y
+        echo "$HOME/.nimble/bin" >> $GITHUB_PATH
+
+    - name: Cache nimble deps
+      id: cache-nimbledeps
+      uses: actions/cache@v4
+      with:
+        path: |
+            nimbledeps/
+            nimble.paths
+        key: ${{ runner.os }}-nimbledeps-${{ hashFiles('nimble.lock') }}
+
+    - name: Install nimble deps
+      if: steps.cache-nimbledeps.outputs.cache-hit != 'true'
+      run: |
+        export PATH="$GITHUB_WORKSPACE/.nim_runtime/bin:$HOME/.nimble/bin:$PATH"
+        nimble setup --localdeps -y
+        make rebuild-nat-libs-nimbledeps CC=gcc
+        make rebuild-bearssl-nimbledeps CC=gcc
+        touch nimbledeps/.nimble-setup

    - 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: Building wakunode2.exe
      run: |
-        make wakunode2 LOG_LEVEL=DEBUG V=3 -j8
+        export PATH="$GITHUB_WORKSPACE/.nim_runtime/bin:$HOME/.nimble/bin:$PATH"
+        make wakunode2 V=3 -j${{ env.NPROC }}

    - name: Building libwaku.dll
      run: |
-        make libwaku STATIC=0 LOG_LEVEL=DEBUG V=1 -j
-    
+        export PATH="$GITHUB_WORKSPACE/.nim_runtime/bin:$HOME/.nimble/bin:$PATH"
+        make libwaku STATIC=0 V=1 -j
+
    - name: Check Executable
      run: |
        if [ -f "./build/wakunode2.exe" ]; then
--- a/.gitignore
+++ b/.gitignore
@ -3,9 +3,6 @@
 # Executables shall be put in an ignored build/ directory
 /build

-# Nimble packages
-/vendor/.nimble
-
 # Generated Files
 *.generated.nim

@ -45,9 +42,6 @@ node_modules/
 rlnKeystore.json
 *.tar.gz

-# Nimbus Build System
-nimbus-build-system.paths
-
 # sqlite db
 *.db
 *.db-shm
--- 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
--- a/BearSSL.mk
+++ b/BearSSL.mk
@ -0,0 +1,39 @@
+# Copyright (c) 2022 Status Research & Development GmbH. Licensed under
+# either of:
+# - Apache License, version 2.0
+# - MIT license
+# at your option. This file may not be copied, modified, or distributed except
+# according to those terms.
+
+###########################
+## bearssl (nimbledeps)  ##
+###########################
+# Rebuilds libbearssl.a from the package installed by nimble under
+# nimbledeps/pkgs2/. Used by `make update` / $(NIMBLEDEPS_STAMP).
+#
+# BEARSSL_NIMBLEDEPS_DIR is evaluated at parse time, so targets that
+# depend on it must be invoked via a recursive $(MAKE) call so the sub-make
+# re-evaluates the variable after nimble setup has populated nimbledeps/.
+#
+# `ls -dt` (sort by modification time, newest first) is used to pick the
+# latest installed version and is portable across Linux, macOS, and
+# Windows (MSYS/MinGW).
+
+BEARSSL_NIMBLEDEPS_DIR := $(shell ls -dt $(CURDIR)/nimbledeps/pkgs2/bearssl-* 2>/dev/null | head -1)
+BEARSSL_CSOURCES_DIR   := $(BEARSSL_NIMBLEDEPS_DIR)/bearssl/csources
+
+.PHONY: clean-bearssl-nimbledeps rebuild-bearssl-nimbledeps
+
+clean-bearssl-nimbledeps:
+ifeq ($(BEARSSL_NIMBLEDEPS_DIR),)
+	$(error No bearssl package found under nimbledeps/pkgs2/ — run 'make update' first)
+endif
+	+ [ -e "$(BEARSSL_CSOURCES_DIR)/build" ] && \
+		"$(MAKE)" -C "$(BEARSSL_CSOURCES_DIR)" clean || true
+
+rebuild-bearssl-nimbledeps: | clean-bearssl-nimbledeps
+ifeq ($(BEARSSL_NIMBLEDEPS_DIR),)
+	$(error No bearssl package found under nimbledeps/pkgs2/ — run 'make update' first)
+endif
+	@echo "Rebuilding bearssl from $(BEARSSL_CSOURCES_DIR)"
+	+ "$(MAKE)" -C "$(BEARSSL_CSOURCES_DIR)" lib
--- a/3
+++ b/3
@ -4,7 +4,6 @@ FROM rustlang/rust:nightly-alpine3.19 AS nim-build
 ARG NIMFLAGS
 ARG MAKE_TARGET=wakunode2
 ARG NIM_COMMIT
-ARG LOG_LEVEL=TRACE
 ARG HEAPTRACK_BUILD=0

 # Get build tools and required header files
@ -27,7 +26,7 @@ RUN if [ "$HEAPTRACK_BUILD" = "1" ]; then \
 RUN make -j$(nproc) deps QUICK_AND_DIRTY_COMPILER=1 ${NIM_COMMIT}

 # Build the final node binary
-RUN make -j$(nproc) ${NIM_COMMIT} $MAKE_TARGET LOG_LEVEL=${LOG_LEVEL} NIMFLAGS="${NIMFLAGS}"
+RUN make -j$(nproc) ${NIM_COMMIT} $MAKE_TARGET NIMFLAGS="${NIMFLAGS}"


 # PRODUCTION IMAGE -------------------------------------------------------------
--- a/446
+++ b/446
@ -4,28 +4,13 @@
 # - 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
+
+include Nat.mk
+include BearSSL.mk
+
 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 := "Building:"

 # Determine the OS
 detected_OS := $(shell uname -s)
@ -33,29 +18,31 @@ ifneq (,$(findstring MINGW,$(detected_OS)))
  detected_OS := Windows
 endif

+# NIM binary location
+NIM_BINARY := $(shell which nim)
+NPH := $(HOME)/.nimble/bin/nph
+NIMBLEDEPS_STAMP := nimbledeps/.nimble-setup
+
+# 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 nimble

-# default target, because it's the first one that doesn't start with '.'
-all: | wakunode2 libwaku
+# default target
+all: | wakunode2 libwaku liblogosdelivery

 examples: | example2 chat2 chat2bridge

@ -71,102 +58,116 @@ 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)
+$(NIMBLEDEPS_STAMP): nimble.lock | waku.nims
+	@if ! command -v nimble > /dev/null 2>&1; then $(MAKE) install-nimble; fi
+	nimble setup --localdeps
 	$(MAKE) build-nph
+	$(MAKE) rebuild-bearssl-nimbledeps
+	touch $@
+
+update:
+	rm -f $(NIMBLEDEPS_STAMP)
+	$(MAKE) $(NIMBLEDEPS_STAMP)
+	nimble lock

 clean:
-	rm -rf build
+	rm -rf build 2> /dev/null || true
+	rm -rf nimbledeps 2> /dev/null || true
+	rm nimble.lock 2> /dev/null || true
+	rm -fr nimcache 2> /dev/null || true
+	rm nimble.paths 2> /dev/null || true
+	nimble clean

-# must be included after the default target
-include $(BUILD_SYSTEM_DIR)/makefiles/targets.mk
+REQUIRED_NIM_VERSION    := $(shell grep -E '^const NimVersion\s*=' waku.nimble | grep -oE '"[0-9]+\.[0-9]+\.[0-9]+"' | tr -d '"')
+REQUIRED_NIMBLE_VERSION := $(shell grep -E '^const NimbleVersion\s*=' waku.nimble | grep -oE '"[0-9]+\.[0-9]+\.[0-9]+"' | tr -d '"')
+
+install-nim:
+	$(eval NIM_OS          := $(shell uname -s | tr 'A-Z' 'a-z' | sed 's/darwin/macosx/'))
+	$(eval NIM_ARCH        := $(shell uname -m | sed 's/x86_64/x64/;s/aarch64/arm64/'))
+	$(eval NIM_INSTALL_DIR := $(HOME)/.nim_runtime)
+	@nim_ver=$$(nim --version 2>/dev/null | head -1 | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1); \
+	if [ "$$nim_ver" = "$(REQUIRED_NIM_VERSION)" ]; then \
+	  echo "nim $(REQUIRED_NIM_VERSION) already installed, skipping."; \
+	else \
+	  curl -L "https://github.com/nim-lang/Nim/releases/download/v$(REQUIRED_NIM_VERSION)/nim-$(REQUIRED_NIM_VERSION)-$(NIM_OS)_$(NIM_ARCH).tar.xz" \
+	    -o /tmp/nim-$(REQUIRED_NIM_VERSION).tar.xz && \
+	  tar -xJf /tmp/nim-$(REQUIRED_NIM_VERSION).tar.xz -C /tmp && \
+	  mkdir -p $(NIM_INSTALL_DIR) && \
+	  cd /tmp/nim-$(REQUIRED_NIM_VERSION) && ./install.sh $(NIM_INSTALL_DIR); \
+	fi
+
+install-nimble: install-nim
+	@nimble_ver=$$(nimble --version 2>/dev/null | head -1 | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1); \
+	if [ "$$nimble_ver" = "$(REQUIRED_NIMBLE_VERSION)" ]; then \
+	  echo "nimble $(REQUIRED_NIMBLE_VERSION) already installed, skipping."; \
+	else \
+	  cd /tmp && PATH="$(HOME)/.nim_runtime/bin:$$PATH" \
+	    nimble install "nimble@$(REQUIRED_NIMBLE_VERSION)" -y; \
+	fi
+
+build:
+	@nim_ver=$$(nim --version 2>/dev/null | head -1 | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1); \
+	if [ "$$nim_ver" != "$(REQUIRED_NIM_VERSION)" ]; then \
+		echo "Error: Nim $(REQUIRED_NIM_VERSION) is required, but found '$$nim_ver'"; \
+		exit 1; \
+	fi
+	@nimble_ver=$$(nimble --version 2>/dev/null | head -1 | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1); \
+	if [ "$$nimble_ver" != "$(REQUIRED_NIMBLE_VERSION)" ]; then \
+		echo "Error: Nimble $(REQUIRED_NIMBLE_VERSION) is required, but found '$$nimble_ver'"; \
+		exit 1; \
+	fi
+	mkdir -p build
+
+nimble:
+	echo "Inside nimble target, checking for nimble..." && \
+	command -v nimble >/dev/null 2>&1 || { \
+		mv nimbledeps nimbledeps_backup 2>/dev/null || true; \
+		echo "choosenim not found, installing ..."; \
+		curl -sSf https://nim-lang.org/choosenim/init.sh | sh; \
+		mv nimbledeps_backup nimbledeps 2>/dev/null || true; \
+	}

 ## 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 -d:lto_incremental -d:strip
+NIM_PARAMS := $(NIM_PARAMS) -d:release
 else
 NIM_PARAMS := $(NIM_PARAMS) -d:debug
 endif

-ifeq ($(USE_LIBBACKTRACE), 0)
 NIM_PARAMS := $(NIM_PARAMS) -d:disable_libbacktrace
-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 +176,26 @@ 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)
+
+deps: | nimble

 ##################
 ##     RLN      ##
@ -199,8 +212,9 @@ LIBRLN_FILE ?= librln_$(LIBRLN_VERSION).a
 endif

 $(LIBRLN_FILE):
+	git submodule update --init vendor/zerokit
 	echo -e $(BUILD_MSG) "$@" && \
-		./scripts/build_rln.sh $(LIBRLN_BUILDDIR) $(LIBRLN_VERSION) $(LIBRLN_FILE)
+		bash scripts/build_rln.sh $(LIBRLN_BUILDDIR) $(LIBRLN_VERSION) $(LIBRLN_FILE)

 librln: | $(LIBRLN_FILE)
 	$(eval NIM_PARAMS += --passL:$(LIBRLN_FILE) --passL:-lm)
@ -209,7 +223,6 @@ clean-librln:
 	cargo clean --manifest-path vendor/zerokit/rln/Cargo.toml
 	rm -f $(LIBRLN_FILE)

-# Extend clean target
 clean: | clean-librln

 #################
@ -217,74 +230,71 @@ clean: | clean-librln
 #################
 .PHONY: testcommon

-testcommon: | build deps
+testcommon: | build
 	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
+testwaku: | build 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
+wakunode2: | $(NIMBLEDEPS_STAMP) build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-	\
-		$(ENV_SCRIPT) nim wakunode2 $(NIM_PARAMS) waku.nims
+		nimble wakunode2

-benchmarks: | build deps librln
+benchmarks: | $(NIMBLEDEPS_STAMP) build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim benchmarks $(NIM_PARAMS) waku.nims
+		nimble benchmarks

-testwakunode2: | build deps librln
+testwakunode2: | $(NIMBLEDEPS_STAMP) build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim testwakunode2 $(NIM_PARAMS) waku.nims
+		nimble testwakunode2

-example2: | build deps librln
+example2: | $(NIMBLEDEPS_STAMP) build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim example2 $(NIM_PARAMS) waku.nims
+		nimble example2

-chat2: | build deps librln
+chat2: | $(NIMBLEDEPS_STAMP) build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim chat2 $(NIM_PARAMS) waku.nims
+		nimble chat2

-chat2mix: | build deps librln
+chat2mix: | $(NIMBLEDEPS_STAMP) build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim chat2mix $(NIM_PARAMS) waku.nims
+		nimble chat2mix

-rln-db-inspector: | build deps librln
+rln-db-inspector: | $(NIMBLEDEPS_STAMP) 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
+chat2bridge: | $(NIMBLEDEPS_STAMP) build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim chat2bridge $(NIM_PARAMS) waku.nims
+		nimble chat2bridge

-liteprotocoltester: | build deps librln
+liteprotocoltester: | $(NIMBLEDEPS_STAMP) build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim liteprotocoltester $(NIM_PARAMS) waku.nims
+		nimble liteprotocoltester

-lightpushwithmix: | build deps librln
+lightpushwithmix: | $(NIMBLEDEPS_STAMP) build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim lightpushwithmix $(NIM_PARAMS) waku.nims
+		nimble lightpushwithmix

-api_example: | build deps librln
+api_example: | $(NIMBLEDEPS_STAMP) build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
 		$(ENV_SCRIPT) nim api_example $(NIM_PARAMS) waku.nims

-build/%: | build deps librln
+build/%: | $(NIMBLEDEPS_STAMP) build deps librln
 	echo -e $(BUILD_MSG) "build/$*" && \
-		$(ENV_SCRIPT) nim buildone $(NIM_PARAMS) waku.nims $*
+		nimble buildone $*

-compile-test: | build deps librln
+compile-test: | $(NIMBLEDEPS_STAMP) 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 ##
@ -293,29 +303,30 @@ compile-test: | build deps librln

 tools: networkmonitor wakucanary

-wakucanary: | build deps librln
+wakucanary: | $(NIMBLEDEPS_STAMP) build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
-		$(ENV_SCRIPT) nim wakucanary $(NIM_PARAMS) waku.nims
+		nimble wakucanary

-networkmonitor: | build deps librln
+networkmonitor: | $(NIMBLEDEPS_STAMP) 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
+.PHONY: build-nph install-nph print-nph-path

 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)
+ifneq ($(detected_OS),Windows)
+	if command -v nph > /dev/null 2>&1; then \
+		echo "nph already installed, skipping"; \
+	else \
+		echo "Installing nph globally"; \
+		(cd /tmp && nimble install nph@0.7.0 --accept -g); \
+	fi
+	command -v nph
 else
-		echo "nph utility already exists at " $(NPH)
+	echo "Skipping nph build on Windows (nph is only used on Unix-like systems)"
 endif

 GIT_PRE_COMMIT_HOOK := .git/hooks/pre-commit
@ -332,39 +343,30 @@ nph/%: | build-nph
 	echo -e $(FORMAT_MSG) "nph/$*" && \
 		$(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
+clean:

 ###################
 ## Documentation ##
 ###################
 .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,8 +374,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)" \
 		--label="version=$(GIT_VERSION)" \
@ -384,7 +384,7 @@ docker-quick-image: MAKE_TARGET ?= wakunode2
 docker-quick-image: DOCKER_IMAGE_TAG ?= $(MAKE_TARGET)-$(GIT_VERSION)
 docker-quick-image: DOCKER_IMAGE_NAME ?= wakuorg/nwaku:$(DOCKER_IMAGE_TAG)
 docker-quick-image: NIM_PARAMS := $(NIM_PARAMS) -d:chronicles_colors:none -d:insecure -d:postgres --passL:$(LIBRLN_FILE) --passL:-lm
-docker-quick-image: | build deps librln wakunode2
+docker-quick-image: | build librln wakunode2
 	docker build \
 		--build-arg="MAKE_TARGET=$(MAKE_TARGET)" \
 		--tag $(DOCKER_IMAGE_NAME) \
@ -398,20 +398,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)" \
 		--target $(if $(filter deploy,$(DOCKER_LPT_TAG)),deployment_lpt,standalone_lpt) \
@ -430,39 +424,38 @@ docker-quick-liteprotocoltester: | liteprotocoltester
 docker-liteprotocoltester-push:
 	docker push $(DOCKER_LPT_NAME)

-
 ################
 ## C Bindings ##
 ################
 .PHONY: cbindings cwaku_example libwaku liblogosdelivery liblogosdelivery_example

+detected_OS ?= Linux
+ifeq ($(OS),Windows_NT)
+detected_OS := Windows
+else
+detected_OS := $(shell uname -s)
+endif
+
+BUILD_COMMAND ?= Dynamic
 STATIC ?= 0
-LIBWAKU_BUILD_COMMAND ?= libwakuDynamic
-LIBLOGOSDELIVERY_BUILD_COMMAND ?= liblogosdeliveryDynamic
+ifeq ($(STATIC), 1)
+	BUILD_COMMAND = Static
+endif

 ifeq ($(detected_OS),Windows)
-	LIB_EXT_DYNAMIC = dll
-	LIB_EXT_STATIC = lib
+	BUILD_COMMAND := $(BUILD_COMMAND)Windows
 else ifeq ($(detected_OS),Darwin)
-	LIB_EXT_DYNAMIC = dylib
-	LIB_EXT_STATIC = a
+	BUILD_COMMAND := $(BUILD_COMMAND)Mac
+	export IOS_SDK_PATH := $(shell xcrun --sdk iphoneos --show-sdk-path)
 else ifeq ($(detected_OS),Linux)
-	LIB_EXT_DYNAMIC = so
-	LIB_EXT_STATIC = a
+	BUILD_COMMAND := $(BUILD_COMMAND)Linux
 endif

-LIB_EXT := $(LIB_EXT_DYNAMIC)
-ifeq ($(STATIC), 1)
-	LIB_EXT = $(LIB_EXT_STATIC)
-	LIBWAKU_BUILD_COMMAND = libwakuStatic
-	LIBLOGOSDELIVERY_BUILD_COMMAND = liblogosdeliveryStatic
-endif
+libwaku: | $(NIMBLEDEPS_STAMP) librln
+	nimble --verbose libwaku$(BUILD_COMMAND) waku.nimble

-libwaku: | build deps librln
-	echo -e $(BUILD_MSG) "build/$@.$(LIB_EXT)" && $(ENV_SCRIPT) nim $(LIBWAKU_BUILD_COMMAND) $(NIM_PARAMS) waku.nims $@.$(LIB_EXT)
-
-liblogosdelivery: | build deps librln
-	echo -e $(BUILD_MSG) "build/$@.$(LIB_EXT)" && $(ENV_SCRIPT) nim $(LIBLOGOSDELIVERY_BUILD_COMMAND) $(NIM_PARAMS) waku.nims $@.$(LIB_EXT)
+liblogosdelivery: | $(NIMBLEDEPS_STAMP) librln
+	nimble --verbose liblogosdelivery$(BUILD_COMMAND) waku.nimble

 logosdelivery_example: | build liblogosdelivery
 	@echo -e $(BUILD_MSG) "build/$@"
@ -492,17 +485,35 @@ else ifeq ($(detected_OS),Windows)
 		-lws2_32
 endif

+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)
@ -511,22 +522,19 @@ 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
+	$(MAKE) rebuild-nat-libs-nimbledeps CC=$(ANDROID_TOOLCHAIN_DIR)/bin/$(ANDROID_COMPILER)

 libwaku-android-arm64: ANDROID_ARCH=aarch64-linux-android
 libwaku-android-arm64: CPU=arm64
@ -550,29 +558,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
@ -584,59 +586,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 #
 ###################
@ -649,6 +617,4 @@ release-notes:
 		-u $(shell id -u) \
 		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
+			sed -E 's@#([0-9]+)@[#\1](https://github.com/waku-org/nwaku/issues/\1)@g'
--- a/Nat.mk
+++ b/Nat.mk
@ -0,0 +1,54 @@
+# Copyright (c) 2022 Status Research & Development GmbH. Licensed under
+# either of:
+# - Apache License, version 2.0
+# - MIT license
+# at your option. This file may not be copied, modified, or distributed except
+# according to those terms.
+
+###########################
+## nat-libs (nimbledeps) ##
+###########################
+# Builds miniupnpc and libnatpmp from the package installed by nimble under
+# nimbledeps/pkgs2/. Used by `make update` / $(NIMBLEDEPS_STAMP).
+#
+# NAT_TRAVERSAL_NIMBLEDEPS_DIR is evaluated at parse time, so targets that
+# depend on it must be invoked via a recursive $(MAKE) call so the sub-make
+# re-evaluates the variable after nimble setup has populated nimbledeps/.
+#
+# `ls -dt` (sort by modification time, newest first) is used to pick the
+# latest installed version and is portable across Linux, macOS, and
+# Windows (MSYS/MinGW).
+
+NAT_TRAVERSAL_NIMBLEDEPS_DIR := $(shell ls -dt $(CURDIR)/nimbledeps/pkgs2/nat_traversal-* 2>/dev/null | head -1)
+
+.PHONY: clean-cross-nimbledeps rebuild-nat-libs-nimbledeps
+
+clean-cross-nimbledeps:
+ifeq ($(NAT_TRAVERSAL_NIMBLEDEPS_DIR),)
+	$(error No nat_traversal package found under nimbledeps/pkgs2/ — run 'make update' first)
+endif
+	+ [ -e "$(NAT_TRAVERSAL_NIMBLEDEPS_DIR)/vendor/miniupnp/miniupnpc" ] && \
+		"$(MAKE)" -C "$(NAT_TRAVERSAL_NIMBLEDEPS_DIR)/vendor/miniupnp/miniupnpc" CC=$(CC) clean $(HANDLE_OUTPUT) || true
+	+ [ -e "$(NAT_TRAVERSAL_NIMBLEDEPS_DIR)/vendor/libnatpmp-upstream" ] && \
+		"$(MAKE)" -C "$(NAT_TRAVERSAL_NIMBLEDEPS_DIR)/vendor/libnatpmp-upstream" CC=$(CC) clean $(HANDLE_OUTPUT) || true
+
+rebuild-nat-libs-nimbledeps: | clean-cross-nimbledeps
+ifeq ($(NAT_TRAVERSAL_NIMBLEDEPS_DIR),)
+	$(error No nat_traversal package found under nimbledeps/pkgs2/ — run 'make update' first)
+endif
+	@echo "Rebuilding nat-libs from $(NAT_TRAVERSAL_NIMBLEDEPS_DIR)"
+ifeq ($(OS), Windows_NT)
+	+ [ -e "$(NAT_TRAVERSAL_NIMBLEDEPS_DIR)/vendor/miniupnp/miniupnpc/libminiupnpc.a" ] || \
+		PATH=".;$${PATH}" "$(MAKE)" -C "$(NAT_TRAVERSAL_NIMBLEDEPS_DIR)/vendor/miniupnp/miniupnpc" \
+		-f Makefile.mingw CC=$(CC) CFLAGS="-Os -fPIC" libminiupnpc.a $(HANDLE_OUTPUT)
+	+ "$(MAKE)" -C "$(NAT_TRAVERSAL_NIMBLEDEPS_DIR)/vendor/libnatpmp-upstream" \
+		OS=mingw CC=$(CC) \
+		CFLAGS="-Wall -Wno-cpp -Os -fPIC -DWIN32 -DNATPMP_STATICLIB -DENABLE_STRNATPMPERR -DNATPMP_MAX_RETRIES=4 $(CFLAGS)" \
+		libnatpmp.a $(HANDLE_OUTPUT)
+else
+	+ "$(MAKE)" -C "$(NAT_TRAVERSAL_NIMBLEDEPS_DIR)/vendor/miniupnp/miniupnpc" \
+		CC=$(CC) CFLAGS="-Os -fPIC" build/libminiupnpc.a $(HANDLE_OUTPUT)
+	+ "$(MAKE)" CFLAGS="-Wall -Wno-cpp -Os -fPIC -DENABLE_STRNATPMPERR -DNATPMP_MAX_RETRIES=4 $(CFLAGS)" \
+		-C "$(NAT_TRAVERSAL_NIMBLEDEPS_DIR)/vendor/libnatpmp-upstream" \
+		CC=$(CC) libnatpmp.a $(HANDLE_OUTPUT)
+endif
--- a/apps/wakunode2/wakunode2.nim
+++ b/apps/wakunode2/wakunode2.nim
@ -5,7 +5,6 @@ import
  chronicles,
  chronos,
  metrics,
-  libbacktrace,
  system/ansi_c,
  libp2p/crypto/crypto
 import
@ -88,7 +87,7 @@ when isMainModule:
    when defined(posix):
      proc handleSigsegv(signal: cint) {.noconv.} =
        # Require --debugger:native
-        fatal "Shutting down after receiving SIGSEGV", stacktrace = getBacktrace()
+        fatal "Shutting down after receiving SIGSEGV"

        # Not available in -d:release mode
        writeStackTrace()
--- a/config.nims
+++ b/config.nims
@ -9,12 +9,6 @@ if defined(windows):
  switch("passL", "rln.lib")
  switch("define", "postgres=false")

-  # Automatically add all vendor subdirectories
-  for dir in walkDir("./vendor"):
-    if dir.kind == pcDir:
-      switch("path", dir.path)
-      switch("path", dir.path / "src")
-
  # disable timestamps in Windows PE headers - https://wiki.debian.org/ReproducibleBuilds/TimestampsInPEBinaries
  switch("passL", "-Wl,--no-insert-timestamp")
  # increase stack size
@ -121,3 +115,8 @@ if defined(android):
  switch("passC", "--sysroot=" & sysRoot)
  switch("passL", "--sysroot=" & sysRoot)
  switch("cincludes", sysRoot & "/usr/include/")
+# begin Nimble config (version 2)
+when withDir(thisDir(), system.fileExists("nimble.paths")):
+  --noNimblePath
+  include "nimble.paths"
+# end Nimble config
--- a/env.sh
+++ b/env.sh
@ -1,8 +0,0 @@
-#!/bin/bash
-
-# We use ${BASH_SOURCE[0]} instead of $0 to allow sourcing this file
-# and we fall back to a Zsh-specific special var to also support Zsh.
-REL_PATH="$(dirname ${BASH_SOURCE[0]:-${(%):-%x}})"
-ABS_PATH="$(cd ${REL_PATH}; pwd)"
-source ${ABS_PATH}/vendor/nimbus-build-system/scripts/env.sh
-
--- a/flake.lock
+++ b/flake.lock
@ -2,27 +2,48 @@
  "nodes": {
    "nixpkgs": {
      "locked": {
-        "lastModified": 1757590060,
-        "narHash": "sha256-EWwwdKLMZALkgHFyKW7rmyhxECO74+N+ZO5xTDnY/5c=",
+        "lastModified": 1770464364,
+        "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "0ef228213045d2cdb5a169a95d63ded38670b293",
+        "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "0ef228213045d2cdb5a169a95d63ded38670b293",
+        "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457",
        "type": "github"
      }
    },
    "root": {
      "inputs": {
        "nixpkgs": "nixpkgs",
+        "rust-overlay": "rust-overlay",
        "zerokit": "zerokit"
      }
    },
    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1775099554,
+        "narHash": "sha256-3xBsGnGDLOFtnPZ1D3j2LU19wpAlYefRKTlkv648rU0=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "8d6387ed6d8e6e6672fd3ed4b61b59d44b124d99",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_2": {
      "inputs": {
        "nixpkgs": [
          "zerokit",
@ -30,11 +51,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1748399823,
-        "narHash": "sha256-kahD8D5hOXOsGbNdoLLnqCL887cjHkx98Izc37nDjlA=",
+        "lastModified": 1771211437,
+        "narHash": "sha256-lcNK438i4DGtyA+bPXXyVLHVmJjYpVKmpux9WASa3ro=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "d68a69dc71bc19beb3479800392112c2f6218159",
+        "rev": "c62195b3d6e1bb11e0c2fb2a494117d3b55d410f",
        "type": "github"
      },
      "original": {
@ -48,21 +69,21 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "rust-overlay": "rust-overlay"
+        "rust-overlay": "rust-overlay_2"
      },
      "locked": {
-        "lastModified": 1762211504,
-        "narHash": "sha256-SbDoBElFYJ4cYebltxlO2lYnz6qOaDAVY6aNJ5bqHDE=",
-        "ref": "refs/heads/master",
-        "rev": "3160d9504d07791f2fc9b610948a6cf9a58ed488",
-        "revCount": 342,
-        "type": "git",
-        "url": "https://github.com/vacp2p/zerokit"
+        "lastModified": 1771279884,
+        "narHash": "sha256-tzkQPwSl4vPTUo1ixHh6NCENjsBDroMKTjifg2q8QX8=",
+        "owner": "vacp2p",
+        "repo": "zerokit",
+        "rev": "53b18098e6d5d046e3eb1ac338a8f4f651432477",
+        "type": "github"
      },
      "original": {
-        "rev": "3160d9504d07791f2fc9b610948a6cf9a58ed488",
-        "type": "git",
-        "url": "https://github.com/vacp2p/zerokit"
+        "owner": "vacp2p",
+        "repo": "zerokit",
+        "rev": "53b18098e6d5d046e3eb1ac338a8f4f651432477",
+        "type": "github"
      }
    }
  },
--- a/flake.nix
+++ b/flake.nix
@ -1,92 +1,70 @@
 {
-  description = "Logos Messaging Nim build flake";
+  description = "logos-delivery nim build flake";

  nixConfig = {
    extra-substituters = [ "https://nix-cache.status.im/" ];
-    extra-trusted-public-keys = [ "nix-cache.status.im-1:x/93lOfLU+duPplwMSBR+OlY4+mo+dCN7n0mr4oPwgY=" ];
+    extra-trusted-public-keys = [
+      "nix-cache.status.im-1:x/93lOfLU+duPplwMSBR+OlY4+mo+dCN7n0mr4oPwgY="
+    ];
  };

  inputs = {
-    # Ensure Nix fetches git submodules (vendor/*) when evaluating this flake.
-    # Requires Nix >= 2.27.  Consumers no longer need '?submodules=1' in the URL.
-    self.submodules = true;
+    # Pinning the commit to use same commit across different projects.
+    # A commit from nixpkgs 25.11 release: https://github.com/NixOS/nixpkgs/tree/release-25.11
+    nixpkgs.url = "github:NixOS/nixpkgs?rev=23d72dabcb3b12469f57b37170fcbc1789bd7457";

-    # We are pinning the commit because ultimately we want to use same commit across different projects.
-    # A commit from nixpkgs 24.11 release : https://github.com/NixOS/nixpkgs/tree/release-24.11
-    nixpkgs.url = "github:NixOS/nixpkgs/0ef228213045d2cdb5a169a95d63ded38670b293";
-    # WARNING: Remember to update commit and use 'nix flake update' to update flake.lock.
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    # External flake input: Zerokit pinned to a specific commit.
+    # Update the rev here when a new zerokit version is needed.
    zerokit = {
-      url = "git+https://github.com/vacp2p/zerokit?rev=3160d9504d07791f2fc9b610948a6cf9a58ed488";
+      url = "github:vacp2p/zerokit/53b18098e6d5d046e3eb1ac338a8f4f651432477";
      inputs.nixpkgs.follows = "nixpkgs";
    };
  };

-  outputs = { self, nixpkgs, zerokit }:
+  outputs = { self, nixpkgs, rust-overlay, zerokit }:
    let
-      stableSystems = [
+      systems = [
        "x86_64-linux" "aarch64-linux"
        "x86_64-darwin" "aarch64-darwin"
-        "x86_64-windows" "i686-linux"
-        "i686-windows"
+        "x86_64-windows"
      ];

-      forAllSystems = f: nixpkgs.lib.genAttrs stableSystems (system: f system);
+      forAllSystems = nixpkgs.lib.genAttrs systems;

-      pkgsFor = forAllSystems (
-        system: import nixpkgs {
-          inherit system;
-          config = {
-            android_sdk.accept_license = true;
-            allowUnfree = true;
+      pkgsFor = system: import nixpkgs {
+        inherit system;
+        overlays = [ (import rust-overlay) ];
+      };
+    in {
+      packages = forAllSystems (system:
+        let
+          pkgs = pkgsFor system;
+          mkPkg = zerokitRln: import ./nix/default.nix {
+            inherit pkgs zerokitRln;
+            src = ./.;
          };
-          overlays =  [
-            (final: prev: {
-              androidEnvCustom = prev.callPackage ./nix/pkgs/android-sdk { };
-              androidPkgs = final.androidEnvCustom.pkgs;
-              androidShell = final.androidEnvCustom.shell;
-            })
-          ];
+        in rec {
+          liblogosdelivery = mkPkg zerokit.packages.${system}.rln;
+          default          = liblogosdelivery;
        }
      );

-    in rec {
-      packages = forAllSystems (system: let
-        pkgs = pkgsFor.${system};
-      in rec {
-        libwaku-android-arm64 = pkgs.callPackage ./nix/default.nix {
-          inherit stableSystems;
-          src = self;
-          targets = ["libwaku-android-arm64"];
-          abidir = "arm64-v8a";
-          zerokitRln = zerokit.packages.${system}.rln-android-arm64;
-        };
-
-        libwaku = pkgs.callPackage ./nix/default.nix {
-          inherit stableSystems;
-          src = self;
-          targets = ["libwaku"];
-          zerokitRln = zerokit.packages.${system}.rln;
-        };
-
-        wakucanary = pkgs.callPackage ./nix/default.nix {
-          inherit stableSystems;
-          src = self;
-          targets = ["wakucanary"];
-          zerokitRln = zerokit.packages.${system}.rln;
-        };
-
-        liblogosdelivery = pkgs.callPackage ./nix/default.nix {
-          inherit stableSystems;
-          src = self;
-          targets = ["liblogosdelivery"];
-          zerokitRln = zerokit.packages.${system}.rln;
-        };
-
-        default = libwaku;
-      });
-
-      devShells = forAllSystems (system: {
-        default = pkgsFor.${system}.callPackage ./nix/shell.nix {};
-      });
+      devShells = forAllSystems (system:
+        let
+          pkgs = pkgsFor system;
+        in {
+          default = pkgs.mkShell {
+            nativeBuildInputs = with pkgs; [
+              nim-2_2
+              nimble
+            ];
+          };
+        }
+      );
    };
 }
--- a/nimble.lock
+++ b/nimble.lock
@ -0,0 +1,551 @@
+{
+  "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.7",
+      "vcsRevision": "3b341f30d8c619b9a75c154243f9a55468a404e2",
+      "url": "https://github.com/status-im/nim-bearssl",
+      "downloadMethod": "git",
+      "dependencies": [
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "a85aab15b1b9a8b2438e9a128ac2eba41227da79"
+      }
+    },
+    "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.5.0",
+      "vcsRevision": "4382b18f04b3c43c8409bfcd6b62063773b2bbaa",
+      "url": "https://github.com/status-im/nim-stew",
+      "downloadMethod": "git",
+      "dependencies": [
+        "results",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "db22942939773ab7d5a0f2b2668c237240c67dd6"
+      }
+    },
+    "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.1",
+      "vcsRevision": "6ce5e5e2301ccbc04b09d27ff78741ff4d352b4d",
+      "url": "https://github.com/status-im/nim-testutils",
+      "downloadMethod": "git",
+      "dependencies": [
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "96a11cf8b84fa9bd12d4a553afa1cc4b7f9df4e3"
+      }
+    },
+    "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.1",
+      "vcsRevision": "f142cb2e8bd812dd002a6493b6082827bb248592",
+      "url": "https://github.com/status-im/nim-http-utils",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "results",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "016774ab31c3afff9a423f7d80584905ee59c570"
+      }
+    },
+    "chronos": {
+      "version": "4.2.2",
+      "vcsRevision": "45f43a9ad8bd8bcf5903b42f365c1c879bd54240",
+      "url": "https://github.com/status-im/nim-chronos",
+      "downloadMethod": "git",
+      "dependencies": [
+        "results",
+        "stew",
+        "bearssl",
+        "httputils",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "3a4c9477df8cef20a04e4f1b54a2d74fdfc2a3d0"
+      }
+    },
+    "confutils": {
+      "version": "0.1.0",
+      "vcsRevision": "7728f6bd81a1eedcfe277d02ea85fdb805bcc05a",
+      "url": "https://github.com/status-im/nim-confutils",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "serialization",
+        "results"
+      ],
+      "checksums": {
+        "sha1": "8bc8c30b107fdba73b677e5f257c6c42ae1cdc8e"
+      }
+    },
+    "db_connector": {
+      "version": "0.1.0",
+      "vcsRevision": "29450a2063970712422e1ab857695c12d80112a6",
+      "url": "https://github.com/nim-lang/db_connector",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "4f2e67d0e4b61af9ac5575509305660b473f01a4"
+      }
+    },
+    "dnsclient": {
+      "version": "0.3.4",
+      "vcsRevision": "23214235d4784d24aceed99bbfe153379ea557c8",
+      "url": "https://github.com/ba0f3/dnsclient.nim",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "65262c7e533ff49d6aca5539da4bc6c6ce132f40"
+      }
+    },
+    "nimcrypto": {
+      "version": "0.6.4",
+      "vcsRevision": "721fb99ee099b632eb86dfad1f0d96ee87583774",
+      "url": "https://github.com/cheatfate/nimcrypto",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "f9ab24fa940ed03d0fb09729a7303feb50b7eaec"
+      }
+    },
+    "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": "d8f1288b7c72f00be5fc2c5ea72bf5cae1eafb15",
+      "url": "https://github.com/status-im/nim-secp256k1",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "results",
+        "nimcrypto"
+      ],
+      "checksums": {
+        "sha1": "6618ef9de17121846a8c1d0317026b0ce8584e10"
+      }
+    },
+    "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.2.1",
+      "vcsRevision": "a1296caf3ebb5f30f51a5feae7749a30df2824c2",
+      "url": "https://github.com/status-im/nim-metrics",
+      "downloadMethod": "git",
+      "dependencies": [
+        "chronos",
+        "results",
+        "stew"
+      ],
+      "checksums": {
+        "sha1": "84bb09873d7677c06046f391c7b473cd2fcff8a2"
+      }
+    },
+    "sqlite3_abi": {
+      "version": "3.52.0.0",
+      "vcsRevision": "4b79c5e1882b7fc6c00aec311daf1ed50ad653d5",
+      "url": "https://github.com/arnetheduck/nim-sqlite3-abi",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "b56b489a7cb01eef8821d66d38d411923a14316d"
+      }
+    },
+    "minilru": {
+      "version": "0.1.0",
+      "vcsRevision": "6dd93feb60f4cded3c05e7af7209cf63fb677893",
+      "url": "https://github.com/status-im/nim-minilru",
+      "downloadMethod": "git",
+      "dependencies": [
+        "results",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "0be03a5da29fdd4409ea74a60fd0ccce882601b4"
+      }
+    },
+    "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": "38f2e0f52c0a8f032ef4530835e519d550706d9e",
+      "url": "https://github.com/status-im/nim-dnsdisc",
+      "downloadMethod": "git",
+      "dependencies": [
+        "bearssl",
+        "chronicles",
+        "chronos",
+        "eth",
+        "secp256k1",
+        "stew",
+        "testutils",
+        "unittest2",
+        "nimcrypto",
+        "results"
+      ],
+      "checksums": {
+        "sha1": "055b882a0f6b1d1e57a25a7af99d2e5ac6268154"
+      }
+    },
+    "taskpools": {
+      "version": "0.1.0",
+      "vcsRevision": "9e8ccc754631ac55ac2fd495e167e74e86293edb",
+      "url": "https://github.com/status-im/nim-taskpools",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "09e1b2fdad55b973724d61227971afc0df0b7a81"
+      }
+    },
+    "ffi": {
+      "version": "0.1.3",
+      "vcsRevision": "06111de155253b34e47ed2aaed1d61d08d62cc1b",
+      "url": "https://github.com/logos-messaging/nim-ffi",
+      "downloadMethod": "git",
+      "dependencies": [
+        "chronos",
+        "chronicles",
+        "taskpools"
+      ],
+      "checksums": {
+        "sha1": "6f9d49375ea1dc71add55c72ac80a808f238e5b0"
+      }
+    },
+    "zlib": {
+      "version": "0.1.0",
+      "vcsRevision": "e680f269fb01af2c34a2ba879ff281795a5258fe",
+      "url": "https://github.com/status-im/nim-zlib",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "results"
+      ],
+      "checksums": {
+        "sha1": "bbde4f5a97a84b450fef7d107461e5f35cf2b47f"
+      }
+    },
+    "websock": {
+      "version": "0.2.2",
+      "vcsRevision": "3918ce3900c83e1cc7496232a307709f195f7acd",
+      "url": "https://github.com/status-im/nim-websock",
+      "downloadMethod": "git",
+      "dependencies": [
+        "chronos",
+        "httputils",
+        "chronicles",
+        "stew",
+        "nimcrypto",
+        "bearssl",
+        "results",
+        "zlib"
+      ],
+      "checksums": {
+        "sha1": "3c424661eff56c925b01e1cd1a911ff744e72962"
+      }
+    },
+    "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"
+      }
+    },
+    "lsquic": {
+      "version": "0.0.1",
+      "vcsRevision": "4fb03ee7bfb39aecb3316889fdcb60bec3d0936f",
+      "url": "https://github.com/vacp2p/nim-lsquic",
+      "downloadMethod": "git",
+      "dependencies": [
+        "zlib",
+        "stew",
+        "chronos",
+        "nimcrypto",
+        "unittest2",
+        "chronicles"
+      ],
+      "checksums": {
+        "sha1": "f465fa994346490d0924d162f53d9b5aec62f948"
+      }
+    },
+    "libp2p": {
+      "version": "1.15.2",
+      "vcsRevision": "ff8d51857b4b79a68468e7bcc27b2026cca02996",
+      "url": "https://github.com/vacp2p/nim-libp2p.git",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nimcrypto",
+        "dnsclient",
+        "bearssl",
+        "chronicles",
+        "chronos",
+        "metrics",
+        "secp256k1",
+        "stew",
+        "websock",
+        "unittest2",
+        "results",
+        "serialization",
+        "lsquic",
+        "jwt"
+      ],
+      "checksums": {
+        "sha1": "fa2a7552c6ec860717b77ce34cf0b7afe4570234"
+      }
+    },
+    "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"
+      }
+    },
+    "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": {}
+}
--- a/nix/default.nix
+++ b/nix/default.nix
@ -1,149 +1,101 @@
-{
-  pkgs,
-  src ? ../.,
-  targets ? ["libwaku-android-arm64"],
-  verbosity ? 1,
-  useSystemNim ? true,
-  quickAndDirty ? true,
-  stableSystems ? [
-    "x86_64-linux" "aarch64-linux"
-  ],
-  abidir ? null,
-  zerokitRln,
-}:
-
-assert pkgs.lib.assertMsg (builtins.pathExists "${src}/vendor/nimbus-build-system/scripts")
-  "Unable to build without submodules. Append '?submodules=1#' to the URI.";
+{ pkgs, src, zerokitRln }:

 let
-  inherit (pkgs) stdenv lib writeScriptBin callPackage;
+  deps      = import ./deps.nix    { inherit pkgs; };

-  androidManifest = "<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\" package=\"com.example.mylibrary\" />";
+  # nat_traversal is excluded from the static pathArgs; it is handled
+  # separately in buildPhase (its bundled C libs must be compiled first).
+  otherDeps = builtins.removeAttrs deps [ "nat_traversal" ];

-  tools = pkgs.callPackage ./tools.nix {};
-  version = tools.findKeyValue "^version = \"([a-f0-9.-]+)\"$" ../waku.nimble;
-  revision = lib.substring 0 8 (src.rev or src.dirtyRev or "00000000");
-  copyLibwaku = lib.elem "libwaku" targets;
-  copyLiblogosdelivery = lib.elem "liblogosdelivery" targets;
-  copyWakunode2 = lib.elem "wakunode2" targets;
-  hasKnownInstallTarget = copyLibwaku || copyLiblogosdelivery || copyWakunode2;
+  # Some packages (e.g. regex, unicodedb) put their .nim files under src/
+  # while others use the repo root. Pass both so the compiler finds either layout.
+  pathArgs =
+    builtins.concatStringsSep " "
+      (builtins.concatMap (p: [ "--path:${p}" "--path:${p}/src" ])
+        (builtins.attrValues otherDeps));

-in stdenv.mkDerivation {
-  pname = "logos-messaging-nim";
-  version = "${version}-${revision}";
+  libExt =
+    if pkgs.stdenv.hostPlatform.isWindows then "dll"
+    else if pkgs.stdenv.hostPlatform.isDarwin then "dylib"
+    else "so";
+in
+pkgs.stdenv.mkDerivation {
+  pname = "liblogosdelivery";
+  version = "dev";

  inherit src;

-  # Runtime dependencies
-  buildInputs = with pkgs; [
-    openssl gmp zip
-  ];
+  nativeBuildInputs = with pkgs; [
+    nim-2_2
+    git
+    gnumake
+    which
+  ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.darwin.cctools ];

-  # Dependencies that should only exist in the build environment.
-  nativeBuildInputs = let
-    # Fix for Nim compiler calling 'git rev-parse' and 'lsb_release'.
-    fakeGit = writeScriptBin "git" "echo ${version}";
-  in with pkgs; [
-    cmake which zerokitRln nim-unwrapped-2_2 fakeGit
-  ] ++ lib.optionals stdenv.isDarwin [
-    pkgs.darwin.cctools gcc # Necessary for libbacktrace
-  ];
+  buildInputs = [ zerokitRln ];

-  # Environment variables required for Android builds
-  ANDROID_SDK_ROOT = "${pkgs.androidPkgs.sdk}";
-  ANDROID_NDK_HOME = "${pkgs.androidPkgs.ndk}";
-  NIMFLAGS = "-d:disableMarchNative -d:git_revision_override=${revision}";
-  XDG_CACHE_HOME = "/tmp";
+  buildPhase = ''
+    export HOME=$TMPDIR
+    export XDG_CACHE_HOME=$TMPDIR/.cache
+    export NIMBLE_DIR=$TMPDIR/.nimble
+    export NIMCACHE=$TMPDIR/nimcache

-  makeFlags = targets ++ [
-    "V=${toString verbosity}"
-    "QUICK_AND_DIRTY_COMPILER=${if quickAndDirty then "1" else "0"}"
-    "QUICK_AND_DIRTY_NIMBLE=${if quickAndDirty then "1" else "0"}"
-    "USE_SYSTEM_NIM=${if useSystemNim then "1" else "0"}"
-    "LIBRLN_FILE=${zerokitRln}/lib/librln.${if abidir != null then "so" else "a"}"
-    "POSTGRES=1"
-  ];
+    mkdir -p build $NIMCACHE

-  configurePhase = ''
-    patchShebangs . vendor/nimbus-build-system > /dev/null
+    # nat_traversal bundles C sub-libraries that must be compiled before linking.
+    # Copy the fetchgit store path to a writable tmpdir, build, then pass to nim.
+    NAT_TRAV=$TMPDIR/nat_traversal
+    cp -r ${deps.nat_traversal} $NAT_TRAV
+    chmod -R +w $NAT_TRAV

-    # build_nim.sh guards "rm -rf dist/checksums" with NIX_BUILD_TOP != "/build",
-    # but on macOS the nix sandbox uses /private/tmp/... so the check fails and
-    # dist/checksums (provided via preBuild) gets deleted. Fix the check to skip
-    # the removal whenever NIX_BUILD_TOP is set (i.e. any nix build).
-    substituteInPlace vendor/nimbus-build-system/scripts/build_nim.sh \
-      --replace 'if [[ "''${NIX_BUILD_TOP}" != "/build" ]]; then' \
-                'if [[ -z "''${NIX_BUILD_TOP}" ]]; then'
+    make -C $NAT_TRAV/vendor/miniupnp/miniupnpc \
+      CFLAGS="-Os -fPIC" build/libminiupnpc.a

-    make nimbus-build-system-paths
-    make nimbus-build-system-nimble-dir
+    make -C $NAT_TRAV/vendor/libnatpmp-upstream \
+      CFLAGS="-Wall -Os -fPIC -DENABLE_STRNATPMPERR -DNATPMP_MAX_RETRIES=4" libnatpmp.a
+
+    echo "== Building liblogosdelivery (dynamic) =="
+    nim c \
+      --noNimblePath \
+      ${pathArgs} \
+      --path:$NAT_TRAV \
+      --path:$NAT_TRAV/src \
+      --passL:"-L${zerokitRln}/lib -lrln" \
+      --define:disable_libbacktrace \
+      --out:build/liblogosdelivery.${libExt} \
+      --app:lib \
+      --threads:on \
+      --opt:size \
+      --noMain \
+      --mm:refc \
+      --header \
+      --nimMainPrefix:liblogosdelivery \
+      --nimcache:$NIMCACHE \
+      liblogosdelivery/liblogosdelivery.nim
+
+    echo "== Building liblogosdelivery (static) =="
+    nim c \
+      --noNimblePath \
+      ${pathArgs} \
+      --path:$NAT_TRAV \
+      --path:$NAT_TRAV/src \
+      --passL:"-L${zerokitRln}/lib -lrln" \
+      --define:disable_libbacktrace \
+      --out:build/liblogosdelivery.a \
+      --app:staticlib \
+      --threads:on \
+      --opt:size \
+      --noMain \
+      --mm:refc \
+      --nimMainPrefix:liblogosdelivery \
+      --nimcache:$NIMCACHE \
+      liblogosdelivery/liblogosdelivery.nim
  '';

-  # For the Nim v2.2.4 built with NBS we added sat and zippy
-  preBuild = lib.optionalString (!useSystemNim) ''
-    pushd vendor/nimbus-build-system/vendor/Nim
-    mkdir dist
-    mkdir -p dist/nimble/vendor/sat
-    mkdir -p dist/nimble/vendor/checksums
-    mkdir -p dist/nimble/vendor/zippy
-
-    cp -r ${callPackage ./nimble.nix {}}/.    dist/nimble
-    cp -r ${callPackage ./checksums.nix {}}/. dist/checksums
-    cp -r ${callPackage ./csources.nix {}}/.  csources_v2
-    cp -r ${callPackage ./sat.nix {}}/.       dist/nimble/vendor/sat
-    cp -r ${callPackage ./checksums.nix {}}/. dist/nimble/vendor/checksums
-    cp -r ${callPackage ./zippy.nix {}}/.     dist/nimble/vendor/zippy
-    chmod 777 -R dist/nimble csources_v2
-    popd
-  '';
-
-  installPhase = if abidir != null then ''
-    mkdir -p $out/jni
-    cp -r ./build/android/${abidir}/* $out/jni/
-    echo '${androidManifest}' > $out/jni/AndroidManifest.xml
-    cd $out && zip -r libwaku.aar *
-  '' else ''
-    mkdir -p $out/bin $out/include
-
-    # Copy artifacts from build directory (created by Make during buildPhase)
-    # Note: build/ is in the source tree, not result/ (which is a post-build symlink)
-    if [ -d build ]; then
-      ${lib.optionalString copyLibwaku ''
-      cp build/libwaku.{so,dylib,dll,a,lib} $out/bin/ 2>/dev/null || true
-      ''}
-
-      ${lib.optionalString copyLiblogosdelivery ''
-      cp build/liblogosdelivery.{so,dylib,dll,a,lib} $out/bin/ 2>/dev/null || true
-      ''}
-
-      ${lib.optionalString copyWakunode2 ''
-      cp build/wakunode2 $out/bin/ 2>/dev/null || true
-      ''}
-
-      ${lib.optionalString (!hasKnownInstallTarget) ''
-      cp build/lib*.{so,dylib,dll,a,lib} $out/bin/ 2>/dev/null || true
-      ''}
-    fi
-
-    # Copy header files
-    ${lib.optionalString copyLibwaku ''
-    cp library/libwaku.h $out/include/ 2>/dev/null || true
-    ''}
-
-    ${lib.optionalString copyLiblogosdelivery ''
+  installPhase = ''
+    mkdir -p $out/lib $out/include
+    cp build/liblogosdelivery.${libExt} $out/lib/ 2>/dev/null || true
+    cp build/liblogosdelivery.a         $out/lib/ 2>/dev/null || true
    cp liblogosdelivery/liblogosdelivery.h $out/include/ 2>/dev/null || true
-    ''}
-
-    ${lib.optionalString (!hasKnownInstallTarget) ''
-    cp library/libwaku.h $out/include/ 2>/dev/null || true
-    cp liblogosdelivery/liblogosdelivery.h $out/include/ 2>/dev/null || true
-    ''}
  '';
-
-  meta = with pkgs.lib; {
-    description = "NWaku derivation to build libwaku for mobile targets using Android NDK and Rust.";
-    homepage = "https://github.com/status-im/nwaku";
-    license = licenses.mit;
-    platforms = stableSystems;
-  };
 }
--- a/nix/deps.nix
+++ b/nix/deps.nix
@ -0,0 +1,272 @@
+# AUTOGENERATED from nimble.lock — do not edit manually.
+# Regenerate with: ./tools/gen-nix-deps.sh nimble.lock nix/deps.nix
+{ pkgs }:
+
+{
+  unittest2 = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-unittest2";
+    rev = "26f2ef3ae0ec72a2a75bfe557e02e88f6a31c189";
+    sha256 = "1n8n36kad50m97b64y7bzzknz9n7szffxhp0bqpk3g2v7zpda8sw";
+    fetchSubmodules = true;
+  };
+
+  bearssl = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-bearssl";
+    rev = "3b341f30d8c619b9a75c154243f9a55468a404e2";
+    sha256 = "059avc2dh39vv9c3a1qayah98fjm5pw04r3dn2bqrgs6vf7licmv";
+    fetchSubmodules = true;
+  };
+
+  bearssl_pkey_decoder = pkgs.fetchgit {
+    url = "https://github.com/vacp2p/bearssl_pkey_decoder";
+    rev = "21dd3710df9345ed2ad8bf8f882761e07863b8e0";
+    sha256 = "0bl3f147zmkazbhdkr4cj1nipf9rqiw3g4hh1j424k9hpl55zdpg";
+    fetchSubmodules = true;
+  };
+
+  results = pkgs.fetchgit {
+    url = "https://github.com/arnetheduck/nim-results";
+    rev = "df8113dda4c2d74d460a8fa98252b0b771bf1f27";
+    sha256 = "1h7amas16sbhlr7zb7n3jb5434k98ji375vzw72k1fsc86vnmcr9";
+    fetchSubmodules = true;
+  };
+
+  stew = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-stew";
+    rev = "4382b18f04b3c43c8409bfcd6b62063773b2bbaa";
+    sha256 = "0mx9g5m636h3sk5pllcpylk51brf7lx91izx3gc23k3ih3hrxyk2";
+    fetchSubmodules = true;
+  };
+
+  faststreams = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-faststreams";
+    rev = "ce27581a3e881f782f482cb66dc5b07a02bd615e";
+    sha256 = "0y6bw2scnmr8cxj4fg18w7f34l2bh9qwg5nhlgd84m9fpr5bqarn";
+    fetchSubmodules = true;
+  };
+
+  serialization = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-serialization";
+    rev = "b0f2fa32960ea532a184394b0f27be37bd80248b";
+    sha256 = "0wip1fjx7ka39ck1g1xvmyarzq1p5dlngpqil6zff8k8z5skiz27";
+    fetchSubmodules = true;
+  };
+
+  json_serialization = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-json-serialization";
+    rev = "c343b0e243d9e17e2c40f3a8a24340f7c4a71d44";
+    sha256 = "0i8sq51nqj8lshf6bfixaz9a7sq0ahsbvq3chkxdvv4khsqvam91";
+    fetchSubmodules = true;
+  };
+
+  testutils = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-testutils";
+    rev = "6ce5e5e2301ccbc04b09d27ff78741ff4d352b4d";
+    sha256 = "1vbkr6i5yxhc2ai3b7rbglhmyc98f99x874fqdp6a152a6kqgwxy";
+    fetchSubmodules = true;
+  };
+
+  chronicles = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-chronicles";
+    rev = "27ec507429a4eb81edc20f28292ee8ec420be05b";
+    sha256 = "1xx9fcfwgcaizq3s7i3s03mclz253r5j8va38l9ycl19fcbc96z9";
+    fetchSubmodules = true;
+  };
+
+  httputils = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-http-utils";
+    rev = "f142cb2e8bd812dd002a6493b6082827bb248592";
+    sha256 = "03msj4zdxraz4qx9cidb17g7v0asazxv91nng6xxbzjxz0qaqxw6";
+    fetchSubmodules = true;
+  };
+
+  chronos = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-chronos";
+    rev = "45f43a9ad8bd8bcf5903b42f365c1c879bd54240";
+    sha256 = "1v1n59zfzznp97pvwgs9kf136bqmv4x2s2y9f24msspa7qv27w39";
+    fetchSubmodules = true;
+  };
+
+  confutils = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-confutils";
+    rev = "7728f6bd81a1eedcfe277d02ea85fdb805bcc05a";
+    sha256 = "18bj1ilx10jm2vmqx2wy2xl9rzy7alymi2m4n9jgpa4sbxnfh0x3";
+    fetchSubmodules = true;
+  };
+
+  db_connector = pkgs.fetchgit {
+    url = "https://github.com/nim-lang/db_connector";
+    rev = "29450a2063970712422e1ab857695c12d80112a6";
+    sha256 = "11dna09ccdhj3pzpqa04j7a95ibx907z6n1ff33yf0n92qa4x59z";
+    fetchSubmodules = true;
+  };
+
+  dnsclient = pkgs.fetchgit {
+    url = "https://github.com/ba0f3/dnsclient.nim";
+    rev = "23214235d4784d24aceed99bbfe153379ea557c8";
+    sha256 = "03mf3lw5c0m5nq9ppa49nylrl8ibkv2zzlc0wyhqg7w09kz6hks6";
+    fetchSubmodules = true;
+  };
+
+  nimcrypto = pkgs.fetchgit {
+    url = "https://github.com/cheatfate/nimcrypto";
+    rev = "721fb99ee099b632eb86dfad1f0d96ee87583774";
+    sha256 = "178vzb3q8wzjq295ik2pd25rrqf32w381ck76hm5x2d8qnzfmkkc";
+    fetchSubmodules = true;
+  };
+
+  stint = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-stint";
+    rev = "470b7892561b5179ab20bd389a69217d6213fe58";
+    sha256 = "1isfwmbj98qfi5pm9acy0yyvq0vlz38nxp30xl43jx2mmaga2w22";
+    fetchSubmodules = true;
+  };
+
+  secp256k1 = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-secp256k1";
+    rev = "d8f1288b7c72f00be5fc2c5ea72bf5cae1eafb15";
+    sha256 = "1qjrmwbngb73f6r1fznvig53nyal7wj41d1cmqfksrmivk2sgrn2";
+    fetchSubmodules = true;
+  };
+
+  nat_traversal = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-nat-traversal";
+    rev = "860e18c37667b5dd005b94c63264560c35d88004";
+    sha256 = "0319k5bbl468phwfnvlrh7725sc80rnf7m9gyj0i3cb5hb9q78bs";
+    fetchSubmodules = true;
+  };
+
+  metrics = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-metrics";
+    rev = "a1296caf3ebb5f30f51a5feae7749a30df2824c2";
+    sha256 = "02vxqy20g8012ks939ac25ksc25k727q84si0p2cmihy5bw1a3qm";
+    fetchSubmodules = true;
+  };
+
+  sqlite3_abi = pkgs.fetchgit {
+    url = "https://github.com/arnetheduck/nim-sqlite3-abi";
+    rev = "4b79c5e1882b7fc6c00aec311daf1ed50ad653d5";
+    sha256 = "0qa6p2vnxmf6r2w19mfydr5rzv7bg1lfxccnpdhk0akzxnc7i5gy";
+    fetchSubmodules = true;
+  };
+
+  minilru = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-minilru";
+    rev = "6dd93feb60f4cded3c05e7af7209cf63fb677893";
+    sha256 = "1xgx4j56ais3hk8b51zhnfs9q85g2afkp3y1j9ky5iziqvcs2sml";
+    fetchSubmodules = true;
+  };
+
+  snappy = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-snappy";
+    rev = "00bfcef94f8ef6981df5d5b994897f6695badfb2";
+    sha256 = "117mam97mkjjj1hs8svc07679k5ayww9yigi74yq8dyqm6fpbl6l";
+    fetchSubmodules = true;
+  };
+
+  eth = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-eth";
+    rev = "d9135e6c3c5d6d819afdfb566aa8d958756b73a8";
+    sha256 = "15r6aszalnbk6mkyfbv5rnz5vcf1mmgj6yg332wry53xsd2ipg7r";
+    fetchSubmodules = true;
+  };
+
+  dnsdisc = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-dnsdisc";
+    rev = "38f2e0f52c0a8f032ef4530835e519d550706d9e";
+    sha256 = "0dk787ny49n41bmzhlrvm87giwajr01gwdw9nlmphch89rdqpxxn";
+    fetchSubmodules = true;
+  };
+
+  taskpools = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-taskpools";
+    rev = "9e8ccc754631ac55ac2fd495e167e74e86293edb";
+    sha256 = "1y78l33vdjxmb9dkr455pbphxa73rgdsh8m9gpkf4d9b1wm1yivy";
+    fetchSubmodules = true;
+  };
+
+  ffi = pkgs.fetchgit {
+    url = "https://github.com/logos-messaging/nim-ffi";
+    rev = "06111de155253b34e47ed2aaed1d61d08d62cc1b";
+    sha256 = "0rb0d2i519amgsp7q0bn6m5465z1vwj4rab89529pyiivh3fgh8j";
+    fetchSubmodules = true;
+  };
+
+  zlib = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-zlib";
+    rev = "e680f269fb01af2c34a2ba879ff281795a5258fe";
+    sha256 = "1xw9f1gjsgqihdg7kdkbaq1wankgnx2vn9l3ihc6nqk2jzv5bvk5";
+    fetchSubmodules = true;
+  };
+
+  websock = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-websock";
+    rev = "3918ce3900c83e1cc7496232a307709f195f7acd";
+    sha256 = "16zvdjyasfpb04708d072rpvg12pyz3gmszi3md5brmlhbc3x8jp";
+    fetchSubmodules = true;
+  };
+
+  json_rpc = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-json-rpc";
+    rev = "b6e40a776fa2d00b97a9366761fb7da18f31ae5c";
+    sha256 = "0c86glijpzcxdb5fagdk98hm9dmsrgw179nn3ixbapl48pvly9nr";
+    fetchSubmodules = true;
+  };
+
+  jwt = pkgs.fetchgit {
+    url = "https://github.com/vacp2p/nim-jwt.git";
+    rev = "18f8378de52b241f321c1f9ea905456e89b95c6f";
+    sha256 = "1986czmszdxj6g9yr7xn1fx8y2y9mwpb3f1bn9nc6973qawsdm0p";
+    fetchSubmodules = true;
+  };
+
+  lsquic = pkgs.fetchgit {
+    url = "https://github.com/vacp2p/nim-lsquic";
+    rev = "4fb03ee7bfb39aecb3316889fdcb60bec3d0936f";
+    sha256 = "0qdhcd4hyp185szc9sv3jvwdwc9zp3j0syy7glxv13k9bchfmkfg";
+    fetchSubmodules = true;
+  };
+
+  libp2p = pkgs.fetchgit {
+    url = "https://github.com/vacp2p/nim-libp2p.git";
+    rev = "ff8d51857b4b79a68468e7bcc27b2026cca02996";
+    sha256 = "08y4s0zhqzsd780bwaixfqbi79km0mcq5g8nyw7awfvcbjqsa53l";
+    fetchSubmodules = true;
+  };
+
+  presto = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-presto";
+    rev = "d66043dd7ede146442e6c39720c76a20bde5225f";
+    sha256 = "1hrppcak32aigrdv3mqk124w81yy9jv1prs57vqqhfj83gl930vi";
+    fetchSubmodules = true;
+  };
+
+  unicodedb = pkgs.fetchgit {
+    url = "https://github.com/nitely/nim-unicodedb";
+    rev = "66f2458710dc641dd4640368f9483c8a0ec70561";
+    sha256 = "092z3glgdb7rmwajm7dmqzvralkm7ixighixk8ycf8sf17zm72ck";
+    fetchSubmodules = true;
+  };
+
+  regex = pkgs.fetchgit {
+    url = "https://github.com/nitely/nim-regex";
+    rev = "4593305ed1e49731fc75af1dc572dd2559aad19c";
+    sha256 = "1b666qws5sva3n5allin0ycvnqlzdjd7xzprpdvv632ccqddzcl9";
+    fetchSubmodules = true;
+  };
+
+  toml_serialization = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-toml-serialization";
+    rev = "b5b387e6fb2a7cc75d54a269b07cc6218361bd46";
+    sha256 = "175swdj01rz57h1hvflkyaz4x76qbfn0174ysrk3qk385i1zlg5z";
+    fetchSubmodules = true;
+  };
+
+  web3 = pkgs.fetchgit {
+    url = "https://github.com/status-im/nim-web3";
+    rev = "cdfe5601d2812a58e54faf53ee634452d01e5918";
+    sha256 = "1j52vcqw868qs40bh4wzfw5cvvnywp2q0dnzhfajh31xws98jc27";
+    fetchSubmodules = true;
+  };
+
+}
--- a/nix/nimble.nix
+++ b/nix/nimble.nix
@ -1,12 +0,0 @@
-{ pkgs ? import <nixpkgs> { } }:
-
-let
-  tools = pkgs.callPackage ./tools.nix {};
-  sourceFile = ../vendor/nimbus-build-system/vendor/Nim/koch.nim;
-in pkgs.fetchFromGitHub {
-  owner = "nim-lang";
-  repo = "nimble";
-  rev = tools.findKeyValue "^ +NimbleStableCommit = \"([a-f0-9]+)\".*$" sourceFile;
-  # WARNING: Requires manual updates when Nim compiler version changes.
-  hash = "sha256-8iutVgNzDtttZ7V+7S11KfLEuwhKA9TsgS51mlUI08k=";
-}
--- a/nix/shell.nix
+++ b/nix/shell.nix
@ -14,6 +14,7 @@ pkgs.mkShell {
    rustup
    rustc
    cmake
-    nim-unwrapped-2_2
+    nim-2_2
+    nimble
  ];
 }
--- a/tests/tools/test_confutils_envvar.nim
+++ b/tests/tools/test_confutils_envvar.nim
@ -19,7 +19,7 @@ type TestConf = object
    Option[InputFile]

  listenAddress* {.
-    defaultValue: parseIpAddress("127.0.0.1"),
+    defaultValue: IpAddress(family: IpAddressFamily.IPv4, address_v4: [127u8, 0, 0, 1]),
    desc: "Listening address",
    name: "listen-address"
  .}: IpAddress
@ -62,9 +62,15 @@ suite "nim-confutils - envvar":
    ## Then
    check confLoadRes.isOk()

+    let parsedIpAddress =
+      try:
+        parseIpAddress(listenAddress)
+      except ValueError:
+        IpAddress(family: IpAddressFamily.IPv4, address_v4: [0u8, 0, 0, 0])
+
    let conf = confLoadRes.get()
    check:
-      conf.listenAddress == parseIpAddress(listenAddress)
+      conf.listenAddress == parsedIpAddress
      conf.tcpPort == Port(8080)

      conf.configFile.isSome()
--- 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,
--- a/tools/confutils/cli_args.nim
+++ b/tools/confutils/cli_args.nim
@ -251,7 +251,10 @@ type WakuNodeConf* = object
    dnsAddrsNameServers* {.
      desc:
        "DNS name server IPs to query for DNS multiaddrs resolution. Argument may be repeated.",
-      defaultValue: @[parseIpAddress("1.1.1.1"), parseIpAddress("1.0.0.1")],
+      defaultValue: @[
+        IpAddress(family: IpAddressFamily.IPv4, address_v4: [1'u8, 1, 1, 1]),
+        IpAddress(family: IpAddressFamily.IPv4, address_v4: [1'u8, 0, 0, 1]),
+      ],
      name: "dns-addrs-name-server"
    .}: seq[IpAddress]

@ -480,7 +483,8 @@ with the drawback of consuming some more bandwidth.""",

    restAddress* {.
      desc: "Listening address of the REST HTTP server.",
-      defaultValue: parseIpAddress("127.0.0.1"),
+      defaultValue:
+        IpAddress(family: IpAddressFamily.IPv4, address_v4: [127'u8, 0, 0, 1]),
      name: "rest-address"
    .}: IpAddress

@ -520,7 +524,8 @@ with the drawback of consuming some more bandwidth.""",

    metricsServerAddress* {.
      desc: "Listening address of the metrics server.",
-      defaultValue: parseIpAddress("127.0.0.1"),
+      defaultValue:
+        IpAddress(family: IpAddressFamily.IPv4, address_v4: [127'u8, 0, 0, 1]),
      name: "metrics-server-address"
    .}: IpAddress

@ -774,7 +779,7 @@ proc completeCmdArg*(T: type IpAddress, val: string): seq[string] =

 proc defaultListenAddress*(): IpAddress =
  # TODO: Should probably listen on both ipv4 and ipv6 by default.
-  (static parseIpAddress("0.0.0.0"))
+  (static IpAddress(family: IpAddressFamily.IPv4, address_v4: [0'u8, 0, 0, 0]))

 proc defaultColocationLimit*(): int =
  return DefaultColocationLimit
--- a/tools/gen-nix-deps.sh
+++ b/tools/gen-nix-deps.sh
@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+# Generates nix/deps.nix from nimble.lock using nix-prefetch-git.
+# Usage: ./tools/gen-nix-deps.sh [nimble.lock] [nix/deps.nix]
+set -euo pipefail
+
+usage() {
+  cat <<EOF
+Usage:
+  $0 <nimble.lock> <output.nix>
+
+Example:
+  $0 nimble.lock nix/deps.nix
+EOF
+}
+
+if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
+  usage; exit 0
+fi
+
+if [[ $# -ne 2 ]]; then
+  usage; exit 1
+fi
+
+LOCKFILE="$1"
+OUTFILE="$2"
+
+command -v jq             >/dev/null || { echo "error: jq required";             exit 1; }
+command -v nix-prefetch-git >/dev/null || { echo "error: nix-prefetch-git required"; exit 1; }
+
+if [[ ! -f "$LOCKFILE" ]]; then
+  echo "[!] $LOCKFILE not found"
+  echo "[*] Generating $LOCKFILE via 'nimble lock'"
+  nimble lock
+fi
+
+echo "[*] Generating $OUTFILE from $LOCKFILE"
+mkdir -p "$(dirname "$OUTFILE")"
+
+cat > "$OUTFILE" <<'EOF'
+# AUTOGENERATED from nimble.lock — do not edit manually.
+# Regenerate with: ./tools/gen-nix-deps.sh nimble.lock nix/deps.nix
+{ pkgs }:
+
+{
+EOF
+
+jq -c '
+  .packages
+  | to_entries[]
+  | select(.value.downloadMethod == "git")
+  | select(.key != "nim" and .key != "nimble")
+' "$LOCKFILE" | while read -r entry; do
+  name=$(jq -r '.key'              <<<"$entry")
+  url=$(jq -r  '.value.url'        <<<"$entry")
+  rev=$(jq -r  '.value.vcsRevision' <<<"$entry")
+
+  echo "  [*] Prefetching $name @ $rev"
+
+  sha=$(nix-prefetch-git \
+    --url "$url" \
+    --rev "$rev" \
+    --fetch-submodules \
+    | jq -r '.sha256')
+
+  cat >> "$OUTFILE" <<EOF
+  ${name} = pkgs.fetchgit {
+    url = "${url}";
+    rev = "${rev}";
+    sha256 = "${sha}";
+    fetchSubmodules = true;
+  };
+
+EOF
+done
+
+cat >> "$OUTFILE" <<'EOF'
+}
+EOF
+
+echo "[✓] Wrote $OUTFILE"
--- a/vendor/db_connector
+++ b/vendor/db_connector
@ -1 +0,0 @@
-Subproject commit 74aef399e5c232f95c9fc5c987cebac846f09d62
--- a/vendor/dnsclient.nim
+++ b/vendor/dnsclient.nim
@ -1 +0,0 @@
-Subproject commit 23214235d4784d24aceed99bbfe153379ea557c8
--- a/vendor/nim-bearssl
+++ b/vendor/nim-bearssl
@ -1 +0,0 @@
-Subproject commit 11e798b62b8e6beabe958e048e9e24c7e0f9ee63
--- a/vendor/nim-chronicles
+++ b/vendor/nim-chronicles
@ -1 +0,0 @@
-Subproject commit 54f5b726025e8c7385e3a6529d3aa27454c6e6ff
--- a/vendor/nim-chronos
+++ b/vendor/nim-chronos
@ -1 +0,0 @@
-Subproject commit 85af4db764ecd3573c4704139560df3943216cf1
--- a/vendor/nim-confutils
+++ b/vendor/nim-confutils
@ -1 +0,0 @@
-Subproject commit e214b3992a31acece6a9aada7d0a1ad37c928f3b
--- a/vendor/nim-dnsdisc
+++ b/vendor/nim-dnsdisc
@ -1 +0,0 @@
-Subproject commit 203abd2b3e758e0ea3ae325769b20a7e1bcd1010
--- a/vendor/nim-eth
+++ b/vendor/nim-eth
@ -1 +0,0 @@
-Subproject commit d9135e6c3c5d6d819afdfb566aa8d958756b73a8
--- a/vendor/nim-faststreams
+++ b/vendor/nim-faststreams
@ -1 +0,0 @@
-Subproject commit ce27581a3e881f782f482cb66dc5b07a02bd615e
--- a/vendor/nim-ffi
+++ b/vendor/nim-ffi
@ -1 +0,0 @@
-Subproject commit 06111de155253b34e47ed2aaed1d61d08d62cc1b
--- a/vendor/nim-http-utils
+++ b/vendor/nim-http-utils
@ -1 +0,0 @@
-Subproject commit f142cb2e8bd812dd002a6493b6082827bb248592
--- a/vendor/nim-json-rpc
+++ b/vendor/nim-json-rpc
@ -1 +0,0 @@
-Subproject commit 9665c265035f49f5ff94bbffdeadde68e19d6221
--- a/vendor/nim-json-serialization
+++ b/vendor/nim-json-serialization
@ -1 +0,0 @@
-Subproject commit c343b0e243d9e17e2c40f3a8a24340f7c4a71d44
--- a/vendor/nim-jwt
+++ b/vendor/nim-jwt
@ -1 +0,0 @@
-Subproject commit 18f8378de52b241f321c1f9ea905456e89b95c6f
--- a/vendor/nim-libbacktrace
+++ b/vendor/nim-libbacktrace
@ -1 +0,0 @@
-Subproject commit d8bd4ce5c46bb6d2f984f6b3f3d7380897d95ecb
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@ -1 +0,0 @@
-Subproject commit ff8d51857b4b79a68468e7bcc27b2026cca02996
--- a/vendor/nim-lsquic
+++ b/vendor/nim-lsquic
@ -1 +0,0 @@
-Subproject commit 4fb03ee7bfb39aecb3316889fdcb60bec3d0936f
--- a/vendor/nim-metrics
+++ b/vendor/nim-metrics
@ -1 +0,0 @@
-Subproject commit a1296caf3ebb5f30f51a5feae7749a30df2824c2
--- a/vendor/nim-minilru
+++ b/vendor/nim-minilru
@ -1 +0,0 @@
-Subproject commit 0c4b2bce959591f0a862e9b541ba43c6d0cf3476
--- a/vendor/nim-nat-traversal
+++ b/vendor/nim-nat-traversal
@ -1 +0,0 @@
-Subproject commit 860e18c37667b5dd005b94c63264560c35d88004
--- a/vendor/nim-presto
+++ b/vendor/nim-presto
@ -1 +0,0 @@
-Subproject commit d66043dd7ede146442e6c39720c76a20bde5225f
--- a/vendor/nim-regex
+++ b/vendor/nim-regex
@ -1 +0,0 @@
-Subproject commit 4593305ed1e49731fc75af1dc572dd2559aad19c
--- a/vendor/nim-results
+++ b/vendor/nim-results
@ -1 +0,0 @@
-Subproject commit df8113dda4c2d74d460a8fa98252b0b771bf1f27
--- a/vendor/nim-secp256k1
+++ b/vendor/nim-secp256k1
@ -1 +0,0 @@
-Subproject commit 9dd3df62124aae79d564da636bb22627c53c7676
--- a/vendor/nim-serialization
+++ b/vendor/nim-serialization
@ -1 +0,0 @@
-Subproject commit b0f2fa32960ea532a184394b0f27be37bd80248b
--- a/vendor/nim-sqlite3-abi
+++ b/vendor/nim-sqlite3-abi
@ -1 +0,0 @@
-Subproject commit 89ba51f557414d3a3e17ab3df8270e1bdaa3ca2a
--- a/vendor/nim-stew
+++ b/vendor/nim-stew
@ -1 +0,0 @@
-Subproject commit b66168735d6f3841c5239c3169d3fe5fe98b1257
--- a/vendor/nim-stint
+++ b/vendor/nim-stint
@ -1 +0,0 @@
-Subproject commit 470b7892561b5179ab20bd389a69217d6213fe58
--- a/vendor/nim-taskpools
+++ b/vendor/nim-taskpools
@ -1 +0,0 @@
-Subproject commit 9e8ccc754631ac55ac2fd495e167e74e86293edb
--- a/vendor/nim-testutils
+++ b/vendor/nim-testutils
@ -1 +0,0 @@
-Subproject commit e4d37dc1652d5c63afb89907efb5a5e812261797
--- a/vendor/nim-toml-serialization
+++ b/vendor/nim-toml-serialization
@ -1 +0,0 @@
-Subproject commit b5b387e6fb2a7cc75d54a269b07cc6218361bd46
--- a/vendor/nim-unicodedb
+++ b/vendor/nim-unicodedb
@ -1 +0,0 @@
-Subproject commit 66f2458710dc641dd4640368f9483c8a0ec70561
--- a/vendor/nim-unittest2
+++ b/vendor/nim-unittest2
@ -1 +0,0 @@
-Subproject commit 26f2ef3ae0ec72a2a75bfe557e02e88f6a31c189
--- a/vendor/nim-web3
+++ b/vendor/nim-web3
@ -1 +0,0 @@
-Subproject commit 81ee8ce479d86acb73be7c4f365328e238d9b4a3
--- a/vendor/nim-websock
+++ b/vendor/nim-websock
@ -1 +0,0 @@
-Subproject commit 35ae76f1559e835c80f9c1a3943bf995d3dd9eb5
--- a/vendor/nim-zlib
+++ b/vendor/nim-zlib
@ -1 +0,0 @@
-Subproject commit daa8723fd32299d4ca621c837430c29a5a11e19a
--- a/vendor/nimbus-build-system
+++ b/vendor/nimbus-build-system
@ -1 +0,0 @@
-Subproject commit e6c2c9da39c2d368d9cf420ac22692e99715d22c
--- a/vendor/nimcrypto
+++ b/vendor/nimcrypto
@ -1 +0,0 @@
-Subproject commit 721fb99ee099b632eb86dfad1f0d96ee87583774
--- a/vendor/nph
+++ b/vendor/nph
@ -1 +0,0 @@
-Subproject commit 2cacf6cc28116e4046e0b67a13545af5c4e756bd
--- a/waku.nimble
+++ b/waku.nimble
@ -4,81 +4,161 @@ import os
 mode = ScriptMode.Verbose

 ### Package
-version = "0.36.0"
+version = "0.37.4"
 author = "Status Research & Development GmbH"
 description = "Waku, Private P2P Messaging for Resource-Restricted Devices"
 license = "MIT or Apache License 2.0"
 #bin           = @["build/waku"]

+## This indicates the nim compiler version we are currently working on. It may compile with others
+## but we haven't tested.
+const NimVersion    = "2.2.4"
+## This is the underlying nimble version that gets installed after doing `choosenim 2.2.4`.
+const NimbleVersion = "0.18.2"
+
 ### Dependencies
 requires "nim >= 2.2.4",
+  "chronos >= 4.2.0",
+  "taskpools",
+  # Logging & Configuration
  "chronicles",
  "confutils",
-  "chronos",
-  "dnsdisc",
-  "eth",
-  "json_rpc",
-  "libbacktrace",
-  "nimcrypto",
+  # Serialization
  "serialization",
+  "json_serialization",
+  "toml_serialization",
+  "faststreams",
+  # Networking & P2P
+  "https://github.com/vacp2p/nim-libp2p.git#ff8d51857b4b79a68468e7bcc27b2026cca02996",
+  "eth",
+  "nat_traversal",
+  "dnsdisc",
+  "dnsclient",
+  "httputils >= 0.4.1",
+  "websock >= 0.2.1",
+  # Cryptography
+  "nimcrypto == 0.6.4", # 0.6.4 used in libp2p. Version 0.7.3 makes test to crash on Ubuntu.
+  "secp256k1",
+  "bearssl",
+  # RPC & APIs
+  "json_rpc",
+  "presto",
+  "web3",
+  # Database
+  "db_connector",
+  "sqlite3_abi",
+  # Utilities
  "stew",
  "stint",
  "metrics",
-  "libp2p >= 1.15.0",
-  "web3",
-  "presto",
  "regex",
+  "unicodedb",
  "results",
-  "db_connector",
  "minilru",
-  "lsquic",
-  "jwt",
-  "ffi"
+  "zlib",
+  # Debug & Testing
+  "testutils",
+  "unittest2"
+
+# Packages not on nimble (use git URLs)
+requires "https://github.com/logos-messaging/nim-ffi"
+
+requires "https://github.com/vacp2p/nim-lsquic"
+requires "https://github.com/vacp2p/nim-jwt.git#18f8378de52b241f321c1f9ea905456e89b95c6f"
+
+proc getMyCPU(): string =
+  ## Need to set cpu more explicit manner to avoid arch issues between dependencies
+  when defined(macosx) and defined(arm64):
+    return " --cpu:arm64 --passC:\"-arch arm64\" --passL:\"-arch arm64\" "
+  elif defined(macosx) and defined(amd64):
+    return " --cpu:amd64 --passC:\"-arch x86_64\" --passL:\"-arch x86_64\" "
+  elif defined(arm64):
+    return " --cpu:arm64 "
+  elif defined(amd64):
+    return " --cpu:amd64 "
+
+proc getNimParams(): string =
+  return " " & getEnv("NIM_PARAMS") & " "

 ### Helper functions
-proc buildModule(filePath, params = "", lang = "c"): bool =
+proc buildModule(filePath, params = ""): bool =
  if not dirExists "build":
    mkDir "build"
-  # allow something like "nim nimbus --verbosity:0 --hints:off nimbus.nims"
-  var extra_params = params
-  for i in 2 ..< paramCount() - 1:
-    extra_params &= " " & paramStr(i)

  if not fileExists(filePath):
    echo "File to build not found: " & filePath
    return false

-  exec "nim " & lang & " --out:build/" & filepath & ".bin --mm:refc " & extra_params &
+  exec "nim c --out:build/" & filepath & ".bin --mm:refc " & getMyCPU() & getNimParams() & " " & params &
    " " & filePath

  # exec will raise exception if anything goes wrong
  return true

-proc buildBinary(name: string, srcDir = "./", params = "", lang = "c") =
+proc buildBinary(name: string, srcDir = "./", params = "") =
  if not dirExists "build":
    mkDir "build"
-  # allow something like "nim nimbus --verbosity:0 --hints:off nimbus.nims"
-  var extra_params = params
-  for i in 2 ..< paramCount():
-    extra_params &= " " & paramStr(i)
-  exec "nim " & lang & " --out:build/" & name & " --mm:refc " & extra_params & " " &
+  exec "nim c --out:build/" & name & " --mm:refc " & getMyCPU() & getNimParams() & " " & params & " " &
    srcDir & name & ".nim"

 proc buildLibrary(lib_name: string, srcDir = "./", params = "", `type` = "static", srcFile = "libwaku.nim", mainPrefix = "libwaku") =
  if not dirExists "build":
    mkDir "build"
-  # allow something like "nim nimbus --verbosity:0 --hints:off nimbus.nims"
-  var extra_params = params
-  for i in 2 ..< (paramCount() - 1):
-    extra_params &= " " & paramStr(i)
+
  if `type` == "static":
    exec "nim c" & " --out:build/" & lib_name &
      " --threads:on --app:staticlib --opt:speed --noMain --mm:refc --header -d:metrics --nimMainPrefix:" & mainPrefix & " --skipParentCfg:on -d:discv5_protocol_id=d5waku " &
-      extra_params & " " & srcDir & srcFile
+      getMyCPU() & getNimParams() & srcDir & "/" & srcFile
  else:
    exec "nim c" & " --out:build/" & lib_name &
      " --threads:on --app:lib --opt:speed --noMain --mm:refc --header -d:metrics --nimMainPrefix:" & mainPrefix & " --skipParentCfg:off -d:discv5_protocol_id=d5waku " &
-      extra_params & " " & srcDir & srcFile
+      getMyCPU() & getNimParams() & " " & srcDir & "/" & srcFile
+
+proc buildLibDynamicWindows(libName: string, folderName: string) =
+  buildLibrary libName & ".dll", folderName,
+    """-d:chronicles_line_numbers --warning:Deprecated:off --warning:UnusedImport:on -d:chronicles_log_level=TRACE """,
+    "dynamic", libName & ".nim", libname
+
+proc buildLibDynamicLinux(libName: string, folderName: string) =
+  buildLibrary libName & ".so", folderName,
+    """-d:chronicles_line_numbers --warning:Deprecated:off --warning:UnusedImport:on -d:chronicles_log_level=TRACE """,
+    "dynamic", libName & ".nim", libname
+
+proc buildLibDynamicMac(libName: string, folderName: string) =
+  let sdkPath = staticExec("xcrun --show-sdk-path").strip()
+  when defined(arm64):
+    let archFlags = "--cpu:arm64 --passC:\"-arch arm64\" --passL:\"-arch arm64\" --passC:\"-isysroot " & sdkPath & "\" --passL:\"-isysroot " & sdkPath & "\""
+  elif defined(amd64):
+    let archFlags = "--cpu:amd64 --passC:\"-arch x86_64\" --passL:\"-arch x86_64\" --passC:\"-isysroot " & sdkPath & "\" --passL:\"-isysroot " & sdkPath & "\""
+  else:
+    {.error: "Unsupported macOS architecture".}
+  buildLibrary libName & ".dylib", folderName,
+    archFlags & " -d:chronicles_line_numbers --warning:Deprecated:off --warning:UnusedImport:on -d:chronicles_log_level=TRACE",
+    "dynamic", libName & ".nim", libname
+
+proc buildLibStaticWindows(libName: string, folderName: string) =
+  buildLibrary libName & ".lib", folderName,
+    """-d:chronicles_line_numbers --warning:Deprecated:off --warning:UnusedImport:on -d:chronicles_log_level=TRACE """,
+    "static", libName & ".nim", libname
+
+proc buildLibStaticLinux(libName: string, folderName: string) =
+  buildLibrary libName & ".a", folderName,
+    """-d:chronicles_line_numbers --warning:Deprecated:off --warning:UnusedImport:on -d:chronicles_log_level=TRACE """,
+    "static", libName & ".nim", libname
+
+proc buildLibStaticMac(libName: string, folderName: string) =
+  let sdkPath = staticExec("xcrun --show-sdk-path").strip()
+  when defined(arm64):
+    let archFlags = "--cpu:arm64 --passC:\"-arch arm64\" --passL:\"-arch arm64\" --passC:\"-isysroot " & sdkPath & "\" --passL:\"-isysroot " & sdkPath & "\""
+  elif defined(amd64):
+    let archFlags = "--cpu:amd64 --passC:\"-arch x86_64\" --passL:\"-arch x86_64\" --passC:\"-isysroot " & sdkPath & "\" --passL:\"-isysroot " & sdkPath & "\""
+  else:
+    {.error: "Unsupported macOS architecture".}
+  buildLibrary libName & ".a", folderName,
+    archFlags & " -d:chronicles_line_numbers --warning:Deprecated:off --warning:UnusedImport:on -d:chronicles_log_level=TRACE",
+    "static", libName & ".nim", libname
+
+### Mobile Android

 proc buildMobileAndroid(srcDir = ".", params = "") =
  let cpu = getEnv("CPU")
@ -88,16 +168,206 @@ proc buildMobileAndroid(srcDir = ".", params = "") =
  if not dirExists outDir:
    mkDir outDir

-  var extra_params = params
-  for i in 2 ..< paramCount():
-    extra_params &= " " & paramStr(i)
-
  exec "nim c" & " --out:" & outDir &
-    "/libwaku.so --threads:on --app:lib --opt:speed --noMain --mm:refc -d:chronicles_sinks=textlines[dynamic] --header -d:chronosEventEngine=epoll --passL:-L" &
-    outdir & " --passL:-lrln --passL:-llog --cpu:" & cpu & " --os:android -d:androidNDK " &
-    extra_params & " " & srcDir & "/libwaku.nim"
+    "/liblogosdelivery.so --threads:on --app:lib --opt:speed --noMain --mm:refc -d:chronicles_sinks=textlines[dynamic] --header -d:chronosEventEngine=epoll --passL:-L" &
+    outdir & " --passL:-lrln --passL:-llog --cpu:" & cpu & " --nimMainPrefix:liblogosdelivery --os:android -d:androidNDK " & params &
+    getNimParams() & " " & srcDir & "/liblogosdelivery.nim"

-proc test(name: string, params = "-d:chronicles_log_level=DEBUG", lang = "c") =
+task libLogosDeliveryAndroid, "Build the mobile bindings for Android":
+  let srcDir = "./library"
+  buildMobileAndroid srcDir, "-d:chronicles_log_level=ERROR"
+
+### Mobile iOS
+
+import std/sequtils
+
+proc buildMobileIOS(srcDir = ".", params = "") =
+  echo "Building iOS liblogosdelivery library"
+
+  let iosArch = getEnv("IOS_ARCH")
+  let iosSdk = getEnv("IOS_SDK")
+  let sdkPath = getEnv("IOS_SDK_PATH")
+
+  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:
+    mkDir outDir
+
+  var extra_params = params
+  let args = commandLineParams()
+  for arg in args:
+    extra_params &= " " & arg
+
+  let cpu = if iosArch == "arm64": "arm64" else: "amd64"
+
+  # The output static library
+  let nimcacheDir = outDir & "/nimcache"
+  let objDir = outDir & "/obj"
+  let vendorObjDir = outDir & "/vendor_obj"
+  let aFile = outDir & "/liblogosdelivery.a"
+
+  if not dirExists objDir:
+    mkDir objDir
+  if not dirExists vendorObjDir:
+    mkDir vendorObjDir
+
+  let clangBase = "clang -arch " & iosArch & " -isysroot " & sdkPath &
+      " -mios-version-min=18.0 -fembed-bitcode -fPIC -O2"
+
+  # Generate C sources from Nim (no linking)
+  exec "nim c" &
+      " --nimcache:" & nimcacheDir &
+      " --os:ios --cpu:" & cpu &
+      " --compileOnly:on" &
+      " --noMain --mm:refc" &
+      " --threads:on --opt:size --header" &
+      " -d:metrics -d:discv5_protocol_id=d5waku" &
+      " --nimMainPrefix:liblogosdelivery --skipParentCfg:on" &
+      " --cc:clang" &
+      " " & extra_params &
+      " " & srcDir & "/liblogosdelivery.nim"
+
+  # Compile vendor C libraries for iOS
+
+  # --- BearSSL ---
+  echo "Compiling BearSSL for iOS..."
+  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("/", "_")
+      let baseName = relPath.changeFileExt("o")
+      let oFile = vendorObjDir / ("bearssl_" & baseName)
+      if not fileExists(oFile):
+        exec clangBase & " -I" & bearSslIncDir & " -I" & bearSslSrcDir & " -c " & path & " -o " & oFile
+
+  # --- secp256k1 ---
+  echo "Compiling secp256k1 for iOS..."
+  let secp256k1Dir = secp256k1Path / "vendor/secp256k1"
+  let secp256k1Flags = " -I" & secp256k1Dir & "/include" &
+        " -I" & secp256k1Dir & "/src" &
+        " -I" & secp256k1Dir &
+        " -DENABLE_MODULE_RECOVERY=1" &
+        " -DENABLE_MODULE_ECDH=1" &
+        " -DECMULT_WINDOW_SIZE=15" &
+        " -DECMULT_GEN_PREC_BITS=4"
+
+  # Main secp256k1 source
+  let secp256k1Obj = vendorObjDir / "secp256k1.o"
+  if not fileExists(secp256k1Obj):
+    exec clangBase & secp256k1Flags & " -c " & secp256k1Dir & "/src/secp256k1.c -o " & secp256k1Obj
+
+  # Precomputed tables (required for ecmult operations)
+  let secp256k1PreEcmultObj = vendorObjDir / "secp256k1_precomputed_ecmult.o"
+  if not fileExists(secp256k1PreEcmultObj):
+    exec clangBase & secp256k1Flags & " -c " & secp256k1Dir & "/src/precomputed_ecmult.c -o " & secp256k1PreEcmultObj
+
+  let secp256k1PreEcmultGenObj = vendorObjDir / "secp256k1_precomputed_ecmult_gen.o"
+  if not fileExists(secp256k1PreEcmultGenObj):
+    exec clangBase & secp256k1Flags & " -c " & secp256k1Dir & "/src/precomputed_ecmult_gen.c -o " & secp256k1PreEcmultGenObj
+
+  # --- miniupnpc ---
+  echo "Compiling miniupnpc for iOS..."
+  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",
+    "minixml.c", "portlistingparse.c", "receivedata.c", "upnpcommands.c",
+    "upnpdev.c", "upnperrors.c", "upnpreplyparse.c"
+  ]
+  for fileName in miniupnpcFiles:
+    let srcPath = miniupnpcSrcDir / fileName
+    let oFile = vendorObjDir / ("miniupnpc_" & fileName.changeFileExt("o"))
+    if fileExists(srcPath) and not fileExists(oFile):
+      exec clangBase &
+          " -I" & miniupnpcIncDir &
+          " -I" & miniupnpcSrcDir &
+          " -I" & miniupnpcBuildDir &
+          " -DMINIUPNPC_SET_SOCKET_TIMEOUT" &
+          " -D_BSD_SOURCE -D_DEFAULT_SOURCE" &
+          " -c " & srcPath & " -o " & oFile
+
+  # --- libnatpmp ---
+  echo "Compiling libnatpmp for iOS..."
+  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):
+    exec clangBase &
+        " -I" & natpmpSrcDir &
+        " -DENABLE_STRNATPMPERR" &
+        " -c " & natpmpSrcDir & "/natpmp.c -o " & natpmpObj
+
+ # Use iOS-specific stub for getgateway
+  let getgatewayStubSrc = "./library/ios_natpmp_stubs.c"
+  let getgatewayStubObj = vendorObjDir / "natpmp_getgateway_stub.o"
+  if fileExists(getgatewayStubSrc) and not fileExists(getgatewayStubObj):
+    exec clangBase & " -c " & getgatewayStubSrc & " -o " & getgatewayStubObj
+
+  # --- BearSSL stubs (for tools functions not in main library) ---
+  echo "Compiling BearSSL stubs for iOS..."
+  let bearSslStubsSrc = "./library/ios_bearssl_stubs.c"
+  let bearSslStubsObj = vendorObjDir / "bearssl_stubs.o"
+  if fileExists(bearSslStubsSrc) and not fileExists(bearSslStubsObj):
+    exec clangBase & " -c " & bearSslStubsSrc & " -o " & bearSslStubsObj
+
+  # Compile all Nim-generated C files to object files
+  echo "Compiling Nim-generated C files for iOS..."
+  var cFiles: seq[string] = @[]
+  for kind, path in walkDir(nimcacheDir):
+    if kind == pcFile and path.endsWith(".c"):
+      cFiles.add(path)
+
+  for cFile in cFiles:
+    let baseName = extractFilename(cFile).changeFileExt("o")
+    let oFile = objDir / baseName
+    exec clangBase &
+        " -DENABLE_STRNATPMPERR" &
+        " -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
+
+  # Create static library from all object files
+  echo "Creating static library..."
+  var objFiles: seq[string] = @[]
+  for kind, path in walkDir(objDir):
+    if kind == pcFile and path.endsWith(".o"):
+      objFiles.add(path)
+  for kind, path in walkDir(vendorObjDir):
+    if kind == pcFile and path.endsWith(".o"):
+      objFiles.add(path)
+
+  exec "libtool -static -o " & aFile & " " & objFiles.join(" ")
+
+  echo "iOS library created: " & aFile
+
+task libWakuIOS, "Build the mobile bindings for iOS":
+  let srcDir = "./library"
+  let extraParams = "-d:chronicles_log_level=ERROR"
+  buildMobileIOS srcDir, extraParams
+
+proc test(name: string, params = "-d:chronicles_log_level=DEBUG") =
  # XXX: When running `> NIM_PARAMS="-d:chronicles_log_level=INFO" make test2`
  # I expect compiler flag to be overridden, however it stays with whatever is
  # specified here.
@ -106,12 +376,12 @@ proc test(name: string, params = "-d:chronicles_log_level=DEBUG", lang = "c") =

 ### Waku common tasks
 task testcommon, "Build & run common tests":
-  test "all_tests_common", "-d:chronicles_log_level=WARN -d:chronosStrictException"
+  test "all_tests_common", "-d:chronicles_log_level=DEBUG -d:chronosStrictException"

 ### Waku tasks
 task wakunode2, "Build Waku v2 cli node":
  let name = "wakunode2"
-  buildBinary name, "apps/wakunode2/", " -d:chronicles_log_level='TRACE' "
+  buildBinary name, "apps/wakunode2/", " -d:chronicles_log_level=TRACE "

 task benchmarks, "Some benchmarks":
  let name = "benchmarks"
@ -150,7 +420,7 @@ task chat2, "Build example Waku chat usage":
  let name = "chat2"
  buildBinary name,
    "apps/chat2/",
-    "-d:chronicles_sinks=textlines[file] -d:chronicles_log_level='TRACE' "
+    "-d:chronicles_sinks=textlines[file] -d:chronicles_log_level=TRACE "
  #  -d:ssl - cause unlisted exception error in libp2p/utility...

 task chat2mix, "Build example Waku chat mix usage":
@ -161,7 +431,7 @@ task chat2mix, "Build example Waku chat mix usage":
  let name = "chat2mix"
  buildBinary name,
    "apps/chat2mix/",
-    "-d:chronicles_sinks=textlines[file] -d:chronicles_log_level='TRACE' "
+    "-d:chronicles_sinks=textlines[file] -d:chronicles_log_level=TRACE "
  #  -d:ssl - cause unlisted exception error in libp2p/utility...

 task chat2bridge, "Build chat2bridge":
@ -170,32 +440,33 @@ task chat2bridge, "Build chat2bridge":

 task liteprotocoltester, "Build liteprotocoltester":
  let name = "liteprotocoltester"
-  buildBinary name, "apps/liteprotocoltester/"
+  buildBinary name, "apps/liteprotocoltester/", "-d:chronicles_log_level=TRACE"

 task lightpushwithmix, "Build lightpushwithmix":
  let name = "lightpush_publisher_mix"
  buildBinary name, "examples/lightpush_mix/"

-task api_example, "Build api_example":
-  let name = "api_example"
-  buildBinary name, "examples/api_example/"
-
-task buildone, "Build custom target":
-  let filepath = paramStr(paramCount())
-  discard buildModule filepath
-
 task buildTest, "Test custom target":
-  let filepath = paramStr(paramCount())
+  let args = commandLineParams()
+  if args.len == 0:
+    quit "Missing test file"
+
+  let filepath = args[^1]
  discard buildModule(filepath)

 import std/strutils

 task execTest, "Run test":
-  # Expects to be parameterized with test case name in quotes
-  # preceded with the nim source file name and path
-  # If no test case name is given still it requires empty quotes `""`
-  let filepath = paramStr(paramCount() - 1)
-  var testSuite = paramStr(paramCount()).strip(chars = {'\"'})
+  let args = commandLineParams()
+  if args.len == 0:
+    quit "Missing arguments"
+  # expects: <file> "<test name>"
+  let filepath =
+    if args.len >= 2: args[^2]
+    else: args[^1]
+  var testSuite =
+    if args.len >= 1: args[^1].strip(chars = {'\"'})
+    else: ""
  if testSuite != "":
    testSuite = " \"" & testSuite & "\""
  exec "build/" & filepath & ".bin " & testSuite
@ -208,203 +479,42 @@ let chroniclesParams =
  """-d:chronicles_disabled_topics="eth,dnsdisc.client" """ & "--warning:Deprecated:off " &
  "--warning:UnusedImport:on " & "-d:chronicles_log_level=TRACE"

-task libwakuStatic, "Build the cbindings waku node library":
-  let lib_name = paramStr(paramCount())
-  buildLibrary lib_name, "library/", chroniclesParams, "static"
+## Libwaku build tasks

-task libwakuDynamic, "Build the cbindings waku node library":
-  let lib_name = paramStr(paramCount())
-  buildLibrary lib_name, "library/", chroniclesParams, "dynamic"
+task libwakuDynamicWindows, "Generate bindings":
+  buildLibDynamicWindows("libwaku", "library")

-### Mobile Android
-task libWakuAndroid, "Build the mobile bindings for Android":
-  let srcDir = "./library"
-  let extraParams = "-d:chronicles_log_level=ERROR"
-  buildMobileAndroid srcDir, extraParams
+task libwakuDynamicLinux, "Generate bindings":
+  buildLibDynamicLinux("libwaku", "library")

-### Mobile iOS
-import std/sequtils
+task libwakuDynamicMac, "Generate bindings":
+  buildLibDynamicMac("libwaku", "library")

-proc buildMobileIOS(srcDir = ".", params = "") =
-  echo "Building iOS libwaku library"
+task libwakuStaticWindows, "Generate bindings":
+  buildLibStaticWindows("libwaku", "library")

-  let iosArch = getEnv("IOS_ARCH")
-  let iosSdk = getEnv("IOS_SDK")
-  let sdkPath = getEnv("IOS_SDK_PATH")
+task libwakuStaticLinux, "Generate bindings":
+  buildLibStaticLinux("libwaku", "library")

-  if sdkPath.len == 0:
-    quit "Error: IOS_SDK_PATH not set. Set it to the path of the iOS SDK"
+task libwakuStaticMac, "Generate bindings":
+  buildLibStaticMac("libwaku", "library")

-  # Use SDK name in path to differentiate device vs simulator
-  let outDir = "build/ios/" & iosSdk & "-" & iosArch
-  if not dirExists outDir:
-    mkDir outDir
+## Liblogosdelivery build tasks

-  var extra_params = params
-  for i in 2 ..< paramCount():
-    extra_params &= " " & paramStr(i)
+task liblogosdeliveryDynamicWindows, "Generate bindings":
+  buildLibDynamicWindows("liblogosdelivery", "liblogosdelivery")

-  let cpu = if iosArch == "arm64": "arm64" else: "amd64"
+task liblogosdeliveryDynamicLinux, "Generate bindings":
+  buildLibDynamicLinux("liblogosdelivery", "liblogosdelivery")

-  # The output static library
-  let nimcacheDir = outDir & "/nimcache"
-  let objDir = outDir & "/obj"
-  let vendorObjDir = outDir & "/vendor_obj"
-  let aFile = outDir & "/libwaku.a"
+task liblogosdeliveryDynamicMac, "Generate bindings":
+  buildLibDynamicMac("liblogosdelivery", "liblogosdelivery")

-  if not dirExists objDir:
-    mkDir objDir
-  if not dirExists vendorObjDir:
-    mkDir vendorObjDir
+task liblogosdeliveryStaticWindows, "Generate bindings":
+  buildLibStaticWindows("liblogosdelivery", "liblogosdelivery")

-  let clangBase = "clang -arch " & iosArch & " -isysroot " & sdkPath &
-      " -mios-version-min=18.0 -fembed-bitcode -fPIC -O2"
+task liblogosdeliveryStaticLinux, "Generate bindings":
+  buildLibStaticLinux("liblogosdelivery", "liblogosdelivery")

-  # Generate C sources from Nim (no linking)
-  exec "nim c" &
-      " --nimcache:" & nimcacheDir &
-      " --os:ios --cpu:" & cpu &
-      " --compileOnly:on" &
-      " --noMain --mm:refc" &
-      " --threads:on --opt:speed --header" &
-      " -d:metrics -d:discv5_protocol_id=d5waku" &
-      " --nimMainPrefix:libwaku --skipParentCfg:on" &
-      " --cc:clang" &
-      " " & extra_params &
-      " " & srcDir & "/libwaku.nim"
-
-  # Compile vendor C libraries for iOS
-
-  # --- BearSSL ---
-  echo "Compiling BearSSL for iOS..."
-  let bearSslSrcDir = "./vendor/nim-bearssl/bearssl/csources/src"
-  let bearSslIncDir = "./vendor/nim-bearssl/bearssl/csources/inc"
-  for path in walkDirRec(bearSslSrcDir):
-    if path.endsWith(".c"):
-      let relPath = path.replace(bearSslSrcDir & "/", "").replace("/", "_")
-      let baseName = relPath.changeFileExt("o")
-      let oFile = vendorObjDir / ("bearssl_" & baseName)
-      if not fileExists(oFile):
-        exec clangBase & " -I" & bearSslIncDir & " -I" & bearSslSrcDir & " -c " & path & " -o " & oFile
-
-  # --- secp256k1 ---
-  echo "Compiling secp256k1 for iOS..."
-  let secp256k1Dir = "./vendor/nim-secp256k1/vendor/secp256k1"
-  let secp256k1Flags = " -I" & secp256k1Dir & "/include" &
-        " -I" & secp256k1Dir & "/src" &
-        " -I" & secp256k1Dir &
-        " -DENABLE_MODULE_RECOVERY=1" &
-        " -DENABLE_MODULE_ECDH=1" &
-        " -DECMULT_WINDOW_SIZE=15" &
-        " -DECMULT_GEN_PREC_BITS=4"
-
-  # Main secp256k1 source
-  let secp256k1Obj = vendorObjDir / "secp256k1.o"
-  if not fileExists(secp256k1Obj):
-    exec clangBase & secp256k1Flags & " -c " & secp256k1Dir & "/src/secp256k1.c -o " & secp256k1Obj
-
-  # Precomputed tables (required for ecmult operations)
-  let secp256k1PreEcmultObj = vendorObjDir / "secp256k1_precomputed_ecmult.o"
-  if not fileExists(secp256k1PreEcmultObj):
-    exec clangBase & secp256k1Flags & " -c " & secp256k1Dir & "/src/precomputed_ecmult.c -o " & secp256k1PreEcmultObj
-
-  let secp256k1PreEcmultGenObj = vendorObjDir / "secp256k1_precomputed_ecmult_gen.o"
-  if not fileExists(secp256k1PreEcmultGenObj):
-    exec clangBase & secp256k1Flags & " -c " & secp256k1Dir & "/src/precomputed_ecmult_gen.c -o " & secp256k1PreEcmultGenObj
-
-  # --- 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 miniupnpcFiles = @[
-    "addr_is_reserved.c", "connecthostport.c", "igd_desc_parse.c",
-    "minisoap.c", "minissdpc.c", "miniupnpc.c", "miniwget.c",
-    "minixml.c", "portlistingparse.c", "receivedata.c", "upnpcommands.c",
-    "upnpdev.c", "upnperrors.c", "upnpreplyparse.c"
-  ]
-  for fileName in miniupnpcFiles:
-    let srcPath = miniupnpcSrcDir / fileName
-    let oFile = vendorObjDir / ("miniupnpc_" & fileName.changeFileExt("o"))
-    if fileExists(srcPath) and not fileExists(oFile):
-      exec clangBase &
-          " -I" & miniupnpcIncDir &
-          " -I" & miniupnpcSrcDir &
-          " -I" & miniupnpcBuildDir &
-          " -DMINIUPNPC_SET_SOCKET_TIMEOUT" &
-          " -D_BSD_SOURCE -D_DEFAULT_SOURCE" &
-          " -c " & srcPath & " -o " & oFile
-
-  # --- libnatpmp ---
-  echo "Compiling libnatpmp for iOS..."
-  let natpmpSrcDir = "./vendor/nim-nat-traversal/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):
-    exec clangBase &
-        " -I" & natpmpSrcDir &
-        " -DENABLE_STRNATPMPERR" &
-        " -c " & natpmpSrcDir & "/natpmp.c -o " & natpmpObj
-
-  # Use iOS-specific stub for getgateway
-  let getgatewayStubSrc = "./library/ios_natpmp_stubs.c"
-  let getgatewayStubObj = vendorObjDir / "natpmp_getgateway_stub.o"
-  if fileExists(getgatewayStubSrc) and not fileExists(getgatewayStubObj):
-    exec clangBase & " -c " & getgatewayStubSrc & " -o " & getgatewayStubObj
-
-  # --- BearSSL stubs (for tools functions not in main library) ---
-  echo "Compiling BearSSL stubs for iOS..."
-  let bearSslStubsSrc = "./library/ios_bearssl_stubs.c"
-  let bearSslStubsObj = vendorObjDir / "bearssl_stubs.o"
-  if fileExists(bearSslStubsSrc) and not fileExists(bearSslStubsObj):
-    exec clangBase & " -c " & bearSslStubsSrc & " -o " & bearSslStubsObj
-
-  # Compile all Nim-generated C files to object files
-  echo "Compiling Nim-generated C files for iOS..."
-  var cFiles: seq[string] = @[]
-  for kind, path in walkDir(nimcacheDir):
-    if kind == pcFile and path.endsWith(".c"):
-      cFiles.add(path)
-
-  for cFile in cFiles:
-    let baseName = extractFilename(cFile).changeFileExt("o")
-    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" & nimcacheDir &
-        " -c " & cFile &
-        " -o " & oFile
-
-  # Create static library from all object files
-  echo "Creating static library..."
-  var objFiles: seq[string] = @[]
-  for kind, path in walkDir(objDir):
-    if kind == pcFile and path.endsWith(".o"):
-      objFiles.add(path)
-  for kind, path in walkDir(vendorObjDir):
-    if kind == pcFile and path.endsWith(".o"):
-      objFiles.add(path)
-
-  exec "libtool -static -o " & aFile & " " & objFiles.join(" ")
-
-  echo "✔ iOS library created: " & aFile
-
-task libWakuIOS, "Build the mobile bindings for iOS":
-  let srcDir = "./library"
-  let extraParams = "-d:chronicles_log_level=ERROR"
-  buildMobileIOS srcDir, extraParams
-
-task liblogosdeliveryStatic, "Build the liblogosdelivery (Logos Messaging Delivery API) static library":
-  let lib_name = paramStr(paramCount())
-  buildLibrary lib_name, "liblogosdelivery/", chroniclesParams, "static", "liblogosdelivery.nim", "liblogosdelivery"
-
-task liblogosdeliveryDynamic, "Build the liblogosdelivery (Logos Messaging Delivery API) dynamic library":
-  let lib_name = paramStr(paramCount())
-  buildLibrary lib_name, "liblogosdelivery/", chroniclesParams, "dynamic", "liblogosdelivery.nim", "liblogosdelivery"
+task liblogosdeliveryStaticMac, "Generate bindings":
+  buildLibStaticMac("liblogosdelivery", "liblogosdelivery")
--- a/waku/api/api_conf.nim
+++ b/waku/api/api_conf.nim
@ -13,24 +13,24 @@ import

 export json_serialization, json_options

-type AutoShardingConfig* {.requiresInit.} = object
+type AutoShardingConfig* = object
  numShardsInCluster*: uint16

-type RlnConfig* {.requiresInit.} = object
+type RlnConfig* = object
  contractAddress*: string
  chainId*: uint
  epochSizeSec*: uint64

-type NetworkingConfig* {.requiresInit.} = object
+type NetworkingConfig* = object
  listenIpv4*: string
  p2pTcpPort*: uint16
  discv5UdpPort*: uint16

-type MessageValidation* {.requiresInit.} = object
+type MessageValidation* = object
  maxMessageSize*: string # Accepts formats like "150 KiB", "1500 B"
  rlnConfig*: Option[RlnConfig]

-type ProtocolsConfig* {.requiresInit.} = object
+type ProtocolsConfig* = object
  entryNodes: seq[string]
  staticStoreNodes: seq[string]
  clusterId: uint16
@ -526,7 +526,7 @@ proc decodeNodeConfigFromJson*(
  var val = NodeConfig.init() # default-initialized
  try:
    var stream = unsafeMemoryInput(jsonStr)
-    var reader = JsonReader[DefaultFlavor].init(stream)
+    var reader = (JsonReader[DefaultFlavor].init(stream))
    reader.readValue(val)
  except IOError as err:
    raise (ref SerializationError)(msg: err.msg)
				`@ -1 +0,0 @@`
				`Subproject commit 74aef399e5c232f95c9fc5c987cebac846f09d62`
				`@ -1 +0,0 @@`
				`Subproject commit 23214235d4784d24aceed99bbfe153379ea557c8`
				`@ -1 +0,0 @@`
				`Subproject commit 11e798b62b8e6beabe958e048e9e24c7e0f9ee63`
				`@ -1 +0,0 @@`
				`Subproject commit 54f5b726025e8c7385e3a6529d3aa27454c6e6ff`
				`@ -1 +0,0 @@`
				`Subproject commit 85af4db764ecd3573c4704139560df3943216cf1`
				`@ -1 +0,0 @@`
				`Subproject commit e214b3992a31acece6a9aada7d0a1ad37c928f3b`
				`@ -1 +0,0 @@`
				`Subproject commit 203abd2b3e758e0ea3ae325769b20a7e1bcd1010`
				`@ -1 +0,0 @@`
				`Subproject commit d9135e6c3c5d6d819afdfb566aa8d958756b73a8`
				`@ -1 +0,0 @@`
				`Subproject commit ce27581a3e881f782f482cb66dc5b07a02bd615e`
				`@ -1 +0,0 @@`
				`Subproject commit 06111de155253b34e47ed2aaed1d61d08d62cc1b`