rebasing cleanup

name change
some PR review
2026-05-20 11:38:35 +02:00 · 2026-05-20 11:34:03 +02:00 · 2026-05-20 11:33:44 +02:00 · 2026-05-20 11:33:31 +02:00 · 2026-05-20 11:33:31 +02:00 · 2026-05-20 11:33:30 +02:00
766 changed files with 45644 additions and 74707 deletions
@@ -1,2 +0,0 @@
-[target.wasm32-unknown-unknown]
-rustflags = ["--cfg=getrandom_backend=\"wasm_js\""]
@@ -23,10 +23,10 @@ jobs:
      - name: Setup pnpm
        uses: pnpm/action-setup@v5.0.0
        with:
-          version: 11.1.2
+          version: 9
      - uses: actions/setup-node@v4
        with:
-          node-version: 24
+          node-version: 20
      - name: Install Rust toolchain
        uses: actions-rs/toolchain@v1
        with:
@@ -17,16 +17,13 @@ jobs:
      run: sudo apt-get install rsync
      continue-on-error: true
    - uses: rlespinasse/github-slug-action@v3.x
-    - name: Setup pnpm
-      uses: pnpm/action-setup@v5.0.0
-      with:
-        version: 11.1.2
    - uses: actions/setup-node@v4
      with:
-        node-version: 24
-        cache: pnpm
+        node-version: 20
+    - name: Setup yarn
+      run: npm install -g yarn
    - name: Build
-      run: pnpm install && pnpm build && pnpm build:ci:storybook
+      run: yarn && yarn build && yarn build:ci:storybook
    - name: Deploy branch to CI www (storybook)
      continue-on-error: true
      uses: easingthemes/ssh-deploy@main
@@ -23,6 +23,7 @@ on:
      - 'sdk/ffi/**'
      - 'sdk/rust/**'
      - 'service-providers/**'
+      - 'nym-browser-extension/storage/**'
      - 'tools/**'
      - 'wasm/**'
      - 'Cargo.toml'
@@ -40,7 +40,7 @@ jobs:
      - name: Setup Node.js
        uses: actions/setup-node@v4
        with:
-          node-version: 24
+          node-version: "20"

      - name: Validate version format
        run: |
@@ -42,7 +42,7 @@ jobs:
      - name: Setup Node.js
        uses: actions/setup-node@v4
        with:
-          node-version: 24
+          node-version: "20"

      - name: Validate version format
        run: |
@@ -30,10 +30,10 @@ jobs:
      - name: Setup pnpm
        uses: pnpm/action-setup@v5.0.0
        with:
-          version: 11.1.2
+          version: 9
      - uses: actions/setup-node@v4
        with:
-          node-version: 24
+          node-version: 20
      - name: Install Rust toolchain
        uses: actions-rs/toolchain@v1
        with:
@@ -20,14 +20,12 @@ jobs:
      - uses: actions/checkout@v6
      - uses: rlespinasse/github-slug-action@v3.x

-      - name: Setup pnpm
-        uses: pnpm/action-setup@v5.0.0
-        with:
-          version: 11.1.2
      - uses: actions/setup-node@v4
        with:
-          node-version: 24
-          cache: pnpm
+          node-version: 20
+
+      - name: Setup yarn
+        run: npm install -g yarn

      - name: Install Rust toolchain
        uses: actions-rs/toolchain@v1
@@ -46,16 +44,16 @@ jobs:
          go-version: "1.24.6"

      - name: Install
-        run: pnpm i
+        run: yarn

      - name: Build packages
-        run: pnpm build:ci
+        run: yarn build:ci

      - name: Install again
-        run: pnpm i
+        run: yarn

      - name: Lint
-        run: pnpm lint
+        run: yarn lint

      - name: Typecheck with tsc
-        run: pnpm tsc
+        run: yarn tsc
@@ -1,7 +1,6 @@
 name: ci-nym-wallet-frontend

 on:
-  workflow_dispatch:
  pull_request:
    paths:
      - 'nym-wallet/**'
@@ -13,34 +12,30 @@ jobs:
    steps:
      - uses: actions/checkout@v6

-      - name: Setup pnpm
-        uses: pnpm/action-setup@v5.0.0
-        with:
-          version: 11.1.2
-
      - uses: actions/setup-node@v4
        with:
          node-version-file: nym-wallet/.nvmrc
-          cache: pnpm
+          cache: yarn
+          cache-dependency-path: yarn.lock

      - name: Install dependencies
-        run: pnpm install
+        run: yarn install --network-timeout 100000

      - name: Build TypeScript packages (wallet depends on @nymproject/types, etc.)
-        run: pnpm build:types
+        run: yarn build:types

      - name: Build @nymproject/mui-theme and @nymproject/react (wallet imports subpaths)
-        run: pnpm build:packages
+        run: yarn build:packages

      - name: Typecheck nym-wallet
-        run: pnpm --filter @nymproject/nym-wallet-app tsc
+        run: yarn --cwd nym-wallet tsc

      - name: Lint nym-wallet
-        run: pnpm --filter @nymproject/nym-wallet-app lint
+        run: yarn --cwd nym-wallet lint

-      - name: pnpm audit (workspace lockfile; informational)
-        run: pnpm audit --audit-level critical
+      - name: Yarn audit (workspace lockfile; informational)
+        run: yarn audit --level critical
        continue-on-error: true

      - name: Unit tests (nym-wallet)
-        run: pnpm --filter @nymproject/nym-wallet-app test
+        run: yarn --cwd nym-wallet test
@@ -20,7 +20,7 @@ jobs:

      - uses: actions/setup-node@v4
        with:
-          node-version: 24
+          node-version: 20

      - uses: actions-rs/toolchain@v1
        with:
@@ -23,13 +23,10 @@ jobs:
    steps:
      - uses: actions/checkout@v6

-      - name: Setup pnpm
-        uses: pnpm/action-setup@v5.0.0
+      - name: Node
+        uses: actions/setup-node@v4
        with:
-          version: 11.1.2
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 24
+          node-version: 22.13.0
          
      - name: Install Rust toolchain
        uses: dtolnay/rust-toolchain@stable
@@ -71,17 +68,17 @@ jobs:
          fileName: '.env'
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}

-      - name: pnpm cache clean
+      - name: Yarn cache clean
        shell: bash
-        run: cd .. && pnpm cache delete
+        run: cd .. && yarn cache clean

      - name: Install project dependencies
        shell: bash
-        run: cd .. && pnpm i
+        run: cd .. && yarn --network-timeout 100000

-      - name: Build
+      - name: Yarn build
        shell: bash
-        run: cd .. && pnpm build
+        run: cd .. && yarn build

      - name: Install dependencies and build it
        env:
@@ -100,7 +97,7 @@ jobs:
          TAURI_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
          TAURI_NOTARIZATION_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
        run: |
-          pnpm build-macx86 
+          yarn build-macx86 

      - name: Create app tarball
        run: |
@@ -26,17 +26,12 @@ jobs:
            libwebkit2gtk-4.1-dev build-essential curl wget libssl-dev jq \
            libgtk-3-dev squashfs-tools libayatana-appindicator3-dev make libfuse2 unzip librsvg2-dev file \
            libsoup-3.0-dev libjavascriptcoregtk-4.1-dev
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v5.0.0
-        with:
-          version: 11.1.2
-
+      
      - name: Node
        uses: actions/setup-node@v4
        with:
-          node-version: 24
-          cache: 'pnpm'
+          node-version: 22.13.0
+          cache: 'yarn'
      
      - name: Install Rust toolchain
        uses: dtolnay/rust-toolchain@stable
@@ -45,10 +40,10 @@ jobs:
      
      - name: Install project dependencies
        shell: bash
-        run: cd .. && pnpm i
+        run: cd .. && yarn --network-timeout 100000
      
      - name: Install app dependencies
-        run: pnpm
+        run: yarn
      
      - name: Create env file
        uses: timheuer/base64-to-file@v1.2
@@ -57,7 +52,7 @@ jobs:
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
      
      - name: Build app
-        run: pnpm build
+        run: yarn build
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
@@ -40,13 +40,16 @@ jobs:
      - name: Setup MSBuild.exe
        uses: microsoft/setup-msbuild@v3

-      - name: Setup pnpm
-        uses: pnpm/action-setup@v5.0.0
+      # No cache:yarn here: setup-node needs yarn on PATH to populate the cache, but this runner
+      # only gets yarn from the step below.
+      - name: Node
+        uses: actions/setup-node@v4
        with:
-          version: 11.1.2
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 24
+          node-version: 22.13.0
+
+      - name: Install Yarn (classic)
+        shell: bash
+        run: npm install -g yarn@1.22.22

      - name: Strip Authenticode thumbprint (avoid signtool on runner)
        working-directory: nym-wallet/src-tauri
@@ -115,11 +118,11 @@ jobs:
          ' tauri.conf.json
      - name: Install project dependencies
        shell: bash
-        run: cd .. && pnpm i
+        run: cd .. && yarn --network-timeout 100000

      - name: Install app dependencies
        shell: bash
-        run: pnpm i
+        run: yarn --network-timeout 100000

      - name: Build and sign it
        shell: bash
@@ -133,7 +136,7 @@ jobs:
          SSL_COM_TOTP_SECRET: ${{ env.SIGN_WINDOWS == 'true' && secrets.SSL_COM_TOTP_SECRET }}
        run: |
          echo "Starting build process..."
-          pnpm build
+          yarn build

      - name: Check bundle directory
        shell: bash
@@ -8,17 +8,15 @@ jobs:
    steps:
      - uses: actions/checkout@v6

-      - name: Setup pnpm
-        uses: pnpm/action-setup@v5.0.0
-        with:
-          version: 11.1.2
-
      - name: Install Node
        uses: actions/setup-node@v4
        with:
-          node-version: 24
+          node-version: 20
          registry-url: "https://registry.npmjs.org"

+      - name: Setup yarn
+        run: npm install -g yarn
+
      - name: Install rust toolchain
        uses: actions-rs/toolchain@v1
        with:
@@ -42,10 +40,10 @@ jobs:
        run: ./wasm/mix-fetch/go-mix-conn/scripts/update-root-certs.sh

      - name: Install dependencies
-        run: pnpm i
+        run: yarn

      - name: Build WASM and Typescript SDK
-        run: pnpm sdk:build
+        run: yarn sdk:build

      - name: Publish to NPM
        env:
@@ -23,7 +23,7 @@ jobs:
        uses: actions/checkout@v6
      - uses: actions/setup-node@v4
        with:
-          node-version: 24
+          node-version: 20
      - uses: nymtech/nym/.github/actions/nym-hash-releases@develop
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -79,7 +79,3 @@ CLAUDE.md
 /notes
 /target-otel
 test-tutorials/
-
-# pnpm
-.pnpm-store/
-
@@ -1,9 +0,0 @@
-shamefully-hoist=false
-prefer-workspace-packages=true
-hoist-pattern[]=*eslint*
-hoist-pattern[]=*prettier*
-hoist-pattern[]=*typescript*
-hoist-pattern[]=*@types*
-
-auto-install-peers=true
-strict-peer-dependencies=false
@@ -4,140 +4,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://

 ## [Unreleased]

-## [2026.11-xynomizithra] (2026-06-08)
-
- bugfix: allow re-inviting expired members ([#6863])
- feat: disable Nagle's algorithm for LP between nym-nodes ([#6857])
- Keep peer in wg table when updating psk ([#6856])
- chore: minor nym-node improvements ([#6850])
- chore: LP registration adjustments ([#6845])
- crates release: bump version to 1.21.1 ([#6844])
- fix gateways being penalised for no stress testing ([#6843])
- fix score inflation for throttled nodes ([#6842])
- Bugfix/cherry pick/waterloo stres testing floats ([#6841])
- bugfix: NMv3 race condition ([#6837])
- feat: implement UpdateFamily for the node families contract ([#6834])
- Bugfix/cherry pick/waterloo ns api ([#6833])
- experiment: attempt to retroactively generate specs for node families and ecash contracts ([#6813])
- moving lp packets in lp-data crate ([#6810])
- upgrade axum to 0.8.9 (and side deps) ([#6808])
- chore: expose admin method for migrating vesting delegations/mixnodes ([#6795])
- [chore] fix clippy 1.95 lints for future version update ([#6794])
- Handle Rate Limit Challenge Response ([#6786])
- NYM-583: Avoid corrupted database on Windows. ([#6785])
- Max/smolmix wasm ([#6784])
- Chore/bugfixes ([#6783])
- Switch from yarn to pnpm ([#6779])
- feat: Node Families: expose stake information inside DVpnGateway ([#6778])
- feat: Node Families: expose family information for NS API consumers ([#6777])
- feat: Node Families: cache and expose family data within nym API ([#6774])
- Re-order default API urls for network details ([#6767])
- add ci for NM agent binary ([#6764])
- feat/refactor: introduce shared contract caches within Nym API ([#6760])
- chore: removed dead code for redundant mixnet-vesting integration tests ([#6759])
- feat: Node Families: remove nodes upon unbonding ([#6752])
- feat: Node Families: contract transactions ([#6750])
- feat: Node Families: contract queries ([#6731])
- feat: Node Families: initial contract storage ([#6717])
- start node families topic branch ([#6715])
- Bump rand from 0.8.5 to 0.8.6 in /contracts ([#6702])
- Testing port checks in NS Agents ([#6694])
- build(deps): bump microsoft/setup-msbuild from 2 to 3 ([#6602])
- build(deps): bump tar from 0.4.44 to 0.4.45 ([#6595])
- build(deps): bump quinn-proto from 0.11.12 to 0.11.14 ([#6549])
- build(deps): bump docker/login-action from 3 to 4 ([#6518])
- build(deps): bump actions/download-artifact from 7 to 8 ([#6497])
- build(deps): bump actions/upload-artifact from 6 to 7 ([#6496])
-
-[#6863]: https://github.com/nymtech/nym/pull/6863
-[#6857]: https://github.com/nymtech/nym/pull/6857
-[#6856]: https://github.com/nymtech/nym/pull/6856
-[#6850]: https://github.com/nymtech/nym/pull/6850
-[#6845]: https://github.com/nymtech/nym/pull/6845
-[#6844]: https://github.com/nymtech/nym/pull/6844
-[#6843]: https://github.com/nymtech/nym/pull/6843
-[#6842]: https://github.com/nymtech/nym/pull/6842
-[#6841]: https://github.com/nymtech/nym/pull/6841
-[#6837]: https://github.com/nymtech/nym/pull/6837
-[#6834]: https://github.com/nymtech/nym/pull/6834
-[#6833]: https://github.com/nymtech/nym/pull/6833
-[#6813]: https://github.com/nymtech/nym/pull/6813
-[#6810]: https://github.com/nymtech/nym/pull/6810
-[#6808]: https://github.com/nymtech/nym/pull/6808
-[#6795]: https://github.com/nymtech/nym/pull/6795
-[#6794]: https://github.com/nymtech/nym/pull/6794
-[#6786]: https://github.com/nymtech/nym/pull/6786
-[#6785]: https://github.com/nymtech/nym/pull/6785
-[#6784]: https://github.com/nymtech/nym/pull/6784
-[#6783]: https://github.com/nymtech/nym/pull/6783
-[#6779]: https://github.com/nymtech/nym/pull/6779
-[#6778]: https://github.com/nymtech/nym/pull/6778
-[#6777]: https://github.com/nymtech/nym/pull/6777
-[#6774]: https://github.com/nymtech/nym/pull/6774
-[#6767]: https://github.com/nymtech/nym/pull/6767
-[#6764]: https://github.com/nymtech/nym/pull/6764
-[#6760]: https://github.com/nymtech/nym/pull/6760
-[#6759]: https://github.com/nymtech/nym/pull/6759
-[#6752]: https://github.com/nymtech/nym/pull/6752
-[#6750]: https://github.com/nymtech/nym/pull/6750
-[#6731]: https://github.com/nymtech/nym/pull/6731
-[#6717]: https://github.com/nymtech/nym/pull/6717
-[#6715]: https://github.com/nymtech/nym/pull/6715
-[#6702]: https://github.com/nymtech/nym/pull/6702
-[#6694]: https://github.com/nymtech/nym/pull/6694
-[#6602]: https://github.com/nymtech/nym/pull/6602
-[#6595]: https://github.com/nymtech/nym/pull/6595
-[#6549]: https://github.com/nymtech/nym/pull/6549
-[#6518]: https://github.com/nymtech/nym/pull/6518
-[#6497]: https://github.com/nymtech/nym/pull/6497
-[#6496]: https://github.com/nymtech/nym/pull/6496
-
-## [2026.10-waterloo] (2026-05-27)
-
- Re-order default API urls for network details - Waterloo release ([#6799])
- [bugfix] IPR v8<->v9 mismatch on Waterloo ([#6772])
- Migrate to hickory 0.26.1 ([#6751])
- add workflows for NM3 ([#6729])
- credential proxy pool ([#6726])
- chore: made sphinx version threshold assertion a compile time check ([#6718])
- Feat/nmv3 updated performance calculation ([#6714])
- feat: NMv3: submission of stress testing result into nym-api ([#6709])
- feat: NMv3: Prometheus metrics for network monitor ([#6693])
- feat: NMv3: add read-only results API to orchestrator ([#6689])
- feat: NMv3: Eviction of stale testrun data ([#6685])
- feat: NMv3: Wire up testrun assignment and result submission flow ([#6680])
- feat: NMv3: Support multiple network monitor agents per host ([#6679])
- Feat/nmv3 agent announcement ([#6673])
- add node refresher for periodic scraping of bonded nym-node details ([#6626])
- Feat/nmv3 orchestrator queue ([#6597])
- feat: network monitor agent - standalone node stress-testing ([#6582])
- [feat] propagate NM agent noise keys to nym-node routing ([#6577])
- start mix stress testing topic branch ([#6575])
- Feat/nmv3 agents subscription ([#6567])
- Feat/nmv3 agents contract ([#6555])
-
-[#6799]: https://github.com/nymtech/nym/pull/6799
-[#6772]: https://github.com/nymtech/nym/pull/6772
-[#6751]: https://github.com/nymtech/nym/pull/6751
-[#6729]: https://github.com/nymtech/nym/pull/6729
-[#6726]: https://github.com/nymtech/nym/pull/6726
-[#6718]: https://github.com/nymtech/nym/pull/6718
-[#6714]: https://github.com/nymtech/nym/pull/6714
-[#6709]: https://github.com/nymtech/nym/pull/6709
-[#6693]: https://github.com/nymtech/nym/pull/6693
-[#6689]: https://github.com/nymtech/nym/pull/6689
-[#6685]: https://github.com/nymtech/nym/pull/6685
-[#6680]: https://github.com/nymtech/nym/pull/6680
-[#6679]: https://github.com/nymtech/nym/pull/6679
-[#6673]: https://github.com/nymtech/nym/pull/6673
-[#6626]: https://github.com/nymtech/nym/pull/6626
-[#6597]: https://github.com/nymtech/nym/pull/6597
-[#6582]: https://github.com/nymtech/nym/pull/6582
-[#6577]: https://github.com/nymtech/nym/pull/6577
-[#6575]: https://github.com/nymtech/nym/pull/6575
-[#6567]: https://github.com/nymtech/nym/pull/6567
-[#6555]: https://github.com/nymtech/nym/pull/6555
-
 ## [2026.9-venaco] (2026-05-06)

 - Fix for v9 IPR  ([#6710])
@@ -44,7 +44,6 @@ members = [
    "common/cosmwasm-smart-contracts/nym-performance-contract",
    "common/cosmwasm-smart-contracts/nym-pool-contract",
    "common/cosmwasm-smart-contracts/vesting-contract",
-    "common/cosmwasm-smart-contracts/network-monitors-contract",
    "common/credential-proxy",
    "common/credential-storage",
    "common/credential-utils",
@@ -131,11 +130,13 @@ members = [
    "nym-api",
    "nym-api/nym-api-requests",
    "nym-authenticator-client",
+    "nym-browser-extension/storage",
    "nym-credential-proxy/nym-credential-proxy",
    "nym-credential-proxy/nym-credential-proxy-requests",
    "nym-data-observatory",
    "nym-gateway-probe",
    "nym-ip-packet-client",
+    "nym-mix-sim",
    "nym-network-monitor",
    "nym-node",
    "nym-node-status-api/nym-node-status-agent",
@@ -174,12 +175,10 @@ members = [
    "tools/nymvisor",
    "tools/ts-rs-cli",
    "wasm/client",
+    # "wasm/full-nym-wasm",  # If we uncomment this again, remember to also uncomment the profile settings below
    "wasm/mix-fetch",
-    "wasm/smolmix",
+    "wasm/node-tester",
    "wasm/zknym-lib",
-    "nym-network-monitor-v3/nym-network-monitor-orchestrator",
-    "nym-network-monitor-v3/nym-network-monitor-agent",
-    "nym-network-monitor-v3/nym-network-monitor-orchestrator-requests",
 ]

 default-members = [
@@ -188,6 +187,7 @@ default-members = [
    "nym-api",
    "nym-authenticator-client",
    "nym-credential-proxy/nym-credential-proxy",
+    "nym-mix-sim",
    "nym-node",
    "nym-registration-client",
    "nym-statistics-api",
@@ -197,8 +197,7 @@ default-members = [
    "service-providers/network-requester",
    "tools/internal/localnet-orchestrator",
    "tools/nymvisor",
-    "nym-network-monitor-v3/nym-network-monitor-orchestrator",
-    "nym-network-monitor-v3/nym-network-monitor-agent",
+    "tools/internal/localnet-orchestrator",
 ]

 exclude = ["contracts", "nym-wallet", "cpu-cycles"]
@@ -212,7 +211,7 @@ edition = "2024"
 license = "Apache-2.0"
 rust-version = "1.87.0"
 readme = "README.md"
-version = "1.21.1"
+version = "1.21.0"

 [workspace.dependencies]
 addr = "0.15.6"
@@ -226,11 +225,10 @@ anyhow = "1.0.98"
 arc-swap = "1.7.1"
 argon2 = "0.5.0"
 async-trait = "0.1.88"
-async-tungstenite = { version = "0.24", default-features = false }
-axum = "0.8.9"
-axum-client-ip = "1.3.1"
-axum-extra = "0.12.6"
-axum-test = "20.0.0"
+axum = "0.7.5"
+axum-client-ip = "0.6.1"
+axum-extra = "0.9.4"
+axum-test = "16.2.0"
 base64 = "0.22.1"
 base85rs = "0.1.3"
 bincode = "1.3.3"
@@ -255,7 +253,7 @@ clap_complete_fig = "4.5"
 colored = "2.2"
 comfy-table = "7.1.4"
 console = "0.16.0"
-console-subscriber = "0.5.0"
+console-subscriber = "0.4.1"
 console_error_panic_hook = "0.1"
 const-str = "0.5.6"
 const_format = "0.2.34"
@@ -280,27 +278,24 @@ eyre = "0.6.9"
 fastrand = "2.1.1"
 flate2 = "1.1.1"
 futures = "0.3.31"
-futures-rustls = { version = "0.26", default-features = false }
 futures-util = "0.3"
 generic-array = "0.14.7"
 getrandom = "0.2.10"
 getrandom03 = { package = "getrandom", version = "=0.3.3" }
-getrandom04 = { package = "getrandom", version = "0.4" }
 glob = "0.3"
 handlebars = "3.5.5"
 hex = "0.4.3"
-hickory-proto = { version = "0.26.1", default-features = false }
+hickory-proto = "0.26.1"
 hickory-resolver = "0.26.1"
 hkdf = "0.12.3"
 hmac = "0.12.1"
 http = "1"
 http-body-util = "0.1"
-httparse = "1.10"
 httpcodec = "0.2.3"
 human-repr = "1.1.0"
 humantime = "2.2.0"
 humantime-serde = "1.1.1"
-hyper = { version = "1.6.0", default-features = false }
+hyper = "1.6.0"
 hyper-util = "0.1"
 indicatif = "0.18.0"
 inquire = "0.6.2"
@@ -346,14 +341,12 @@ regex = "1.10.6"
 reqwest = { version = "0.13.1", default-features = false }
 rs_merkle = "1.5.0"
 rustls = { version = "0.23.37", default-features = false }
-rustls-pki-types = "1"
-rustls-rustcrypto = "0.0.2-alpha"
 schemars = "0.8.22"
 semver = "1.0.26"
 serde = "1.0.219"
 serde_bytes = "0.11.17"
 serde_derive = "1.0"
-serde_json = { version = "1.0.140", features = ["float_roundtrip"] }
+serde_json = "1.0.140"
 serde_json_path = "0.7.2"
 serde_repr = "0.1"
 serde_with = "3.9.0"
@@ -361,7 +354,6 @@ serde_yaml = "0.9.25"
 serde_plain = "1.0.2"
 sha2 = "0.10.3"
 si-scale = "0.2.3"
-simple-dns = "0.7"
 smoltcp = "0.12"
 snow = "0.9.6"
 sphinx-packet = "=0.6.0"
@@ -385,7 +377,7 @@ tokio-test = "0.4.4"
 tokio-tun = "0.11.5"
 tokio-rustls = "0.26"
 tokio-smoltcp = "0.5"
-tokio-tungstenite = "0.20.1"
+tokio-tungstenite = { version = "0.20.1" }
 tokio-util = "0.7.15"
 toml = "0.8.22"
 tower = "0.5.2"
@@ -403,20 +395,17 @@ uniffi = "0.29.2"
 uniffi_build = "0.29.0"
 url = "2.5"
 utoipa = "5.2"
-utoipa-swagger-ui = "9.0.2"
+utoipa-swagger-ui = "8.1"
 utoipauto = "0.2"
 uuid = "1.19.0"
 vergen = { version = "=8.3.1", default-features = false }
+vergen-gitcl = { version = "1.0.8", default-features = false }
 walkdir = "2"
 x25519-dalek = "2.0.0"
 zeroize = "1.7.0"

 prometheus = { version = "0.14.0" }

-# recreating lioness
-# we don't care about particular versions - just pull whatever is used by sphinx
-lioness = "*"
-arrayref = "*"

 # libcrux
 libcrux-kem = "0.0.7"
@@ -429,115 +418,114 @@ libcrux-sha3 = "0.0.8"
 libcrux-traits = "0.0.6"

 # Workspace dep definitions required by crates.io publication - we need a workspace version since `cargo workspaces` doesn't work with path imports from crate manifests
-nym-api-requests = { version = "1.21.1", path = "nym-api/nym-api-requests" }
-nym-authenticator-requests = { version = "1.21.1", path = "common/authenticator-requests" }
-nym-async-file-watcher = { version = "1.21.1", path = "common/async-file-watcher" }
-nym-authenticator-client = { version = "1.21.1", path = "nym-authenticator-client" }
-nym-bandwidth-controller = { version = "1.21.1", path = "common/bandwidth-controller" }
-nym-bin-common = { version = "1.21.1", path = "common/bin-common" }
-nym-cache = { version = "1.21.1", path = "common/nym-cache" }
-nym-client-core = { version = "1.21.1", path = "common/client-core", default-features = false }
-nym-client-core-config-types = { version = "1.21.1", path = "common/client-core/config-types" }
-nym-client-core-gateways-storage = { version = "1.21.1", path = "common/client-core/gateways-storage" }
-nym-client-core-surb-storage = { version = "1.21.1", path = "common/client-core/surb-storage" }
-nym-client-websocket-requests = { version = "1.21.1", path = "clients/native/websocket-requests" }
-nym-common = { version = "1.21.1", path = "common/nym-common" }
-nym-compact-ecash = { version = "1.21.1", path = "common/nym_offline_compact_ecash" }
-nym-config = { version = "1.21.1", path = "common/config" }
-nym-contracts-common = { version = "1.21.1", path = "common/cosmwasm-smart-contracts/contracts-common" }
-nym-coconut-dkg-common = { version = "1.21.1", path = "common/cosmwasm-smart-contracts/coconut-dkg" }
-nym-credential-storage = { version = "1.21.1", path = "common/credential-storage" }
-nym-credential-utils = { version = "1.21.1", path = "common/credential-utils" }
-nym-credential-proxy-lib = { version = "1.21.1", path = "common/credential-proxy" }
-nym-credentials = { version = "1.21.1", path = "common/credentials", default-features = false }
-nym-credentials-interface = { version = "1.21.1", path = "common/credentials-interface" }
-nym-credential-proxy-requests = { version = "1.21.1", path = "nym-credential-proxy/nym-credential-proxy-requests", default-features = false }
-nym-credential-verification = { version = "1.21.1", path = "common/credential-verification" }
-nym-crypto = { version = "1.21.1", path = "common/crypto", default-features = false }
-nym-dkg = { version = "1.21.1", path = "common/dkg" }
-nym-ecash-contract-common = { version = "1.21.1", path = "common/cosmwasm-smart-contracts/ecash-contract" }
-nym-ecash-signer-check = { version = "1.21.1", path = "common/ecash-signer-check" }
-nym-ecash-signer-check-types = { version = "1.21.1", path = "common/ecash-signer-check-types" }
-nym-ecash-time = { version = "1.21.1", path = "common/ecash-time" }
-nym-exit-policy = { version = "1.21.1", path = "common/exit-policy" }
-nym-ffi-shared = { version = "1.21.1", path = "sdk/ffi/shared" }
-nym-gateway-client = { version = "1.21.1", path = "common/client-libs/gateway-client", default-features = false }
-nym-gateway-probe = { version = "1.21.1", path = "nym-gateway-probe" }
-nym-gateway-requests = { version = "1.21.1", path = "common/gateway-requests" }
-nym-gateway-storage = { version = "1.21.1", path = "common/gateway-storage" }
-nym-gateway-stats-storage = { version = "1.21.1", path = "common/gateway-stats-storage" }
-nym-group-contract-common = { version = "1.21.1", path = "common/cosmwasm-smart-contracts/group-contract" }
-nym-http-api-client = { version = "1.21.1", path = "common/http-api-client" }
-nym-http-api-client-macro = { version = "1.21.1", path = "common/http-api-client-macro" }
-nym-http-api-common = { version = "1.21.1", path = "common/http-api-common", default-features = false }
-nym-id = { version = "1.21.1", path = "common/nym-id" }
-nym-ip-packet-client = { version = "1.21.1", path = "nym-ip-packet-client" }
-nym-ip-packet-requests = { version = "1.21.1", path = "common/ip-packet-requests" }
-nym-lp = { version = "1.21.1", path = "common/nym-lp" }
-nym-lp-data = { version = "1.21.1", path = "common/nym-lp-data" }
-nym-kkt = { version = "1.21.1", path = "common/nym-kkt" }
-nym-kkt-ciphersuite = { version = "1.21.1", path = "common/nym-kkt-ciphersuite" }
-nym-kkt-context = { version = "1.21.1", path = "common/nym-kkt-context" }
-nym-metrics = { version = "1.21.1", path = "common/nym-metrics" }
-nym-mixnet-client = { version = "1.21.1", path = "common/client-libs/mixnet-client" }
-nym-mixnet-contract-common = { version = "1.21.1", path = "common/cosmwasm-smart-contracts/mixnet-contract" }
-nym-multisig-contract-common = { version = "1.21.1", path = "common/cosmwasm-smart-contracts/multisig-contract" }
-nym-network-defaults = { version = "1.21.1", path = "common/network-defaults" }
-nym-node-tester-utils = { version = "1.21.1", path = "common/node-tester-utils" }
-nym-noise = { version = "1.21.1", path = "common/nymnoise" }
-nym-noise-keys = { version = "1.21.1", path = "common/nymnoise/keys" }
-nym-nonexhaustive-delayqueue = { version = "1.21.1", path = "common/nonexhaustive-delayqueue" }
-nym-node-requests = { version = "1.21.1", path = "nym-node/nym-node-requests", default-features = false }
-nym-node-metrics = { version = "1.21.1", path = "nym-node/nym-node-metrics" }
-nym-node-families-contract-common = { version = "1.21.1", path = "common/cosmwasm-smart-contracts/node-families-contract" }
-nym-ordered-buffer = { version = "1.21.1", path = "common/socks5/ordered-buffer" }
-nym-outfox = { version = "1.21.1", path = "nym-outfox" }
-nym-registration-common = { version = "1.21.1", path = "common/registration" }
-nym-pemstore = { version = "1.21.1", path = "common/pemstore" }
-nym-performance-contract-common = { version = "1.21.1", path = "common/cosmwasm-smart-contracts/nym-performance-contract" }
-nym-sdk = { version = "1.21.1", path = "sdk/rust/nym-sdk" }
-nym-serde-helpers = { version = "1.21.1", path = "common/serde-helpers" }
-nym-service-providers-common = { version = "1.21.1", path = "service-providers/common" }
-nym-service-provider-requests-common = { version = "1.21.1", path = "common/service-provider-requests-common" }
-nym-socks5-client-core = { version = "1.21.1", path = "common/socks5-client-core" }
-nym-socks5-proxy-helpers = { version = "1.21.1", path = "common/socks5/proxy-helpers" }
-nym-socks5-requests = { version = "1.21.1", path = "common/socks5/requests" }
-nym-sphinx = { version = "1.21.1", path = "common/nymsphinx" }
-nym-sphinx-acknowledgements = { version = "1.21.1", path = "common/nymsphinx/acknowledgements" }
-nym-sphinx-addressing = { version = "1.21.1", path = "common/nymsphinx/addressing" }
-nym-sphinx-anonymous-replies = { version = "1.21.1", path = "common/nymsphinx/anonymous-replies" }
-nym-sphinx-chunking = { version = "1.21.1", path = "common/nymsphinx/chunking" }
-nym-sphinx-cover = { version = "1.21.1", path = "common/nymsphinx/cover" }
-nym-sphinx-forwarding = { version = "1.21.1", path = "common/nymsphinx/forwarding" }
-nym-sphinx-framing = { version = "1.21.1", path = "common/nymsphinx/framing" }
-nym-sphinx-params = { version = "1.21.1", path = "common/nymsphinx/params" }
-nym-sphinx-routing = { version = "1.21.1", path = "common/nymsphinx/routing" }
-nym-sphinx-types = { version = "1.21.1", path = "common/nymsphinx/types" }
-nym-statistics-common = { version = "1.21.1", path = "common/statistics" }
-nym-store-cipher = { version = "1.21.1", path = "common/store-cipher" }
-nym-task = { version = "1.21.1", path = "common/task" }
-nym-tun = { version = "1.21.1", path = "common/tun" }
-nym-test-utils = { version = "1.21.1", path = "common/test-utils" }
-nym-ticketbooks-merkle = { version = "1.21.1", path = "common/ticketbooks-merkle" }
-nym-topology = { version = "1.21.1", path = "common/topology" }
-nym-types = { version = "1.21.1", path = "common/types" }
-nym-upgrade-mode-check = { version = "1.21.1", path = "common/upgrade-mode-check" }
-nym-validator-client = { version = "1.21.1", path = "common/client-libs/validator-client", default-features = false }
-nym-vesting-contract-common = { version = "1.21.1", path = "common/cosmwasm-smart-contracts/vesting-contract" }
-nym-network-monitors-contract-common = { version = "1.21.1", path = "common/cosmwasm-smart-contracts/network-monitors-contract" }
-nym-verloc = { version = "1.21.1", path = "common/verloc" }
-nym-wireguard = { version = "1.21.1", path = "common/wireguard" }
-nym-wireguard-types = { version = "1.21.1", path = "common/wireguard-types" }
-nym-wireguard-private-metadata-shared = { version = "1.21.1", path = "common/wireguard-private-metadata/shared" }
-nym-wireguard-private-metadata-client = { version = "1.21.1", path = "common/wireguard-private-metadata/client" }
-nym-wireguard-private-metadata-server = { version = "1.21.1", path = "common/wireguard-private-metadata/server" }
-nym-sqlx-pool-guard = { version = "1.21.1", path = "nym-sqlx-pool-guard" }
-nym-wasm-client-core = { version = "1.21.1", path = "common/wasm/client-core" }
-nym-wasm-storage = { version = "1.21.1", path = "common/wasm/storage" }
-nym-wasm-utils = { version = "1.21.1", path = "common/wasm/utils", default-features = false }
-nyxd-scraper-shared = { version = "1.21.1", path = "common/nyxd-scraper-shared" }
+nym-api-requests = { version = "1.21.0", path = "nym-api/nym-api-requests" }
+nym-authenticator-requests = { version = "1.21.0", path = "common/authenticator-requests" }
+nym-async-file-watcher = { version = "1.21.0", path = "common/async-file-watcher" }
+nym-authenticator-client = { version = "1.21.0", path = "nym-authenticator-client" }
+nym-bandwidth-controller = { version = "1.21.0", path = "common/bandwidth-controller" }
+nym-bin-common = { version = "1.21.0", path = "common/bin-common" }
+nym-cache = { version = "1.21.0", path = "common/nym-cache" }
+nym-client-core = { version = "1.21.0", path = "common/client-core", default-features = false }
+nym-client-core-config-types = { version = "1.21.0", path = "common/client-core/config-types" }
+nym-client-core-gateways-storage = { version = "1.21.0", path = "common/client-core/gateways-storage" }
+nym-client-core-surb-storage = { version = "1.21.0", path = "common/client-core/surb-storage" }
+nym-client-websocket-requests = { version = "1.21.0", path = "clients/native/websocket-requests" }
+nym-common = { version = "1.21.0", path = "common/nym-common" }
+nym-compact-ecash = { version = "1.21.0", path = "common/nym_offline_compact_ecash" }
+nym-config = { version = "1.21.0", path = "common/config" }
+nym-contracts-common = { version = "1.21.0", path = "common/cosmwasm-smart-contracts/contracts-common" }
+nym-coconut-dkg-common = { version = "1.21.0", path = "common/cosmwasm-smart-contracts/coconut-dkg" }
+nym-credential-storage = { version = "1.21.0", path = "common/credential-storage" }
+nym-credential-utils = { version = "1.21.0", path = "common/credential-utils" }
+nym-credential-proxy-lib = { version = "1.21.0", path = "common/credential-proxy" }
+nym-credentials = { version = "1.21.0", path = "common/credentials", default-features = false }
+nym-credentials-interface = { version = "1.21.0", path = "common/credentials-interface" }
+nym-credential-proxy-requests = { version = "1.21.0", path = "nym-credential-proxy/nym-credential-proxy-requests", default-features = false }
+nym-credential-verification = { version = "1.21.0", path = "common/credential-verification" }
+nym-crypto = { version = "1.21.0", path = "common/crypto", default-features = false }
+nym-dkg = { version = "1.21.0", path = "common/dkg" }
+nym-ecash-contract-common = { version = "1.21.0", path = "common/cosmwasm-smart-contracts/ecash-contract" }
+nym-ecash-signer-check = { version = "1.21.0", path = "common/ecash-signer-check" }
+nym-ecash-signer-check-types = { version = "1.21.0", path = "common/ecash-signer-check-types" }
+nym-ecash-time = { version = "1.21.0", path = "common/ecash-time" }
+nym-exit-policy = { version = "1.21.0", path = "common/exit-policy" }
+nym-ffi-shared = { version = "1.21.0", path = "sdk/ffi/shared" }
+nym-gateway-client = { version = "1.21.0", path = "common/client-libs/gateway-client", default-features = false }
+nym-gateway-probe = { version = "1.18.0", path = "nym-gateway-probe" }
+nym-gateway-requests = { version = "1.21.0", path = "common/gateway-requests" }
+nym-gateway-storage = { version = "1.21.0", path = "common/gateway-storage" }
+nym-gateway-stats-storage = { version = "1.21.0", path = "common/gateway-stats-storage" }
+nym-group-contract-common = { version = "1.21.0", path = "common/cosmwasm-smart-contracts/group-contract" }
+nym-http-api-client = { version = "1.21.0", path = "common/http-api-client" }
+nym-http-api-client-macro = { version = "1.21.0", path = "common/http-api-client-macro" }
+nym-http-api-common = { version = "1.21.0", path = "common/http-api-common", default-features = false }
+nym-id = { version = "1.21.0", path = "common/nym-id" }
+nym-ip-packet-client = { version = "1.21.0", path = "nym-ip-packet-client" }
+nym-ip-packet-requests = { version = "1.21.0", path = "common/ip-packet-requests" }
+nym-lp = { version = "1.21.0", path = "common/nym-lp" }
+nym-lp-data = { version = "1.21.0", path = "common/nym-lp-data" }
+nym-kkt = { version = "1.21.0", path = "common/nym-kkt" }
+nym-kkt-ciphersuite = { version = "1.21.0", path = "common/nym-kkt-ciphersuite" }
+nym-kkt-context = { version = "1.21.0", path = "common/nym-kkt-context" }
+nym-metrics = { version = "1.21.0", path = "common/nym-metrics" }
+nym-mixnet-client = { version = "1.21.0", path = "common/client-libs/mixnet-client" }
+nym-mixnet-contract-common = { version = "1.21.0", path = "common/cosmwasm-smart-contracts/mixnet-contract" }
+nym-multisig-contract-common = { version = "1.21.0", path = "common/cosmwasm-smart-contracts/multisig-contract" }
+nym-network-defaults = { version = "1.21.0", path = "common/network-defaults" }
+nym-node-tester-utils = { version = "1.21.0", path = "common/node-tester-utils" }
+nym-noise = { version = "1.21.0", path = "common/nymnoise" }
+nym-noise-keys = { version = "1.21.0", path = "common/nymnoise/keys" }
+nym-nonexhaustive-delayqueue = { version = "1.21.0", path = "common/nonexhaustive-delayqueue" }
+nym-node-requests = { version = "1.21.0", path = "nym-node/nym-node-requests", default-features = false }
+nym-node-metrics = { version = "1.21.0", path = "nym-node/nym-node-metrics" }
+nym-node-families-contract-common = { version = "1.21.0", path = "common/cosmwasm-smart-contracts/node-families-contract" }
+nym-ordered-buffer = { version = "1.21.0", path = "common/socks5/ordered-buffer" }
+nym-outfox = { version = "1.21.0", path = "nym-outfox" }
+nym-registration-common = { version = "1.21.0", path = "common/registration" }
+nym-pemstore = { version = "1.21.0", path = "common/pemstore" }
+nym-performance-contract-common = { version = "1.21.0", path = "common/cosmwasm-smart-contracts/nym-performance-contract" }
+nym-sdk = { version = "1.21.0", path = "sdk/rust/nym-sdk" }
+nym-serde-helpers = { version = "1.21.0", path = "common/serde-helpers" }
+nym-service-providers-common = { version = "1.21.0", path = "service-providers/common" }
+nym-service-provider-requests-common = { version = "1.21.0", path = "common/service-provider-requests-common" }
+nym-socks5-client-core = { version = "1.21.0", path = "common/socks5-client-core" }
+nym-socks5-proxy-helpers = { version = "1.21.0", path = "common/socks5/proxy-helpers" }
+nym-socks5-requests = { version = "1.21.0", path = "common/socks5/requests" }
+nym-sphinx = { version = "1.21.0", path = "common/nymsphinx" }
+nym-sphinx-acknowledgements = { version = "1.21.0", path = "common/nymsphinx/acknowledgements" }
+nym-sphinx-addressing = { version = "1.21.0", path = "common/nymsphinx/addressing" }
+nym-sphinx-anonymous-replies = { version = "1.21.0", path = "common/nymsphinx/anonymous-replies" }
+nym-sphinx-chunking = { version = "1.21.0", path = "common/nymsphinx/chunking" }
+nym-sphinx-cover = { version = "1.21.0", path = "common/nymsphinx/cover" }
+nym-sphinx-forwarding = { version = "1.21.0", path = "common/nymsphinx/forwarding" }
+nym-sphinx-framing = { version = "1.21.0", path = "common/nymsphinx/framing" }
+nym-sphinx-params = { version = "1.21.0", path = "common/nymsphinx/params" }
+nym-sphinx-routing = { version = "1.21.0", path = "common/nymsphinx/routing" }
+nym-sphinx-types = { version = "1.21.0", path = "common/nymsphinx/types" }
+nym-statistics-common = { version = "1.21.0", path = "common/statistics" }
+nym-store-cipher = { version = "1.21.0", path = "common/store-cipher" }
+nym-task = { version = "1.21.0", path = "common/task" }
+nym-tun = { version = "1.21.0", path = "common/tun" }
+nym-test-utils = { version = "1.21.0", path = "common/test-utils" }
+nym-ticketbooks-merkle = { version = "1.21.0", path = "common/ticketbooks-merkle" }
+nym-topology = { version = "1.21.0", path = "common/topology" }
+nym-types = { version = "1.21.0", path = "common/types" }
+nym-upgrade-mode-check = { version = "1.21.0", path = "common/upgrade-mode-check" }
+nym-validator-client = { version = "1.21.0", path = "common/client-libs/validator-client", default-features = false }
+nym-vesting-contract-common = { version = "1.21.0", path = "common/cosmwasm-smart-contracts/vesting-contract" }
+nym-verloc = { version = "1.21.0", path = "common/verloc" }
+nym-wireguard = { version = "1.21.0", path = "common/wireguard" }
+nym-wireguard-types = { version = "1.21.0", path = "common/wireguard-types" }
+nym-wireguard-private-metadata-shared = { version = "1.21.0", path = "common/wireguard-private-metadata/shared" }
+nym-wireguard-private-metadata-client = { version = "1.21.0", path = "common/wireguard-private-metadata/client" }
+nym-wireguard-private-metadata-server = { version = "1.21.0", path = "common/wireguard-private-metadata/server" }
+nym-sqlx-pool-guard = { version = "1.2.0", path = "nym-sqlx-pool-guard" }
+nym-wasm-client-core = { version = "1.21.0", path = "common/wasm/client-core" }
+nym-wasm-storage = { version = "1.21.0", path = "common/wasm/storage" }
+nym-wasm-utils = { version = "1.21.0", path = "common/wasm/utils", default-features = false }
+nyxd-scraper-shared = { version = "1.21.0", path = "common/nyxd-scraper-shared" }

-smolmix = { version = "1.21.1", path = "smolmix/core" }
+smolmix = { version = "1.21.0", path = "smolmix/core" }

 # coconut/DKG related
 # unfortunately until https://github.com/zkcrypto/nym-bls12_381-fork/issues/10 is resolved, we have to rely on the fork
@@ -604,11 +592,18 @@ opt-level = 3
 # lto = true
 opt-level = 'z'

-[profile.release.package.mix-fetch-wasm]
+[profile.release.package.nym-node-tester-wasm]
 # lto = true
 opt-level = 'z'

-[profile.release.package.smolmix-wasm]
+# Commented out since the crate is also commented out from the inclusion in the
+# workspace above. We should uncomment this if we re-include it in the
+# workspace
+#[profile.release.package.nym-wasm-sdk]
+## lto = true
+#opt-level = 'z'
+
+[profile.release.package.mix-fetch-wasm]
 # lto = true
 opt-level = 'z'

@@ -629,3 +624,4 @@ exit = "deny"
 panic = "deny"
 unimplemented = "deny"
 unreachable = "deny"
+
@@ -104,20 +104,23 @@ $(eval $(call add_cargo_workspace,wallet,nym-wallet))
 sdk-wasm: sdk-wasm-build sdk-wasm-test sdk-wasm-lint

 sdk-wasm-build:
+# 	$(MAKE) -C nym-browser-extension/storage wasm-pack
 	$(MAKE) -C wasm/client
+	$(MAKE) -C wasm/node-tester
 	$(MAKE) -C wasm/mix-fetch
-	$(MAKE) -C wasm/smolmix
 # 	$(MAKE) -C wasm/zknym-lib
+	# $(MAKE) -C wasm/full-nym-wasm

 # run this from npm/yarn to ensure tools are in the path, e.g. yarn build:sdk from root of repo
 sdk-typescript-build:
 	npx lerna run --scope @nymproject/sdk build --stream
 	npx lerna run --scope @nymproject/mix-fetch build --stream
-	pnpm --pwd sdk/typescript/codegen/contract-clients build
+	npx lerna run --scope @nymproject/node-tester build --stream
+	yarn --cwd sdk/typescript/codegen/contract-clients build

 # NOTE: These targets are part of the main workspace (but not as wasm32-unknown-unknown)
-
-WASM_CRATES = nym-client-wasm
+# WASM_CRATES = extension-storage nym-client-wasm nym-node-tester-wasm zknym-lib
+WASM_CRATES = nym-client-wasm nym-node-tester-wasm

 sdk-wasm-test:
 	#cargo test $(addprefix -p , $(WASM_CRATES)) --target wasm32-unknown-unknown -- -Dwarnings
@@ -125,7 +128,6 @@ sdk-wasm-test:
 sdk-wasm-lint:
 	RUSTFLAGS='--cfg getrandom_backend="wasm_js"' cargo clippy $(addprefix -p , $(WASM_CRATES)) --target wasm32-unknown-unknown -- -Dwarnings
 	$(MAKE) -C wasm/mix-fetch check-fmt
-	$(MAKE) -C wasm/smolmix check-fmt

 # Add to top-level targets
 build: sdk-wasm-build
@@ -221,7 +223,7 @@ build-nym-cli:

 generate-typescript:
 	cd tools/ts-rs-cli && cargo run && cd ../..
-	pnpm types:lint:fix
+	yarn types:lint:fix

 # Run the integration tests for public nym-api endpoints
 run-api-tests:
@@ -74,9 +74,9 @@ Nym Node Operators and Validators Terms and Conditions can be found [here](https
 ## Getting Started

 ```bash
-pnpm install
+yarn install
 ```

 ```bash
-pnpm build
+yarn build
 ```
@@ -1,7 +1,7 @@
 [package]
 name = "nym-client"
 description = "Implementation of the Nym Client"
-version = "1.1.78"
+version = "1.1.76"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2021"
 license.workspace = true
@@ -1,7 +1,7 @@
 [package]
 name = "nym-socks5-client"
 description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
-version = "1.1.78"
+version = "1.1.76"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2021"
 license.workspace = true
@@ -25,8 +25,6 @@ pub trait BandwidthTicketProvider: Send + Sync {
    ) -> Result<PreparedCredential, BandwidthControllerError>;

    async fn get_upgrade_mode_token(&self) -> Result<Option<String>, BandwidthControllerError>;
-
-    async fn close(&self) {}
 }

 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
@@ -58,10 +56,6 @@ where
            .map_err(|_| BandwidthControllerError::MalformedUpgradeModeToken)?;
        Ok(Some(token))
    }
-
-    async fn close(&self) {
-        self.storage.close().await;
-    }
 }

 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
@@ -81,8 +75,4 @@ impl<T: BandwidthTicketProvider + ?Sized + Send> BandwidthTicketProvider for Box
    async fn get_upgrade_mode_token(&self) -> Result<Option<String>, BandwidthControllerError> {
        (**self).get_upgrade_mode_token().await
    }
-
-    async fn close(&self) {
-        (**self).close().await;
-    }
 }
@@ -1023,16 +1023,6 @@ where
        let encryption_keys = init_res.client_keys.encryption_keypair();
        let identity_keys = init_res.client_keys.identity_keypair();

-        let credential_store_for_close = credential_store.clone();
-        let close_credential_token = shutdown_tracker.clone_shutdown_token();
-        shutdown_tracker.try_spawn_named(
-            async move {
-                close_credential_token.cancelled().await;
-                credential_store_for_close.close().await;
-            },
-            "CredentialStorage::close_on_shutdown",
-        );
-
        // the components are started in very specific order. Unless you know what you are doing,
        // do not change that.
        let bandwidth_controller = self
@@ -11,17 +11,11 @@ use nym_bandwidth_controller::BandwidthController;
 use nym_client_core_gateways_storage::OnDiskGatewaysDetails;
 use nym_credential_storage::storage::Storage as CredentialStorage;
 use nym_validator_client::{QueryHttpRpcNyxdClient, nyxd};
-use std::{io, path::Path, time::Duration};
+use std::{io, path::Path};
 use time::OffsetDateTime;
 use tracing::{error, info, trace};
 use url::Url;

-/// Maximum rename retry attempts when the database file is temporarily locked.
-const ARCHIVE_MAX_RETRY_ATTEMPTS: u8 = 15;
-
-/// Delay between archive rename retry attempts.
-const ARCHIVE_RETRY_DELAY: Duration = Duration::from_millis(200);
-
 async fn setup_fresh_backend<P: AsRef<Path>>(
    db_path: P,
    surb_config: &config::ReplySurbs,
@@ -80,58 +74,13 @@ async fn archive_corrupted_database<P: AsRef<Path>>(db_path: P) -> io::Result<()
        };
    let renamed = db_path.with_extension(new_extension);

-    // On Windows, sqlx may release its OS file handles asynchronously after
-    // pool.close() returns, briefly keeping the file locked
-    // (ERROR_SHARING_VIOLATION, os error 32).  Retry with a short delay to
-    // give the OS time to flush the remaining handles.
-    for attempt in 0..ARCHIVE_MAX_RETRY_ATTEMPTS {
-        match tokio::fs::rename(db_path, &renamed).await {
-            Ok(()) => return Ok(()),
-            Err(e) if is_file_locked_error(&e) && (attempt + 1) < ARCHIVE_MAX_RETRY_ATTEMPTS => {
-                trace!(
-                    "Database file is temporarily locked, retrying archive \
-                     (attempt {}/{}): {e}",
-                    attempt + 1,
-                    ARCHIVE_MAX_RETRY_ATTEMPTS
-                );
-                tokio::time::sleep(ARCHIVE_RETRY_DELAY).await;
-            }
-            Err(e) => {
-                error!(
-                    "Failed to rename corrupt database file: {} to {}",
-                    db_path.display(),
-                    renamed.display()
-                );
-                return Err(e);
-            }
-        }
-    }
-
-    // Reached only when every attempt was blocked by a file lock.
-    error!(
-        "Failed to rename corrupt database file after {} attempts: {} to {}",
-        ARCHIVE_MAX_RETRY_ATTEMPTS,
-        db_path.display(),
-        renamed.display()
-    );
-    Err(io::Error::other(
-        "corrupt database archive blocked by persistent file lock",
-    ))
-}
-
-/// Returns `true` when the IO error indicates a temporary file lock held by another handle
-/// within the same process.  Only meaningful on Windows; always `false` elsewhere.
-fn is_file_locked_error(e: &io::Error) -> bool {
-    #[cfg(windows)]
-    {
-        // ERROR_SHARING_VIOLATION = 32, ERROR_LOCK_VIOLATION = 33
-        matches!(e.raw_os_error(), Some(32) | Some(33))
-    }
-    #[cfg(not(windows))]
-    {
-        let _ = e;
-        false
-    }
+    tokio::fs::rename(db_path, &renamed).await.inspect_err(|_| {
+        error!(
+            "Failed to rename corrupt database file: {} to {}",
+            db_path.display(),
+            renamed.display()
+        );
+    })
 }

 pub async fn setup_fs_reply_surb_backend<P: AsRef<Path>>(
@@ -240,7 +240,7 @@ mod nonwasm_sealed {
    impl GatewaySender for LocalGateway {
        async fn send_mix_packet(&mut self, packet: MixPacket) -> Result<(), ErasedGatewayError> {
            self.packet_forwarder
-                .forward_client_packet_without_delay(packet)
+                .forward_packet(packet)
                .map_err(erase_err)
        }
    }
@@ -337,8 +337,6 @@ impl ReplyStorageBackend for Backend {
    }

    async fn stop_storage_session(self) -> Result<(), Self::StorageError> {
-        let result = self.stop_client_use().await;
-        self.shutdown().await;
-        result
+        self.stop_client_use().await
    }
 }
@@ -48,7 +48,6 @@ where
        debug!("Started PersistentReplyStorage");
        if let Err(err) = self.backend.start_storage_session().await {
            error!("failed to start the storage session - {err}");
-            self.backend.stop_storage_session().await.ok();
            return;
        }

@@ -56,11 +55,10 @@ where

        info!("PersistentReplyStorage is flushing all reply-related data to underlying storage");
        if let Err(err) = self.backend.flush_surb_storage(&mem_state).await {
-            error!("failed to flush our reply-related data to the persistent storage: {err}");
-            self.backend.stop_storage_session().await.ok();
-            return;
+            error!("failed to flush our reply-related data to the persistent storage: {err}")
+        } else {
+            info!("Data flush is complete")
        }
-        info!("Data flush is complete");

        if let Err(err) = self.backend.stop_storage_session().await {
            error!("failed to properly stop the storage session - {err}. We might not be able to smoothly restore it")
@@ -34,4 +34,3 @@ client = ["tokio-util", "nym-task", "tokio/net", "tokio/rt"]
 [dev-dependencies]
 nym-crypto = { workspace = true }
 rand = { workspace = true }
-tokio = { workspace = true, features = ["macros", "io-util", "rt", "rt-multi-thread"] }
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use dashmap::DashMap;
-use futures::{SinkExt, StreamExt};
+use futures::StreamExt;
 use nym_noise::config::NoiseConfig;
 use nym_noise::upgrade_noise_initiator;
 use nym_sphinx::forwarding::packet::MixPacket;
@@ -14,7 +14,6 @@ use std::ops::Deref;
 use std::sync::atomic::{AtomicU32, AtomicUsize, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
-use tokio::io::{AsyncRead, AsyncWrite};
 use tokio::net::TcpStream;
 use tokio::sync::mpsc;
 use tokio::sync::mpsc::error::TrySendError;
@@ -91,17 +90,13 @@ impl Deref for ActiveConnections {
 pub struct ConnectionSender {
    channel: mpsc::Sender<FramedNymPacket>,
    current_reconnection_attempt: Arc<AtomicU32>,
-    // Identifies the `ManagedConnection` task currently owning this entry; used
-    // to ensure drop-time eviction only fires on the still-owning task.
-    handle_token: Arc<()>,
 }

 impl ConnectionSender {
-    fn new(channel: mpsc::Sender<FramedNymPacket>, handle_token: Arc<()>) -> Self {
+    fn new(channel: mpsc::Sender<FramedNymPacket>) -> Self {
        ConnectionSender {
            channel,
            current_reconnection_attempt: Arc::new(AtomicU32::new(0)),
-            handle_token,
        }
    }
 }
@@ -112,31 +107,6 @@ struct ManagedConnection {
    message_receiver: ReceiverStream<FramedNymPacket>,
    connection_timeout: Duration,
    current_reconnection: Arc<AtomicU32>,
-    active_connections: ActiveConnections,
-    handle_token: Arc<()>,
-}
-
-// Evicts the cache entry on task exit (only if still owned by this task).
-// Without this, a stale `ConnectionSender` survives after the peer disconnects
-// and the next outbound packet is silently swallowed by the dead TCP.
-struct EvictOnDrop {
-    active_connections: ActiveConnections,
-    address: SocketAddr,
-    handle_token: Arc<()>,
-}
-
-impl Drop for EvictOnDrop {
-    fn drop(&mut self) {
-        let address = self.address;
-        let handle_token = &self.handle_token;
-        self.active_connections.remove_if(&address, |_, sender| {
-            Arc::ptr_eq(&sender.handle_token, handle_token)
-        });
-        trace!(
-            peer = %address,
-            "managed connection task exited; evicted owning cache entry"
-        );
-    }
 }

 impl ManagedConnection {
@@ -146,8 +116,6 @@ impl ManagedConnection {
        message_receiver: mpsc::Receiver<FramedNymPacket>,
        connection_timeout: Duration,
        current_reconnection: Arc<AtomicU32>,
-        active_connections: ActiveConnections,
-        handle_token: Arc<()>,
    ) -> Self {
        ManagedConnection {
            address,
@@ -155,30 +123,72 @@ impl ManagedConnection {
            message_receiver: ReceiverStream::new(message_receiver),
            connection_timeout,
            current_reconnection,
-            active_connections,
-            handle_token,
        }
    }

    async fn run(self) {
        let address = self.address;
-        let _evict_guard = EvictOnDrop {
-            active_connections: self.active_connections,
-            address,
-            handle_token: self.handle_token,
-        };
-
        let reconnection_attempt = self.current_reconnection.load(Ordering::Acquire);
        let connect_start = tokio::time::Instant::now();
        let connection_fut = TcpStream::connect(address);

-        // 1. attempt to establish the connection with timeout
-        let maybe_stream = match tokio::time::timeout(self.connection_timeout, connection_fut).await
-        {
-            Ok(stream) => stream,
+        let conn = match tokio::time::timeout(self.connection_timeout, connection_fut).await {
+            Ok(stream_res) => match stream_res {
+                Ok(stream) => {
+                    let connect_ms = connect_start.elapsed().as_millis() as u64;
+                    debug!(
+                        peer = %address,
+                        connect_ms,
+                        "Managed to establish connection to {}", self.address
+                    );
+
+                    let noise_start = tokio::time::Instant::now();
+                    let noise_stream =
+                        match upgrade_noise_initiator(stream, &self.noise_config).await {
+                            Ok(noise_stream) => noise_stream,
+                            Err(err) => {
+                                let noise_handshake_ms = noise_start.elapsed().as_millis() as u64;
+                                warn!(
+                                    event = "connection.failed.noise",
+                                    peer = %address,
+                                    error = %err,
+                                    connect_ms,
+                                    noise_handshake_ms,
+                                    reconnection_attempt,
+                                    exit_reason = "noise_error",
+                                    "Failed to perform Noise initiator handshake with {address}"
+                                );
+                                self.current_reconnection.fetch_add(1, Ordering::SeqCst);
+                                return;
+                            }
+                        };
+                    let noise_handshake_ms = noise_start.elapsed().as_millis() as u64;
+                    self.current_reconnection.store(0, Ordering::Release);
+                    debug!(
+                        peer = %address,
+                        connect_ms,
+                        noise_handshake_ms,
+                        "Noise initiator handshake completed for {:?}", address
+                    );
+                    Framed::new(noise_stream, NymCodec)
+                }
+                Err(err) => {
+                    let connect_ms = connect_start.elapsed().as_millis() as u64;
+                    warn!(
+                        event = "connection.failed.connect",
+                        peer = %address,
+                        error = %err,
+                        connect_ms,
+                        reconnection_attempt,
+                        exit_reason = "connect_error",
+                        "failed to establish connection to {address}"
+                    );
+                    return;
+                }
+            },
            Err(_) => {
                let connect_ms = connect_start.elapsed().as_millis() as u64;
-                debug!(
+                warn!(
                    event = "connection.failed.timeout",
                    peer = %address,
                    timeout_ms = self.connection_timeout.as_millis() as u64,
@@ -193,163 +203,21 @@ impl ManagedConnection {
            }
        };

-        // 2. check if it actually succeeded
-        let stream = match maybe_stream {
-            Ok(stream) => stream,
-            Err(err) => {
-                let connect_ms = connect_start.elapsed().as_millis() as u64;
-                debug!(
-                    event = "connection.failed.connect",
-                    peer = %address,
-                    error = %err,
-                    connect_ms,
-                    reconnection_attempt,
-                    exit_reason = "connect_error",
-                    "failed to establish connection to {address}"
-                );
-                return;
-            }
-        };
-
-        let connect_ms = connect_start.elapsed().as_millis() as u64;
-        debug!(
-            peer = %address,
-            connect_ms,
-            "Managed to establish connection to {}", self.address
-        );
-
-        // disable Nagle: mix packets are latency-sensitive and flushed one at a time.
-        if let Err(err) = stream.set_nodelay(true) {
-            warn!(peer = %address, error = %err, "failed to set TCP_NODELAY on outbound mixnet connection");
+        if let Err(err) = self.message_receiver.map(Ok).forward(conn).await {
+            warn!(
+                event = "connection.forward_error",
+                peer = %address,
+                error = %err,
+                exit_reason = "forward_error",
+                "Failed to forward packets to {address}: {err}"
+            );
        }

-        // 3. perform noise handshake (if applicable)
-        let noise_start = tokio::time::Instant::now();
-        let noise_stream = match upgrade_noise_initiator(stream, &self.noise_config).await {
-            Ok(noise_stream) => noise_stream,
-            Err(err) => {
-                let noise_handshake_ms = noise_start.elapsed().as_millis() as u64;
-                debug!(
-                    event = "connection.failed.noise",
-                    peer = %address,
-                    error = %err,
-                    connect_ms,
-                    noise_handshake_ms,
-                    reconnection_attempt,
-                    exit_reason = "noise_error",
-                    "Failed to perform Noise initiator handshake with {address}"
-                );
-                self.current_reconnection.fetch_add(1, Ordering::SeqCst);
-                return;
-            }
-        };
-        let noise_handshake_ms = noise_start.elapsed().as_millis() as u64;
-        self.current_reconnection.store(0, Ordering::Release);
        debug!(
            peer = %address,
-            connect_ms,
-            noise_handshake_ms,
-            "Noise initiator handshake completed for {:?}", address
+            exit_reason = "sender_dropped",
+            "connection manager to {address} finished"
        );
-        let mut conn = Framed::new(noise_stream, NymCodec);
-        // let the write buffer accumulate several packets before flushing (see run_io_loop)
-        conn.set_backpressure_boundary(OUTBOUND_WRITE_BUFFER);
-
-        // 4. start handling the framed stream
-        run_io_loop(conn, self.message_receiver, address).await;
-    }
-}
-
-/// Upper bound on how many already-queued packets we drain into a single flush.
-/// Bounds the per-batch allocation and how often we re-check the read side; the actual
-/// write coalescing is governed by the Framed backpressure boundary below.
-const OUTBOUND_FLUSH_BATCH: usize = 1024;
-
-/// Write-buffer high-water mark for the egress `Framed`: packets are coalesced up to
-/// roughly this many bytes before a flush, trading a larger write burst for far fewer
-/// syscalls (and noise frames) under load. Kept under the ~64KiB noise frame ceiling so
-/// a flush is usually a single frame.
-const OUTBOUND_WRITE_BUFFER: usize = 32 * 1024;
-
-// The connection is unidirectional (send-only); we read from it solely to
-// notice peer FIN/RST while idle so we can evict the cache entry before the
-// next outbound send finds it stale.
-async fn run_io_loop<T>(
-    conn: Framed<T, NymCodec>,
-    receiver: ReceiverStream<FramedNymPacket>,
-    address: SocketAddr,
-) where
-    T: AsyncRead + AsyncWrite + Unpin,
-{
-    let (mut sink, mut stream) = conn.split();
-
-    // drain all currently-queued packets into one flush rather than flushing per packet,
-    // which otherwise caps egress throughput and backs up the per-connection queue under load
-    let mut receiver = receiver.ready_chunks(OUTBOUND_FLUSH_BATCH);
-
-    loop {
-        tokio::select! {
-            msg = stream.next() => {
-                match msg {
-                    None => {
-                        debug!(
-                            peer = %address,
-                            exit_reason = "peer_closed",
-                            "peer closed mixnet connection to {address}"
-                        );
-                        break;
-                    }
-                    Some(Err(err)) => {
-                        debug!(
-                            event = "connection.read_error",
-                            peer = %address,
-                            error = %err,
-                            exit_reason = "read_error",
-                            "read error on mixnet connection to {address}: {err}"
-                        );
-                        break;
-                    }
-                    Some(Ok(_)) => {
-                        trace!(
-                            peer = %address,
-                            "unexpected inbound packet on mixnet connection to {address}; discarding"
-                        );
-                    }
-                }
-            }
-            outgoing = receiver.next() => {
-                match outgoing {
-                    None => {
-                        debug!(
-                            peer = %address,
-                            exit_reason = "sender_dropped",
-                            "connection manager to {address} finished"
-                        );
-                        break;
-                    }
-                    Some(batch) => {
-                        // feed the whole ready batch, then flush once
-                        let res = async {
-                            for packet in batch {
-                                sink.feed(packet).await?;
-                            }
-                            sink.flush().await
-                        }
-                        .await;
-                        if let Err(err) = res {
-                            debug!(
-                                event = "connection.forward_error",
-                                peer = %address,
-                                error = %err,
-                                exit_reason = "forward_error",
-                                "failed to forward packet batch to {address}: {err}"
-                            );
-                            break;
-                        }
-                    }
-                }
-            }
-        }
    }
 }

@@ -396,18 +264,13 @@ impl Client {
            sender.try_send(pending_packet).unwrap();
        }

-        // Ownership token for the task we're about to spawn; lets it tell
-        // on exit whether the cache entry still names it.
-        let handle_token = Arc::new(());
-
        // if we already tried to connect to `address` before, grab the current attempt count
        let current_reconnection_attempt =
            if let Some(mut existing) = self.active_connections.get_mut(&address) {
                existing.channel = sender;
-                existing.handle_token = Arc::clone(&handle_token);
                Arc::clone(&existing.current_reconnection_attempt)
            } else {
-                let new_entry = ConnectionSender::new(sender, Arc::clone(&handle_token));
+                let new_entry = ConnectionSender::new(sender);
                let current_attempt = Arc::clone(&new_entry.current_reconnection_attempt);
                self.active_connections.insert(address, new_entry);
                current_attempt
@@ -422,7 +285,6 @@ impl Client {

        let connections_count = self.connections_count.clone();
        let noise_config = self.noise_config.clone();
-        let active_connections = self.active_connections.clone();
        tokio::spawn(async move {
            // before executing the manager, wait for what was specified, if anything
            if let Some(backoff) = backoff {
@@ -437,8 +299,6 @@ impl Client {
                receiver,
                initial_connection_timeout,
                current_reconnection_attempt,
-                active_connections,
-                handle_token,
            )
            .run()
            .await;
@@ -568,102 +428,4 @@ mod tests {
            client.config.maximum_reconnection_backoff
        );
    }
-
-    fn test_addr() -> SocketAddr {
-        "127.0.0.1:1".parse().unwrap()
-    }
-
-    fn insert_with_token(
-        active: &ActiveConnections,
-        addr: SocketAddr,
-        token: Arc<()>,
-    ) -> mpsc::Receiver<FramedNymPacket> {
-        let (tx, rx) = mpsc::channel(1);
-        active.insert(addr, ConnectionSender::new(tx, token));
-        rx
-    }
-
-    #[test]
-    fn evict_on_drop_removes_entry_when_token_still_matches() {
-        let active = ActiveConnections::default();
-        let addr = test_addr();
-        let token = Arc::new(());
-        let _rx = insert_with_token(&active, addr, Arc::clone(&token));
-
-        assert!(active.get(&addr).is_some());
-
-        {
-            let _guard = EvictOnDrop {
-                active_connections: active.clone(),
-                address: addr,
-                handle_token: token,
-            };
-        }
-
-        assert!(
-            active.get(&addr).is_none(),
-            "owning task's drop should evict the entry"
-        );
-    }
-
-    #[test]
-    fn evict_on_drop_preserves_entry_replaced_by_newer_make_connection() {
-        // Simulates the race: old task's run() has returned, but before its
-        // drop guard fires, a concurrent `make_connection` replaced the
-        // entry's channel + handle_token with a fresh task's token.
-        let active = ActiveConnections::default();
-        let addr = test_addr();
-        let old_token = Arc::new(());
-        let new_token = Arc::new(());
-        let _rx_new = insert_with_token(&active, addr, Arc::clone(&new_token));
-
-        {
-            let _guard = EvictOnDrop {
-                active_connections: active.clone(),
-                address: addr,
-                handle_token: old_token,
-            };
-        }
-
-        assert!(
-            active.get(&addr).is_some(),
-            "old task's drop must not clobber the newer entry"
-        );
-    }
-
-    #[tokio::test]
-    async fn io_loop_exits_when_peer_closes_idle_connection() {
-        // The fix's second half: while no packets are flowing, peer FIN/RST
-        // must still be observed so the cache entry can be evicted before the
-        // next send finds it stale.
-        let (a, b) = tokio::io::duplex(64);
-        let conn = Framed::new(a, NymCodec);
-        let (_tx, rx) = mpsc::channel(1);
-
-        let task = tokio::spawn(run_io_loop(conn, ReceiverStream::new(rx), test_addr()));
-
-        // Simulate peer closing both directions of the connection.
-        drop(b);
-
-        tokio::time::timeout(Duration::from_secs(1), task)
-            .await
-            .expect("io_loop must notice peer close while idle")
-            .expect("io_loop task must not panic");
-    }
-
-    #[tokio::test]
-    async fn io_loop_exits_when_sender_dropped() {
-        let (a, _b) = tokio::io::duplex(64);
-        let conn = Framed::new(a, NymCodec);
-        let (tx, rx) = mpsc::channel(1);
-
-        let task = tokio::spawn(run_io_loop(conn, ReceiverStream::new(rx), test_addr()));
-
-        drop(tx);
-
-        tokio::time::timeout(Duration::from_secs(1), task)
-            .await
-            .expect("io_loop must exit when the upstream sender is dropped")
-            .expect("io_loop task must not panic");
-    }
 }
@@ -21,16 +21,12 @@ impl From<mpsc::UnboundedSender<PacketToForward>> for MixForwardingSender {
 }

 impl MixForwardingSender {
-    pub fn forward_packet(&self, packet: PacketToForward) -> Result<(), SendError> {
+    pub fn forward_packet(&self, packet: impl Into<PacketToForward>) -> Result<(), SendError> {
        self.0
-            .unbounded_send(packet)
+            .unbounded_send(packet.into())
            .map_err(|err| err.into_send_error())
    }

-    pub fn forward_client_packet_without_delay(&self, packet: MixPacket) -> Result<(), SendError> {
-        self.forward_packet(PacketToForward::client_packet_without_delay(packet))
-    }
-
    #[allow(clippy::len_without_is_empty)]
    pub fn len(&self) -> usize {
        self.0.len()
@@ -42,23 +38,35 @@ pub type MixForwardingReceiver = mpsc::UnboundedReceiver<PacketToForward>;
 pub struct PacketToForward {
    pub packet: MixPacket,
    pub forward_delay_target: Option<Instant>,
-    pub network_monitor_packet: bool,
+}
+
+impl From<MixPacket> for PacketToForward {
+    fn from(packet: MixPacket) -> Self {
+        PacketToForward::new_no_delay(packet)
+    }
+}
+
+impl From<(MixPacket, Option<Instant>)> for PacketToForward {
+    fn from((packet, delay_until): (MixPacket, Option<Instant>)) -> Self {
+        PacketToForward::new(packet, delay_until)
+    }
+}
+
+impl From<(MixPacket, Instant)> for PacketToForward {
+    fn from((packet, delay_until): (MixPacket, Instant)) -> Self {
+        PacketToForward::new(packet, Some(delay_until))
+    }
 }

 impl PacketToForward {
-    pub fn new(
-        packet: MixPacket,
-        forward_delay_target: Option<Instant>,
-        network_monitor_packet: bool,
-    ) -> Self {
+    pub fn new(packet: MixPacket, forward_delay_target: Option<Instant>) -> Self {
        PacketToForward {
            packet,
            forward_delay_target,
-            network_monitor_packet,
        }
    }

-    pub fn client_packet_without_delay(packet: MixPacket) -> Self {
-        Self::new(packet, None, false)
+    pub fn new_no_delay(packet: MixPacket) -> Self {
+        Self::new(packet, None)
    }
 }
@@ -26,7 +26,6 @@ nym-ecash-contract-common = { workspace = true }
 nym-multisig-contract-common = { workspace = true }
 nym-group-contract-common = { workspace = true }
 nym-performance-contract-common = { workspace = true }
-nym-network-monitors-contract-common = { workspace = true }
 nym-node-families-contract-common = { workspace = true }
 nym-serde-helpers = { workspace = true, features = ["hex", "base64"] }
 serde = { workspace = true, features = ["derive"] }
@@ -104,14 +104,6 @@ impl TryFrom<NymNetworkDetails> for Config {
 }

 impl Config {
-    pub fn new(nyxd_url: Url, api_url: Url, nyxd_config: nyxd::Config) -> Self {
-        Config {
-            api_url,
-            nyxd_url,
-            nyxd_config,
-        }
-    }
-
    pub fn try_from_nym_network_details(
        details: &NymNetworkDetails,
    ) -> Result<Self, ValidatorClientError> {
@@ -122,15 +114,6 @@ impl Config {
            .map(|url| Url::parse(url))
            .collect::<Result<Vec<_>, _>>()?;

-        if let Some(nym_api_urls) = details.nym_api_urls.as_ref() {
-            api_url.extend(
-                nym_api_urls
-                    .iter()
-                    .map(|url| url.url.parse())
-                    .collect::<Result<Vec<_>, _>>()?,
-            );
-        }
-
        if api_url.is_empty() {
            return Err(ValidatorClientError::NoAPIUrlAvailable);
        }
@@ -15,16 +15,12 @@ use nym_api_requests::ecash::models::{
    VerifyEcashTicketBody,
 };
 use nym_api_requests::ecash::VerificationKeyResponse;
-use nym_api_requests::models::network_monitor::{
-    KnownNetworkMonitorResponse, StressTestBatchSubmission,
-};
 use nym_api_requests::models::node_families::NodeFamily;
 use nym_api_requests::models::{
-    AnnotationResponseV1, ApiHealthResponse, BinaryBuildInformationOwned,
-    ChainBlocksStatusResponse, ChainStatusResponse, KeyRotationInfoResponse,
-    NodePerformanceResponse, NodeRefreshBody, NymNodeDescriptionV1, NymNodeDescriptionV2,
-    PerformanceHistoryResponse, RewardedSetResponse, SignerInformationResponse,
-    StressTestBatchSubmissionResponse,
+    AnnotationResponse, ApiHealthResponse, BinaryBuildInformationOwned, ChainBlocksStatusResponse,
+    ChainStatusResponse, KeyRotationInfoResponse, NodePerformanceResponse, NodeRefreshBody,
+    NymNodeDescriptionV1, NymNodeDescriptionV2, PerformanceHistoryResponse, RewardedSetResponse,
+    SignerInformationResponse,
 };
 use nym_api_requests::pagination::PaginatedResponse;
 use nym_http_api_client::{ApiClient, NO_PARAMS};
@@ -1020,7 +1016,7 @@ pub trait NymApiClientExt: ApiClient {
    async fn get_node_annotation(
        &self,
        node_id: NodeId,
-    ) -> Result<AnnotationResponseV1, NymAPIError> {
+    ) -> Result<AnnotationResponse, NymAPIError> {
        self.get_json(
            &[
                routes::V1_API_VERSION,
@@ -1403,53 +1399,6 @@ pub trait NymApiClientExt: ApiClient {

        Ok(SemiSkimmedNodesWithMetadata::new(nodes, metadata))
    }
-
-    /// Queries the nym-api for whether a particular ed25519 identity key is currently recognised
-    /// as an authorised network monitor permitted to submit stress testing results.
-    ///
-    /// `identity_key` is expected to be the base58-encoded form of the ed25519 public key.
-    #[instrument(level = "debug", skip(self))]
-    async fn get_known_network_monitor(
-        &self,
-        identity_key: IdentityKeyRef<'_>,
-    ) -> Result<KnownNetworkMonitorResponse, NymAPIError> {
-        self.get_json(
-            &[
-                routes::V3_API_VERSION,
-                routes::NYM_NODES_ROUTES,
-                routes::STRESS_TESTING,
-                routes::STRESS_TESTING_KNOWN_MONITORS,
-                identity_key,
-            ],
-            NO_PARAMS,
-        )
-        .await
-    }
-
-    /// Submit a signed batch of stress-testing results to nym-api on behalf of a network monitor
-    /// orchestrator.
-    ///
-    /// The caller is expected to have produced `request` via
-    /// `StressTestBatchSubmissionContent::new(...)` and signed it with the orchestrator's ed25519
-    /// key; nym-api will reject submissions that are stale, replayed, unauthorised, or whose
-    /// signature fails to verify.
-    #[instrument(level = "debug", skip(self, request))]
-    async fn submit_stress_testing_results(
-        &self,
-        request: &StressTestBatchSubmission,
-    ) -> Result<StressTestBatchSubmissionResponse, NymAPIError> {
-        self.post_json(
-            &[
-                routes::V3_API_VERSION,
-                routes::NYM_NODES_ROUTES,
-                routes::STRESS_TESTING,
-                routes::STRESS_TESTING_BATCH_SUBMIT,
-            ],
-            NO_PARAMS,
-            request,
-        )
-        .await
-    }
 }

 // Client is already nym_http_api_client::Client (re-exported above), so just one impl needed
@@ -50,9 +50,6 @@ pub mod nym_nodes {
    pub const NYM_NODES_REWARDED_SET: &str = "rewarded-set";
    pub const NYM_NODES_REFRESH_DESCRIBED: &str = "refresh-described";
    pub const BY_ADDRESSES: &str = "by-addresses";
-    pub const STRESS_TESTING: &str = "stress-testing";
-    pub const STRESS_TESTING_KNOWN_MONITORS: &str = "known-monitors";
-    pub const STRESS_TESTING_BATCH_SUBMIT: &str = "batch-submit";
 }

 pub const STATUS_ROUTES: &str = "status";
@@ -13,7 +13,6 @@ pub mod ecash_query_client;
 pub mod group_query_client;
 pub mod mixnet_query_client;
 pub mod multisig_query_client;
-pub mod network_monitors_query_client;
 pub mod node_families_query_client;
 pub mod performance_query_client;
 pub mod vesting_query_client;
@@ -24,7 +23,6 @@ pub mod ecash_signing_client;
 pub mod group_signing_client;
 pub mod mixnet_signing_client;
 pub mod multisig_signing_client;
-pub mod network_monitors_signing_client;
 pub mod node_families_signing_client;
 pub mod performance_signing_client;
 pub mod vesting_signing_client;
@@ -35,9 +33,6 @@ pub use ecash_query_client::{EcashQueryClient, PagedEcashQueryClient};
 pub use group_query_client::{GroupQueryClient, PagedGroupQueryClient};
 pub use mixnet_query_client::{MixnetQueryClient, PagedMixnetQueryClient};
 pub use multisig_query_client::{MultisigQueryClient, PagedMultisigQueryClient};
-pub use network_monitors_query_client::{
-    NetworkMonitorsQueryClient, PagedNetworkMonitorsQueryClient,
-};
 pub use node_families_query_client::{NodeFamiliesQueryClient, PagedNodeFamiliesQueryClient};
 pub use performance_query_client::{PagedPerformanceQueryClient, PerformanceQueryClient};
 pub use vesting_query_client::{PagedVestingQueryClient, VestingQueryClient};
@@ -48,7 +43,6 @@ pub use ecash_signing_client::EcashSigningClient;
 pub use group_signing_client::GroupSigningClient;
 pub use mixnet_signing_client::MixnetSigningClient;
 pub use multisig_signing_client::MultisigSigningClient;
-pub use network_monitors_signing_client::NetworkMonitorsSigningClient;
 pub use node_families_signing_client::NodeFamiliesSigningClient;
 pub use performance_signing_client::PerformanceSigningClient;
 pub use vesting_signing_client::VestingSigningClient;
@@ -59,7 +53,6 @@ pub trait NymContractsProvider {
    fn mixnet_contract_address(&self) -> Option<&AccountId>;
    fn vesting_contract_address(&self) -> Option<&AccountId>;
    fn performance_contract_address(&self) -> Option<&AccountId>;
-    fn network_monitors_contract_address(&self) -> Option<&AccountId>;
    fn node_families_contract_address(&self) -> Option<&AccountId>;

    // coconut-related
@@ -74,7 +67,6 @@ pub struct TypedNymContracts {
    pub mixnet_contract_address: Option<AccountId>,
    pub vesting_contract_address: Option<AccountId>,
    pub performance_contract_address: Option<AccountId>,
-    pub network_monitors_contract_address: Option<AccountId>,
    pub node_families_contract_address: Option<AccountId>,

    pub ecash_contract_address: Option<AccountId>,
@@ -100,10 +92,6 @@ impl TryFrom<NymContracts> for TypedNymContracts {
                .performance_contract_address
                .map(|addr| addr.parse())
                .transpose()?,
-            network_monitors_contract_address: value
-                .network_monitors_contract_address
-                .map(|addr| addr.parse())
-                .transpose()?,
            node_families_contract_address: value
                .node_families_contract_address
                .map(|addr| addr.parse())
@@ -1,107 +0,0 @@
-// Copyright 2026 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::collect_paged;
-use crate::nyxd::contract_traits::NymContractsProvider;
-use crate::nyxd::error::NyxdError;
-use crate::nyxd::CosmWasmClient;
-use async_trait::async_trait;
-use nym_network_monitors_contract_common::{
-    AuthorisedNetworkMonitor, AuthorisedNetworkMonitorOrchestratorsResponse,
-    AuthorisedNetworkMonitorsPagedResponse, QueryMsg as NetworkMonitorsQueryMsg,
-};
-use serde::Deserialize;
-use std::net::SocketAddr;
-
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-pub trait NetworkMonitorsQueryClient {
-    async fn query_network_monitors_contract<T>(
-        &self,
-        query: NetworkMonitorsQueryMsg,
-    ) -> Result<T, NyxdError>
-    where
-        for<'a> T: Deserialize<'a>;
-
-    async fn get_admin(&self) -> Result<cw_controllers::AdminResponse, NyxdError> {
-        self.query_network_monitors_contract(NetworkMonitorsQueryMsg::Admin {})
-            .await
-    }
-
-    async fn get_network_monitor_orchestrators(
-        &self,
-    ) -> Result<AuthorisedNetworkMonitorOrchestratorsResponse, NyxdError> {
-        self.query_network_monitors_contract(
-            NetworkMonitorsQueryMsg::NetworkMonitorOrchestrators {},
-        )
-        .await
-    }
-
-    async fn get_network_monitor_agents_paged(
-        &self,
-        start_next_after: Option<SocketAddr>,
-        limit: Option<u32>,
-    ) -> Result<AuthorisedNetworkMonitorsPagedResponse, NyxdError> {
-        self.query_network_monitors_contract(NetworkMonitorsQueryMsg::NetworkMonitorAgents {
-            start_next_after,
-            limit,
-        })
-        .await
-    }
-}
-
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-pub trait PagedNetworkMonitorsQueryClient: NetworkMonitorsQueryClient {
-    async fn get_all_network_monitor_agents(
-        &self,
-    ) -> Result<Vec<AuthorisedNetworkMonitor>, NyxdError> {
-        collect_paged!(self, get_network_monitor_agents_paged, authorised)
-    }
-}
-
-#[async_trait]
-impl<T> PagedNetworkMonitorsQueryClient for T where T: NetworkMonitorsQueryClient {}
-
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-impl<C> NetworkMonitorsQueryClient for C
-where
-    C: CosmWasmClient + NymContractsProvider + Send + Sync,
-{
-    async fn query_network_monitors_contract<T>(
-        &self,
-        query: NetworkMonitorsQueryMsg,
-    ) -> Result<T, NyxdError>
-    where
-        for<'a> T: Deserialize<'a>,
-    {
-        let contract_address = &self
-            .network_monitors_contract_address()
-            .ok_or_else(|| NyxdError::unavailable_contract_address("network monitors contract"))?;
-        self.query_contract_smart(contract_address, &query).await
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::nyxd::contract_traits::tests::IgnoreValue;
-
-    // it's enough that this compiles and clippy is happy about it
-    #[allow(dead_code)]
-    fn all_query_variants_are_covered<C: NetworkMonitorsQueryClient + Send + Sync>(
-        client: C,
-        msg: NetworkMonitorsQueryMsg,
-    ) {
-        match msg {
-            NetworkMonitorsQueryMsg::Admin {} => client.get_admin().ignore(),
-            NetworkMonitorsQueryMsg::NetworkMonitorOrchestrators {} => {
-                client.get_network_monitor_orchestrators().ignore()
-            }
-            NetworkMonitorsQueryMsg::NetworkMonitorAgents { .. } => {
-                client.get_network_monitor_agents_paged(None, None).ignore()
-            }
-        };
-    }
-}
@@ -1,205 +0,0 @@
-// Copyright 2026 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::nyxd::contract_traits::NymContractsProvider;
-use crate::nyxd::cosmwasm_client::types::ExecuteResult;
-use crate::nyxd::error::NyxdError;
-use crate::nyxd::{Coin, Fee, SigningCosmWasmClient};
-use crate::signing::signer::OfflineSigner;
-use async_trait::async_trait;
-use nym_network_monitors_contract_common::ExecuteMsg as NetworkMonitorsExecuteMsg;
-use std::net::SocketAddr;
-
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-pub trait NetworkMonitorsSigningClient {
-    async fn execute_network_monitors_contract(
-        &self,
-        fee: Option<Fee>,
-        msg: NetworkMonitorsExecuteMsg,
-        memo: String,
-        funds: Vec<Coin>,
-    ) -> Result<ExecuteResult, NyxdError>;
-
-    async fn update_admin(
-        &self,
-        admin: String,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        let msg = NetworkMonitorsExecuteMsg::UpdateAdmin { admin };
-        self.execute_network_monitors_contract(
-            fee,
-            msg,
-            "NetworkMonitorsExecuteMsg::UpdateAdmin".into(),
-            vec![],
-        )
-        .await
-    }
-
-    async fn authorise_network_monitor_orchestrator(
-        &self,
-        address: String,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        let msg = NetworkMonitorsExecuteMsg::AuthoriseNetworkMonitorOrchestrator { address };
-        self.execute_network_monitors_contract(
-            fee,
-            msg,
-            "NetworkMonitorsExecuteMsg::AuthoriseNetworkMonitorOrchestrator".into(),
-            vec![],
-        )
-        .await
-    }
-
-    /// Announce (or rotate) the ed25519 identity key of the calling network monitor orchestrator.
-    ///
-    /// The caller must already be an authorised orchestrator; the contract validates that
-    /// `identity_key` is a well-formed base-58 encoding of a 32-byte ed25519 public key.
-    async fn update_orchestrator_identity_key(
-        &self,
-        identity_key: String,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        let msg = NetworkMonitorsExecuteMsg::UpdateOrchestratorIdentityKey { key: identity_key };
-        self.execute_network_monitors_contract(
-            fee,
-            msg,
-            "NetworkMonitorsExecuteMsg::UpdateOrchestratorIdentityKey".into(),
-            vec![],
-        )
-        .await
-    }
-
-    async fn revoke_network_monitor_orchestrator(
-        &self,
-        address: String,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        let msg = NetworkMonitorsExecuteMsg::RevokeNetworkMonitorOrchestrator { address };
-        self.execute_network_monitors_contract(
-            fee,
-            msg,
-            "NetworkMonitorsExecuteMsg::RevokeNetworkMonitorOrchestrator".into(),
-            vec![],
-        )
-        .await
-    }
-
-    async fn authorise_network_monitor(
-        &self,
-        mixnet_address: SocketAddr,
-        bs58_x25519_noise: String,
-        noise_version: u8,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        let msg = NetworkMonitorsExecuteMsg::AuthoriseNetworkMonitor {
-            mixnet_address,
-            bs58_x25519_noise,
-            noise_version,
-        };
-        self.execute_network_monitors_contract(
-            fee,
-            msg,
-            "NetworkMonitorsExecuteMsg::AuthoriseNetworkMonitor".into(),
-            vec![],
-        )
-        .await
-    }
-
-    async fn revoke_network_monitor(
-        &self,
-        address: SocketAddr,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        let msg = NetworkMonitorsExecuteMsg::RevokeNetworkMonitor { address };
-        self.execute_network_monitors_contract(
-            fee,
-            msg,
-            "NetworkMonitorsExecuteMsg::RevokeNetworkMonitor".into(),
-            vec![],
-        )
-        .await
-    }
-
-    async fn revoke_all_network_monitors(
-        &self,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        let msg = NetworkMonitorsExecuteMsg::RevokeAllNetworkMonitors;
-        self.execute_network_monitors_contract(
-            fee,
-            msg,
-            "NetworkMonitorsExecuteMsg::RevokeAllNetworkMonitors".into(),
-            vec![],
-        )
-        .await
-    }
-}
-
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-impl<C> NetworkMonitorsSigningClient for C
-where
-    C: SigningCosmWasmClient + NymContractsProvider + Sync,
-    NyxdError: From<<Self as OfflineSigner>::Error>,
-{
-    async fn execute_network_monitors_contract(
-        &self,
-        fee: Option<Fee>,
-        msg: NetworkMonitorsExecuteMsg,
-        memo: String,
-        funds: Vec<Coin>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        let contract_address = &self
-            .network_monitors_contract_address()
-            .ok_or_else(|| NyxdError::unavailable_contract_address("network monitors contract"))?;
-
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier())));
-
-        let signer_address = &self.signer_addresses()[0];
-        self.execute(signer_address, contract_address, &msg, fee, memo, funds)
-            .await
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::nyxd::contract_traits::tests::IgnoreValue;
-    use nym_network_monitors_contract_common::ExecuteMsg;
-
-    // it's enough that this compiles and clippy is happy about it
-    #[allow(dead_code)]
-    fn all_execute_variants_are_covered<C: NetworkMonitorsSigningClient + Send + Sync>(
-        client: C,
-        msg: NetworkMonitorsExecuteMsg,
-    ) {
-        match msg {
-            NetworkMonitorsExecuteMsg::UpdateAdmin { admin } => {
-                client.update_admin(admin, None).ignore()
-            }
-            ExecuteMsg::AuthoriseNetworkMonitorOrchestrator { address } => client
-                .authorise_network_monitor_orchestrator(address, None)
-                .ignore(),
-            ExecuteMsg::UpdateOrchestratorIdentityKey { key } => {
-                client.update_orchestrator_identity_key(key, None).ignore()
-            }
-            ExecuteMsg::RevokeNetworkMonitorOrchestrator { address } => client
-                .revoke_network_monitor_orchestrator(address, None)
-                .ignore(),
-            ExecuteMsg::AuthoriseNetworkMonitor {
-                mixnet_address: address,
-                bs58_x25519_noise,
-                noise_version,
-            } => client
-                .authorise_network_monitor(address, bs58_x25519_noise, noise_version, None)
-                .ignore(),
-            ExecuteMsg::RevokeNetworkMonitor { address } => {
-                client.revoke_network_monitor(address, None).ignore()
-            }
-            ExecuteMsg::RevokeAllNetworkMonitors => {
-                client.revoke_all_network_monitors(None).ignore()
-            }
-        };
-    }
-}
@@ -54,27 +54,6 @@ pub trait NodeFamiliesSigningClient {
        .await
    }

-    /// Update the name and/or description of the caller's family. Each
-    /// argument follows `None = keep` / `Some(_) = replace` semantics; a
-    /// call with both `None` is a server-side no-op.
-    async fn update_family(
-        &self,
-        updated_name: Option<String>,
-        updated_description: Option<String>,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        self.execute_node_families_contract(
-            fee,
-            NodeFamiliesExecuteMsg::UpdateFamily {
-                updated_name,
-                updated_description,
-            },
-            "NodeFamiliesContract::UpdateFamily".to_string(),
-            vec![],
-        )
-        .await
-    }
-
    async fn disband_family(&self, fee: Option<Fee>) -> Result<ExecuteResult, NyxdError> {
        self.execute_node_families_contract(
            fee,
@@ -245,12 +224,6 @@ mod tests {
            NodeFamiliesExecuteMsg::CreateFamily { name, description } => client
                .create_family(name, description, None, vec![])
                .ignore(),
-            NodeFamiliesExecuteMsg::UpdateFamily {
-                updated_name,
-                updated_description,
-            } => client
-                .update_family(updated_name, updated_description, None)
-                .ignore(),
            NodeFamiliesExecuteMsg::DisbandFamily {} => client.disband_family(None).ignore(),
            NodeFamiliesExecuteMsg::InviteToFamily {
                node_id,
@@ -36,7 +36,7 @@ pub mod logs;
 pub mod module_traits;
 pub mod types;

-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub(crate) struct SigningClientOptions {
    gas_price: GasPrice,
    simulated_gas_multiplier: f32,
@@ -80,17 +80,6 @@ impl<C, S> MaybeSigningClient<C, S> {
            opts,
        }
    }
-
-    pub(crate) fn clone_query_client(&self) -> MaybeSigningClient<C, NoSigner>
-    where
-        C: Clone,
-    {
-        MaybeSigningClient {
-            client: self.client.clone(),
-            signer: Default::default(),
-            opts: self.opts.clone(),
-        }
-    }
 }

 #[cfg(feature = "http-client")]
@@ -24,8 +24,6 @@ use async_trait::async_trait;
 use cosmrs::tendermint::{abci, evidence::Evidence, Genesis};
 use cosmrs::tx::{Raw, SignDoc};
 use cosmwasm_std::Addr;
-use nym_contracts_common::build_information::CONTRACT_BUILD_INFO_STORAGE_KEY;
-use nym_contracts_common::ContractBuildInformation;
 use nym_network_defaults::{ChainDetails, NymNetworkDetails};
 use serde::{de::DeserializeOwned, Serialize};
 use std::fmt::Debug;
@@ -42,7 +40,6 @@ pub use crate::nyxd::{
    fee::Fee,
 };
 pub use crate::rpc::TendermintRpcClient;
-pub use bip39;
 pub use coin::Coin;
 pub use cosmrs::{
    bank::MsgSend,
@@ -73,19 +70,14 @@ pub use tendermint_rpc::{
    Paging, Request, Response, SimpleRequest,
 };

-pub use nym_ecash_contract_common;
-pub use nym_mixnet_contract_common;
-pub use nym_multisig_contract_common;
-pub use nym_network_monitors_contract_common;
-pub use nym_performance_contract_common;
-pub use nym_vesting_contract_common;
-
 #[cfg(feature = "http-client")]
 use crate::http_client;
 #[cfg(feature = "http-client")]
 use crate::{DirectSigningHttpRpcNyxdClient, QueryHttpRpcNyxdClient};
 #[cfg(feature = "http-client")]
 use cosmrs::rpc::{HttpClient, HttpClientUrl};
+use nym_contracts_common::build_information::CONTRACT_BUILD_INFO_STORAGE_KEY;
+use nym_contracts_common::ContractBuildInformation;

 pub mod coin;
 pub mod contract_traits;
@@ -270,16 +262,6 @@ impl<C, S> NyxdClient<C, S> {
        }
    }

-    pub fn clone_query_client(&self) -> NyxdClient<C>
-    where
-        C: Clone,
-    {
-        NyxdClient {
-            client: self.client.clone_query_client(),
-            config: self.config.clone(),
-        }
-    }
-
    pub fn current_config(&self) -> &Config {
        &self.config
    }
@@ -311,10 +293,6 @@ impl<C, S> NyxdClient<C, S> {
    pub fn set_simulated_gas_multiplier(&mut self, multiplier: f32) {
        self.config.simulated_gas_multiplier = multiplier;
    }
-
-    pub fn get_nym_contracts(&self) -> TypedNymContracts {
-        self.config.contracts.clone()
-    }
 }

 impl<C, S> NymContractsProvider for NyxdClient<C, S> {
@@ -329,12 +307,6 @@ impl<C, S> NymContractsProvider for NyxdClient<C, S> {
    fn performance_contract_address(&self) -> Option<&AccountId> {
        self.config.contracts.performance_contract_address.as_ref()
    }
-    fn network_monitors_contract_address(&self) -> Option<&AccountId> {
-        self.config
-            .contracts
-            .network_monitors_contract_address
-            .as_ref()
-    }

    fn node_families_contract_address(&self) -> Option<&AccountId> {
        self.config
@@ -1,14 +1,8 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-//! Blacklist types. **The blacklist surface is stubbed today** - the execute
-//! handlers always return `UnimplementedBlacklisting` and the storage map is
-//! never populated. These types are kept for the planned redesign.
-
 use cosmwasm_schema::cw_serde;

-/// Public-key + metadata pair surfaced by `GetBlacklistedAccount` /
-/// `GetBlacklistPaged`. Always empty on a freshly deployed contract.
 #[cw_serde]
 pub struct BlacklistedAccount {
    pub public_key: String,
@@ -21,8 +15,6 @@ impl From<(String, Blacklisting)> for BlacklistedAccount {
    }
 }

-/// Per-key blacklist record: the multisig proposal that approved it and the
-/// block height at which finalisation landed (None until finalised).
 #[cw_serde]
 pub struct Blacklisting {
    pub proposal_id: u64,
@@ -44,8 +36,6 @@ impl BlacklistedAccount {
    }
 }

-/// Page of blacklist entries returned by `GetBlacklistPaged`. Always empty on
-/// a freshly deployed contract.
 #[cw_serde]
 pub struct PagedBlacklistedAccountResponse {
    pub accounts: Vec<BlacklistedAccount>,
@@ -69,8 +59,6 @@ impl PagedBlacklistedAccountResponse {
    }
 }

-/// Response shape for `GetBlacklistedAccount`. `account` is `None` for any
-/// key not present in the (currently always-empty) blacklist.
 #[cw_serde]
 pub struct BlacklistedAccountResponse {
    pub account: Option<Blacklisting>,
@@ -4,9 +4,6 @@
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::Coin;

-/// Pool-level deposit accounting. Updated by every successful
-/// `DepositTicketBookFunds` and (for the unredeemed-tickets counter) by every
-/// successful legacy `RedeemTickets`.
 #[cw_serde]
 pub struct PoolCounters {
    /// Represents the total amount of funds deposited into the contract.
@@ -5,13 +5,8 @@ use crate::error::EcashContractError;
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{StdError, StdResult};

-/// Sequential identifier assigned to every accepted deposit. Starts at 0 and
-/// is never recycled.
 pub type DepositId = u32;

-/// Opaque on-chain record of a deposit: the depositor-claimed bs58-encoded
-/// ed25519 identity public key. The contract does not verify control of the
-/// corresponding private key.
 #[cw_serde]
 pub struct Deposit {
    pub bs58_encoded_ed25519_pubkey: String,
@@ -24,8 +19,6 @@ impl Deposit {
        }
    }

-    /// Decode a bs58-encoded ed25519 public key to its 32-byte raw form.
-    /// Surfaces `MalformedEd25519Identity` on any bs58 / length failure.
    pub fn get_ed25519_pubkey_bytes(raw: &str) -> Result<[u8; 32], EcashContractError> {
        let mut ed25519_pubkey_bytes = [0u8; 32];
        bs58::decode(raw)
@@ -39,13 +32,10 @@ impl Deposit {
        bs58::encode(raw).into_string()
    }

-    /// Decode this deposit's identity key to its 32-byte raw form for storage.
    pub fn to_bytes(&self) -> Result<[u8; 32], EcashContractError> {
        Self::get_ed25519_pubkey_bytes(&self.bs58_encoded_ed25519_pubkey)
    }

-    /// Reconstruct a `Deposit` from a raw 32-byte ed25519 pubkey as stored
-    /// under the `"deposit"` namespace.
    pub fn try_from_bytes(bytes: &[u8]) -> StdResult<Self> {
        if bytes.len() != 32 {
            return Err(StdError::generic_err("malformed deposit data"));
@@ -57,16 +47,12 @@ impl Deposit {
    }
 }

-/// Response shape for `GetLatestDeposit`. `deposit` is `None` on a freshly
-/// deployed contract.
 #[cw_serde]
 #[derive(Default)]
 pub struct LatestDepositResponse {
    pub deposit: Option<DepositData>,
 }

-/// Response shape for `GetDeposit { deposit_id }`. `deposit` is `None` when
-/// the id has not yet been assigned (`id >= total_deposits_made`).
 #[cw_serde]
 pub struct DepositResponse {
    pub id: DepositId,
@@ -74,8 +60,6 @@ pub struct DepositResponse {
    pub deposit: Option<Deposit>,
 }

-/// `(deposit_id, deposit)` pair surfaced by the latest-deposit and paginated
-/// deposit queries.
 #[cw_serde]
 pub struct DepositData {
    pub id: DepositId,
@@ -89,8 +73,6 @@ impl From<(DepositId, Deposit)> for DepositData {
    }
 }

-/// Page of deposits returned by `GetDepositsPaged`. `start_next_after` is the
-/// id of the last returned entry; pass it as the next call's `start_after`.
 #[cw_serde]
 pub struct PagedDepositsResponse {
    pub deposits: Vec<DepositData>,
@@ -6,108 +6,69 @@ use cw_controllers::AdminError;
 use cw_utils::PaymentError;
 use thiserror::Error;

-/// Errors surfaced by the ecash contract. Each reachable variant is named in at
-/// least one scenario of `openspec/specs/ecash-contract/spec.md`.
 #[derive(Error, Debug, PartialEq)]
 pub enum EcashContractError {
-    /// Wrapper for any underlying `cosmwasm_std::StdError` (storage faults,
-    /// address validation, etc.).
    #[error(transparent)]
    Std(#[from] StdError),

-    /// Raised by `cw_utils::must_pay` on `DepositTicketBookFunds` when funds
-    /// are missing, multi-denom, or in the wrong denom. Inner variants
-    /// `NoFunds`, `MultipleDenoms`, `MissingDenom` are all reachable.
    #[error("Invalid deposit")]
    InvalidDeposit(#[from] PaymentError),

-    /// `DepositTicketBookFunds` with the right denom but a non-matching amount.
-    /// `amount` is the reduced amount (if the sender is whitelisted) or the
-    /// default amount.
    #[error("received wrong amount for deposit. got: {received}. required: {amount}")]
    WrongAmount { received: Coin, amount: Coin },

-    /// **Unreachable** - preserved for forward compatibility (no current
-    /// execute path triggers this).
    #[error("There aren't enough funds in the contract")]
    NotEnoughFunds,

-    /// Wrapper for `cw_controllers::AdminError`. Raised by every admin-gated
-    /// and multisig-gated handler when the sender is wrong.
    #[error(transparent)]
    Admin(#[from] AdminError),

-    /// Redemption-proposal reply could not find a `proposal_id` attribute on
-    /// the multisig `wasm` event.
    #[error("could not find proposal id inside the multisig reply SubMsg")]
    MissingProposalId,

-    /// Redemption-proposal reply found a `proposal_id` attribute that could
-    /// not be parsed as `u64`. Realistically unreachable.
+    // realistically this should NEVER be thrown
    #[error("the proposal id returned by the multisig contract could not be parsed into an u64")]
    MalformedProposalId,

-    /// Instantiation given a `group_addr` that failed bech32 validation.
    #[error("Group contract invalid address '{addr}'")]
    InvalidGroup { addr: String },

-    /// **Unreachable** - no current execute path triggers this.
    #[error("Unauthorized")]
    Unauthorized,

-    /// **Unreachable** - preserved for future SemVer comparisons during migration.
    #[error("Failed to parse {value} into a valid SemVer version: {error_message}")]
    SemVerFailure {
        value: String,
        error_message: String,
    },

-    /// Reply dispatcher saw an `id` that does not match
-    /// `BLACKLIST_PROPOSAL_REPLY_ID` or `REDEMPTION_PROPOSAL_REPLY_ID`.
    #[error("received an invalid reply id: {id}. it does not correspond to any sent SubMsg")]
    InvalidReplyId { id: u64 },

-    /// **Unreachable** - preserved for the (future) typed-deposit-info feature.
    #[error("reached the maximum of 255 different deposit types")]
    MaximumDepositTypesReached,

-    /// **Unreachable** - preserved for the (future) typed-deposit-info feature.
    #[error("compressed deposit info {typ} does not corresponds to any known type")]
    UnknownCompressedDepositInfoType { typ: u8 },

-    /// **Unreachable** - preserved for the (future) typed-deposit-info feature.
    #[error("deposit info {typ} does not corresponds to any previously seen type")]
    UnknownDepositInfoType { typ: String },

-    /// `DepositTicketBookFunds` with an `identity_key` that fails to bs58-decode
-    /// to exactly 32 bytes. Raised inside `Deposit::to_bytes` during
-    /// `save_deposit`.
    #[error("the provided ed25519 identity was malformed")]
    MalformedEd25519Identity,

-    /// `nym_network_defaults::TICKETBOOK_SIZE` has diverged from the value
-    /// snapshotted at instantiation in `Item<Invariants>`. Tripwire for
-    /// uncoordinated network-defaults bumps.
    #[error("the ticket book size has changed since the contract was created! This was not expected! It used to be {at_init} but it's {current} now! Please let the developers know ASAP!")]
    TicketBookSizeChanged { at_init: u64, current: u64 },

-    /// `RequestRedemption` with a `commitment_bs58` that does not decode to a
-    /// 32-byte sha256 digest.
    #[error("the provided tickets redemption commitment is malformed")]
    MalformedRedemptionCommitment,

-    /// Always thrown by `ProposeToBlacklist` and `AddToBlacklist` until the
-    /// blacklist redesign lands.
    #[error("the account blacklisting hasn't been fully implemented yet")]
    UnimplementedBlacklisting,

-    /// `SetReducedDepositPrice` (or migration whitelist seeding) given a coin
-    /// whose denom does not match `Config::deposit_amount.denom`.
    #[error("reduced deposit must use the same denom as the default deposit (expected '{expected}', got '{got}')")]
    InvalidReducedDepositDenom { expected: String, got: String },

-    /// `SetReducedDepositPrice` (or migration whitelist seeding) given a
-    /// reduced amount not strictly less than the current default.
    #[error(
        "reduced deposit amount ({reduced}) must be strictly less than the default ({default})"
    )]
@@ -116,13 +77,9 @@ pub enum EcashContractError {
        default: cosmwasm_std::Uint128,
    },

-    /// `RemoveReducedDepositPrice` invoked for an address with no current
-    /// reduced-deposit entry.
    #[error("address '{address}' does not have a custom reduced deposit price set")]
    NoReducedDepositPrice { address: String },

-    /// `UpdateDefaultDepositValue` or `SetReducedDepositPrice` given an amount
-    /// below `nym_network_defaults::TICKETBOOK_SIZE`.
    #[error(
        "deposit amount ({amount}) must be at least the ticket book size ({ticket_book_size})"
    )]
@@ -1,7 +1,4 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-/// Duplicate of `events::PROPOSAL_ID_ATTRIBUTE_NAME`. **Dead code**: not
-/// referenced anywhere in the workspace today; preserved here pending a
-/// follow-on cleanup. Use `events::PROPOSAL_ID_ATTRIBUTE_NAME` instead.
 pub const BANDWIDTH_PROPOSAL_ID: &str = "proposal_id";
@@ -1,21 +1,9 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-//! Event names and attribute keys emitted by the ecash contract. Renaming any
-//! of these is a breaking change for indexers and downstream tooling.
-
-/// Event type emitted by every successful `DepositTicketBookFunds`. Carries a
-/// single `deposit-id` attribute with the assigned id as a decimal string.
+// event types
 pub const DEPOSITED_FUNDS_EVENT_TYPE: &str = "deposited-funds";

-/// Attribute key on the `deposited-funds` event: the newly assigned deposit id.
 pub const DEPOSIT_ID: &str = "deposit-id";
-
-/// Name of the cosmwasm-std auto-generated event that carries handler
-/// attributes (`updated_deposit`, `action`, `address`, `deposit`,
-/// `proposal_id`).
 pub const WASM_EVENT_NAME: &str = "wasm";
-
-/// Attribute key carrying the multisig-issued `proposal_id` on the `wasm`
-/// event from the redemption-proposal reply handler.
 pub const PROPOSAL_ID_ATTRIBUTE_NAME: &str = "proposal_id";
@@ -1,12 +1,6 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-//! Shared types, messages, events, and errors for the ecash contract.
-//!
-//! Consumed by both the contract crate (`contracts/ecash`) and any off-chain
-//! client (gateways, nym-api signers, indexers, validator-client). See
-//! `openspec/specs/ecash-contract/spec.md` for the normative interface.
-
 pub mod blacklist;
 pub mod counters;
 pub mod deposit;
@@ -15,134 +15,100 @@ use crate::reduced_deposit::WhitelistedAccountsResponse;
 #[cfg(feature = "schema")]
 use cosmwasm_schema::QueryResponses;

-/// Instantiation payload. The sender of the instantiate transaction becomes the
-/// contract admin; the three addresses are bech32-validated and persisted as
-/// immutable cross-contract pointers (see spec requirement "Contract instantiation").
 #[cw_serde]
 pub struct InstantiateMsg {
-    /// Cosmos SDK address reserved for the future pool-contract transition.
-    /// Stored in `Config` but never debited by the current contract.
    pub holding_account: String,
-
-    /// cw3 multisig contract that gates `RedeemTickets` and (in the redesign)
-    /// blacklist proposals. Not updatable through any execute path.
    pub multisig_addr: String,
-
-    /// cw4 group contract referenced by the (stubbed) blacklist proposal flow.
    pub group_addr: String,
-
-    /// Default per-deposit price. The denom of this coin is the contract's
-    /// canonical denom for the rest of its lifetime.
    pub deposit_amount: Coin,
 }

 #[cw_serde]
 pub enum ExecuteMsg {
-    /// Submitted by clients to escrow funds and register a claimed ed25519
-    /// identity key. Mints a sequential `deposit_id`. The contract does not
-    /// verify control of the identity key - that proof is checked off-chain by
-    /// nym-api signers at blind-sign time.
-    DepositTicketBookFunds { identity_key: String },
+    /// Used by clients to request ticket books from the signers
+    DepositTicketBookFunds {
+        identity_key: String,
+    },

-    /// Submitted by gateways to request batch redemption of spent tickets.
-    /// Dispatches a `Propose` SubMsg to the multisig contract; the actual
-    /// transfer effect is gated behind multisig approval.
+    /// Used by gateways to batch redeem tokens from the spent tickets
    RequestRedemption {
        commitment_bs58: String,
        number_of_tickets: u16,
    },

-    /// **Legacy / dead code.** Only callable by the multisig; bumps the
-    /// unredeemed-tickets counter and emits a `ticket_redemption` event with
-    /// `moved_to_holding_account = "false"`. No known consumer depends on the
-    /// side effects; candidate for removal in a follow-on breaking-schema
-    /// change.
-    RedeemTickets { n: u16, gw: String },
+    /// The actual message that gets executed, after multisig votes, that transfers the ticket tokens into gateway's (and the holding) account
+    RedeemTickets {
+        n: u16,
+        gw: String,
+    },

-    /// Transfer the contract admin role. Only the current admin may sign.
-    /// Dispatches via the cw_controllers `execute_update_admin` handshake.
-    UpdateAdmin { admin: String },
+    UpdateAdmin {
+        admin: String,
+    },

-    /// Overwrite `Config::deposit_amount`. Only callable by the contract admin.
-    /// Rejects values below `nym_network_defaults::TICKETBOOK_SIZE` and trips
-    /// `TicketBookSizeChanged` if the snapshotted invariant has diverged from
-    /// the current crate constant.
    #[serde(alias = "update_deposit_value")]
-    UpdateDefaultDepositValue { new_deposit: Coin },
+    UpdateDefaultDepositValue {
+        new_deposit: Coin,
+    },

    /// Set (or overwrite) a reduced deposit price for a specific address.
    /// Only callable by the contract admin.
-    SetReducedDepositPrice { address: String, deposit: Coin },
+    SetReducedDepositPrice {
+        address: String,
+        deposit: Coin,
+    },

    /// Remove the reduced deposit price for a specific address, reverting them to
    /// the default price. Returns an error if the address has no custom price set.
    /// Only callable by the contract admin.
-    RemoveReducedDepositPrice { address: String },
+    RemoveReducedDepositPrice {
+        address: String,
+    },

-    /// **Stubbed**: always returns `EcashContractError::UnimplementedBlacklisting`.
-    /// Storage, reply handler, and helper paths exist but are unreachable from
-    /// the public ExecuteMsg surface. Preserved for the redesign.
-    ProposeToBlacklist { public_key: String },
-
-    /// **Stubbed**: always returns `EcashContractError::UnimplementedBlacklisting`.
-    AddToBlacklist { public_key: String },
+    // TODO: properly implement
+    ProposeToBlacklist {
+        public_key: String,
+    },
+    AddToBlacklist {
+        public_key: String,
+    },
 }

 #[cw_serde]
 #[cfg_attr(feature = "schema", derive(QueryResponses))]
 pub enum QueryMsg {
-    /// Look up a blacklist entry by its bs58-encoded ed25519 public key. Always
-    /// returns `None` on a freshly deployed contract because the blacklist
-    /// execute paths are stubbed.
    #[cfg_attr(feature = "schema", returns(BlacklistedAccountResponse))]
    GetBlacklistedAccount { public_key: String },

-    /// Paginated listing of blacklist entries. Always empty today (see stubbed
-    /// blacklist surface). Defaults: limit 50, max 75.
    #[cfg_attr(feature = "schema", returns(PagedBlacklistedAccountResponse))]
    GetBlacklistPaged {
        limit: Option<u32>,
        start_after: Option<String>,
    },

-    /// Default per-deposit price (`Config::deposit_amount`). The
-    /// `GetRequiredDepositAmount` aliases are kept for backwards compatibility.
    #[cfg_attr(feature = "schema", returns(Coin))]
    #[serde(alias = "get_required_deposit_amount")]
    #[serde(alias = "GetRequiredDepositAmount")]
    GetDefaultDepositAmount {},

-    /// Per-address reduced deposit price override, if any. `None` for any
-    /// non-whitelisted address.
    #[cfg_attr(feature = "schema", returns(Option<Coin>))]
    GetReducedDepositAmount { address: String },

-    /// Enumerate every reduced-deposit whitelist entry in ascending address
-    /// order. Unpaginated by design (the whitelist is expected to stay small).
    #[cfg_attr(feature = "schema", returns(WhitelistedAccountsResponse))]
    GetAllWhitelistedAccounts {},

-    /// Look up a deposit by id. Returns `{ id, deposit: None }` when the id has
-    /// not yet been assigned.
    #[cfg_attr(feature = "schema", returns(DepositResponse))]
    GetDeposit { deposit_id: u32 },

-    /// Most recently assigned deposit (or `{ deposit: None }` on a fresh
-    /// contract). See `DepositStorage::latest_deposit`.
    #[cfg_attr(feature = "schema", returns(LatestDepositResponse))]
    GetLatestDeposit {},

-    /// Paginated listing of deposits in ascending id order. Defaults: limit 50,
-    /// max 100.
    #[cfg_attr(feature = "schema", returns(PagedDepositsResponse))]
    GetDepositsPaged {
        limit: Option<u32>,
        start_after: Option<u32>,
    },

-    /// Aggregate statistics: global totals + per-account custom-price
-    /// breakdowns. Reassembled in a single read pass from `PoolCounters` and
-    /// `DepositStatsStorage`.
    #[cfg_attr(feature = "schema", returns(DepositsStatistics))]
    GetDepositsStatistics {},
 }
@@ -1,8 +1,5 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-/// Title used for the cw3 `Propose` message dispatched by `RequestRedemption`.
-/// nym-api signers cross-check this exact string when validating that an
-/// in-flight proposal originated from the ecash contract.
 // TODO: to be moved to multisig
 pub const BATCH_REDEMPTION_PROPOSAL_TITLE: &str = "ecash-redemption";
@@ -4,16 +4,12 @@
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{Addr, Coin};

-/// Whitelist entry: an address and the reduced deposit price it may pay.
-/// Persisted in the `"reduced_deposits"` storage map.
 #[cw_serde]
 pub struct WhitelistedAccount {
    pub address: Addr,
    pub deposit: Coin,
 }

-/// Response shape for `GetAllWhitelistedAccounts`. Unpaginated - the whitelist
-/// is expected to stay small.
 #[cw_serde]
 pub struct WhitelistedAccountsResponse {
    pub whitelisted_accounts: Vec<WhitelistedAccount>,
@@ -1,26 +0,0 @@
-[package]
-name = "nym-network-monitors-contract-common"
-description = "Common library for the Nym Network Monitors contract"
-authors.workspace = true
-repository.workspace = true
-homepage.workspace = true
-documentation.workspace = true
-edition.workspace = true
-license.workspace = true
-readme.workspace = true
-version.workspace = true
-
-[dependencies]
-thiserror = { workspace = true }
-serde = { workspace = true }
-schemars = { workspace = true }
-
-cosmwasm-std = { workspace = true }
-cosmwasm-schema = { workspace = true }
-cw-controllers = { workspace = true }
-
-[features]
-schema = []
-
-[lints]
-workspace = true
@@ -1,8 +0,0 @@
-// Copyright 2026 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-pub mod storage_keys {
-    pub const CONTRACT_ADMIN: &str = "contract-admin";
-    pub const AUTHORISED_ORCHESTRATORS: &str = "authorised-orchestrators";
-    pub const AUTHORISED_NETWORK_MONITORS: &str = "authorised-network-monitors";
-}
@@ -1,30 +0,0 @@
-// Copyright 2026 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use cosmwasm_std::Addr;
-use cw_controllers::AdminError;
-use thiserror::Error;
-
-#[derive(Error, Debug, PartialEq)]
-pub enum NetworkMonitorsContractError {
-    #[error("could not perform contract migration: {comment}")]
-    FailedMigration { comment: String },
-
-    #[error(transparent)]
-    Admin(#[from] AdminError),
-
-    #[error("unauthorised")]
-    Unauthorized,
-
-    #[error("address {addr} is not an authorised orchestrator")]
-    NotAnOrchestrator { addr: Addr },
-
-    #[error("Failed to recover x25519 public key from its base58 representation: {0}")]
-    MalformedX25519AgentNoiseKey(String),
-
-    #[error("Failed to recover ed25519 public key from its base58 representation: {0}")]
-    MalformedEd25519OrchestratorIdentityKey(String),
-
-    #[error(transparent)]
-    StdErr(#[from] cosmwasm_std::StdError),
-}
@@ -1,11 +0,0 @@
-// Copyright 2026 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-pub mod constants;
-pub mod error;
-pub mod msg;
-pub mod types;
-
-pub use error::*;
-pub use msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
-pub use types::*;
@@ -1,78 +0,0 @@
-// Copyright 2026 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use cosmwasm_schema::cw_serde;
-use std::net::SocketAddr;
-
-#[cfg(feature = "schema")]
-use crate::{
-    AuthorisedNetworkMonitorOrchestratorsResponse, AuthorisedNetworkMonitorsPagedResponse,
-};
-
-#[cw_serde]
-pub struct InstantiateMsg {
-    /// Address of the initial network monitor orchestrator.
-    pub orchestrator_address: String,
-}
-
-#[cw_serde]
-pub enum ExecuteMsg {
-    /// Change the admin
-    UpdateAdmin { admin: String },
-
-    /// Authorise new network monitor orchestrator
-    AuthoriseNetworkMonitorOrchestrator { address: String },
-
-    /// Attempt to update the announced identity key of this orchestrator
-    UpdateOrchestratorIdentityKey { key: String },
-
-    /// Revoke network monitor orchestrator authorisation.
-    RevokeNetworkMonitorOrchestrator { address: String },
-
-    /// Authorise new network monitor (or renew authorisation)
-    /// granting additional privileges when sending mixnet packets to Nym nodes.
-    AuthoriseNetworkMonitor {
-        /// Mixnet address of the agent.
-        /// The underlying ip address is going to be used as ingress to the nodes,
-        /// and the full socket address announces the egress and the association with the noise key
-        mixnet_address: SocketAddr,
-
-        /// Base-58 encoded noise key of the agent.
-        bs58_x25519_noise: String,
-
-        /// Version of the noise protocol used by the agent.
-        noise_version: u8,
-    },
-
-    /// Revoke network monitor authorisation.
-    RevokeNetworkMonitor { address: SocketAddr },
-
-    /// Revoke all network monitor authorisations.
-    RevokeAllNetworkMonitors,
-}
-
-#[cw_serde]
-#[cfg_attr(feature = "schema", derive(cosmwasm_schema::QueryResponses))]
-pub enum QueryMsg {
-    #[cfg_attr(feature = "schema", returns(cw_controllers::AdminResponse))]
-    Admin {},
-
-    // no need for pagination as we don't expect even a double digit of those
-    #[cfg_attr(
-        feature = "schema",
-        returns(AuthorisedNetworkMonitorOrchestratorsResponse)
-    )]
-    NetworkMonitorOrchestrators {},
-
-    #[cfg_attr(feature = "schema", returns(AuthorisedNetworkMonitorsPagedResponse))]
-    NetworkMonitorAgents {
-        /// Pagination control for the values returned by the query. Note that the provided value itself will **not** be used for the response.
-        start_next_after: Option<SocketAddr>,
-
-        /// Controls the maximum number of entries returned by the query. Note that too large values will be overwritten by a saner default.
-        limit: Option<u32>,
-    },
-}
-
-#[cw_serde]
-pub struct MigrateMsg {}
@@ -1,53 +0,0 @@
-// Copyright 2026 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use cosmwasm_schema::cw_serde;
-use cosmwasm_std::{Addr, Timestamp};
-use std::net::SocketAddr;
-
-pub type OrchestratorAddress = Addr;
-
-#[cw_serde]
-pub struct AuthorisedNetworkMonitorOrchestrator {
-    /// The address associated with the network monitor orchestrator.
-    pub address: Addr,
-
-    /// Base-58 encoded identity key of the orchestrator, announced by the orchestrator itself
-    /// on startup.
-    pub identity_key: Option<String>,
-
-    /// Timestamp of when the network monitor was authorised.
-    pub authorised_at: Timestamp,
-}
-
-#[cw_serde]
-pub struct AuthorisedNetworkMonitor {
-    /// Mixnet address of the agent.
-    /// The underlying ip address is going to be used as ingress to the nodes,
-    /// and the full socket address announces the egress and the association with the noise key
-    pub mixnet_address: SocketAddr,
-
-    /// The address of the orchestrator that authorised the network monitor agent.
-    pub authorised_by: OrchestratorAddress,
-
-    /// Timestamp of when the network monitor was authorised.
-    pub authorised_at: Timestamp,
-
-    /// Base-58 encoded noise key of the agent.
-    pub bs58_x25519_noise: String,
-
-    /// Version of the noise protocol used by the agent.
-    pub noise_version: u8,
-}
-
-#[cw_serde]
-pub struct AuthorisedNetworkMonitorOrchestratorsResponse {
-    pub authorised: Vec<AuthorisedNetworkMonitorOrchestrator>,
-}
-
-#[cw_serde]
-pub struct AuthorisedNetworkMonitorsPagedResponse {
-    pub authorised: Vec<AuthorisedNetworkMonitor>,
-
-    pub start_next_after: Option<SocketAddr>,
-}
@@ -101,14 +101,4 @@ pub mod events {

    pub const NODE_UNBOND_CLEANUP_EVENT_NAME: &str = "family_node_unbond_cleanup";
    pub const NODE_UNBOND_CLEANUP_EVENT_NODE_ID: &str = "node_id";
-
-    pub const FAMILY_UPDATE_EVENT_NAME: &str = "family_update";
-    pub const FAMILY_UPDATE_EVENT_FAMILY_ID: &str = "family_id";
-    pub const FAMILY_UPDATE_EVENT_OWNER_ADDRESS: &str = "owner_address";
-    /// Attribute carrying the new family name. Only emitted when the
-    /// `UpdateFamily` message carried `updated_name = Some(_)`.
-    pub const FAMILY_UPDATE_EVENT_UPDATED_NAME: &str = "updated_name";
-    /// Attribute carrying the new family description. Only emitted when the
-    /// `UpdateFamily` message carried `updated_description = Some(_)`.
-    pub const FAMILY_UPDATE_EVENT_UPDATED_DESCRIPTION: &str = "updated_description";
 }
@@ -38,16 +38,6 @@ pub enum ExecuteMsg {
    /// `create_family_fee` must be attached as funds.
    CreateFamily { name: String, description: String },

-    /// Update the name and/or description of the family owned by the message
-    /// sender. Each field is independently optional: `None` leaves the
-    /// existing value unchanged, `Some(_)` replaces it. Updated values are
-    /// validated against the same length / normalisation / global-uniqueness
-    /// rules as [`Self::CreateFamily`].
-    UpdateFamily {
-        updated_name: Option<String>,
-        updated_description: Option<String>,
-    },
-
    /// Disband the family owned by the message sender. The family must have
    /// no current members; any still-pending invitations are revoked.
    DisbandFamily {},
@@ -61,12 +61,9 @@ pub struct NodeFamily {

 /// A pending invitation for a node to join a particular family.
 ///
-/// Invitations are stored until they are accepted, rejected, or revoked. Once the
-/// chain advances past `expires_at` an invitation becomes inert but stays in storage
-/// — there is no background process clearing expired invitations. A timed-out
-/// invitation is cleared either when explicitly revoked/rejected, or when the family
-/// issues a fresh invitation for the same node, which archives the stale one as
-/// `Expired` and supersedes it.
+/// Invitations are stored until they are accepted, rejected, revoked, or until the
+/// chain advances past `expires_at` (in which case they remain in storage but are
+/// treated as inert — there is no background process clearing expired invitations).
 #[cw_serde]
 pub struct FamilyInvitation {
    /// The family that issued the invitation.
@@ -110,10 +107,8 @@ pub struct PastFamilyMember {

 /// Terminal status for an invitation that has been moved out of the pending set.
 ///
-/// Note: an invitation that merely times out is **not** archived here on its own —
-/// it is left inert in the pending set (see `FamilyInvitation::expires_at`). It only
-/// reaches `Expired` if the family issues a fresh invitation for the same node, which
-/// supersedes and archives the stale one.
+/// Note: timed-out invitations are not represented here — they are simply left in
+/// the pending set (see `FamilyInvitation::expires_at`).
 #[cw_serde]
 pub enum FamilyInvitationStatus {
    /// Still awaiting a response. Recorded with a timestamp for completeness even
@@ -126,16 +121,11 @@ pub enum FamilyInvitationStatus {
    /// The family revoked the invitation at the given timestamp before it could
    /// be accepted or rejected.
    Revoked { at: u64 },
-    /// The invitation had already expired and was superseded by a fresh invitation
-    /// for the same node from the same family, issued at the given timestamp. This is
-    /// the only path that archives a timed-out invitation.
-    Expired { at: u64 },
 }

 /// Historical record of an invitation that has reached a terminal state
-/// (`Accepted`, `Rejected`, `Revoked`, or `Expired`). A timed-out invitation is
-/// archived here only when a fresh invitation for the same node supersedes it
-/// (status `Expired`); otherwise it stays in the pending map until explicitly cleared.
+/// (`Accepted`, `Rejected`, or `Revoked`). Timed-out invitations are **not**
+/// archived here — they remain in the pending map until explicitly cleared.
 #[cw_serde]
 pub struct PastFamilyInvitation {
    /// The original invitation as it was issued.
@@ -27,9 +27,6 @@ pub struct QuorumStateChecker {
    cancellation_token: CancellationToken,
    check_interval: Duration,
    quorum_state: QuorumState,
-
-    /// indicates whether the last check has been a failure
-    last_failed: bool,
 }

 impl QuorumStateChecker {
@@ -45,7 +42,6 @@ impl QuorumStateChecker {
            quorum_state: QuorumState {
                available: Arc::new(Default::default()),
            },
-            last_failed: false,
        };

        // first check MUST succeed, otherwise we shouldn't start
@@ -61,7 +57,6 @@ impl QuorumStateChecker {
    }

    async fn check_quorum_state(&self) -> Result<bool, CredentialProxyError> {
-        info!("checking the current quorum state");
        let client_guard = self.client.query_chain().await;

        // split the operation as we only need to hold the reference to chain client for the first part
@@ -69,8 +64,7 @@ impl QuorumStateChecker {
        let dkg_details = dkg_details_with_client(client_guard.deref()).await?;
        drop(client_guard);

-        let res = check_known_dealers(dkg_details, 4).await?;
-        info!("there are {} known DKG dealers", res.results.len());
+        let res = check_known_dealers(dkg_details).await?;

        let Some(signing_threshold) = res.threshold else {
            warn!(
@@ -82,36 +76,15 @@ impl QuorumStateChecker {
        let mut working_issuer = 0;

        for result in res.results {
-            let dealer = &result.information;
-            let info = format!("[id: {}] @ {}", dealer.node_index, dealer.announce_address);
            if result.chain_available() && result.signing_available() {
-                info!("✅ {info} is fully available");
                working_issuer += 1;
-            } else if !result.chain_available() && !result.signing_available() {
-                warn!("❌ {info} is not available for both chain and signing");
-            } else if !result.chain_available() {
-                warn!("❌ {info} is not available for chain");
-            } else {
-                warn!("❌ {info} is not available for signing");
            }
        }

-        let available = (working_issuer as u64) >= signing_threshold;
-
-        if available {
-            info!(
-                "✅ Quorum state is available with {working_issuer} out of {signing_threshold} issuers"
-            )
-        } else {
-            error!(
-                "❌ Quorum state is not available with {working_issuer} out of {signing_threshold} issuers"
-            )
-        }
-
-        Ok(available)
+        Ok((working_issuer as u64) >= signing_threshold)
    }

-    pub async fn run_forever(mut self) {
+    pub async fn run_forever(self) {
        info!("starting quorum state checker");
        loop {
            tokio::select! {
@@ -121,23 +94,7 @@ impl QuorumStateChecker {
                }
                _ = tokio::time::sleep(self.check_interval) => {
                    match self.check_quorum_state().await {
-                        Ok(available) => {
-                            let previous = self.quorum_state.available.load(Ordering::SeqCst);
-                            // only update the quorum state to a failed state if we've had two consecutive failures
-                            if available {
-                                if !previous {
-                                    info!("quorum recovered");
-                                }
-                                self.quorum_state.available.store(true, Ordering::SeqCst);
-                            } else if self.last_failed {
-                                if previous {
-                                    warn!("quorum became unavailable after 2 consecutive failed checks");
-                                }
-                                self.quorum_state.available.store(false, Ordering::SeqCst);
-                            }
-
-                            self.last_failed = !available;
-                        },
+                        Ok(available) => self.quorum_state.available.store(available, Ordering::SeqCst),
                        Err(err) => error!("failed to check current quorum state: {err}"),
                    }
                }
@@ -230,8 +230,8 @@ impl MemoryEcachTicketbookManager {
                expiration_date: t.ticketbook.expiration_date(),
                ticketbook_type: t.ticketbook.ticketbook_type().to_string(),
                epoch_id: t.ticketbook.epoch_id() as u32,
-                total_tickets: t.total_tickets,
-                used_tickets: t.ticketbook.spent_tickets() as u32,
+                total_tickets: t.ticketbook.spent_tickets() as u32,
+                used_tickets: t.total_tickets,
            })
            .collect()
    }
@@ -333,339 +333,3 @@ impl MemoryEcachTicketbookManager {
        guard.emergency_credentials.remove(typ);
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use nym_compact_ecash::tests::helpers::generate_expiration_date_signatures;
-    use nym_compact_ecash::{issue, ttp_keygen};
-    use nym_credentials_interface::TicketType;
-    use nym_crypto::asymmetric::ed25519;
-    use nym_ecash_time::EcashTime;
-    use nym_test_utils::helpers::deterministic_rng;
-
-    fn mock_issuance(deposit_id: u32) -> IssuanceTicketBook {
-        let identifier = "foomp";
-        let mut rng = deterministic_rng();
-        let key = ed25519::PrivateKey::new(&mut rng);
-        let typ = TicketType::V1MixnetEntry;
-        IssuanceTicketBook::new(deposit_id, identifier, key, typ)
-    }
-
-    fn mock_ticketbook() -> anyhow::Result<IssuedTicketBook> {
-        let signing_keys = ttp_keygen(1, 1)?.remove(0);
-        let issuance = mock_issuance(42);
-        let expiration_date = issuance.expiration_date();
-
-        let sig_req = issuance.prepare_for_signing();
-        let _exp_date_sigs = generate_expiration_date_signatures(
-            sig_req.expiration_date.ecash_unix_timestamp(),
-            &[signing_keys.secret_key()],
-            &[signing_keys.verification_key()],
-            &signing_keys.verification_key(),
-            &[1],
-        )?;
-        let blind_sig = issue(
-            signing_keys.secret_key(),
-            sig_req.ecash_pub_key,
-            &sig_req.withdrawal_request,
-            expiration_date.ecash_unix_timestamp(),
-            issuance.ticketbook_type().encode(),
-        )?;
-
-        let partial_wallet =
-            issuance.unblind_signature(&signing_keys.verification_key(), &sig_req, blind_sig, 1)?;
-
-        let wallet = issuance.aggregate_signature_shares(
-            &signing_keys.verification_key(),
-            &[partial_wallet],
-            sig_req,
-        )?;
-
-        Ok(issuance.into_issued_ticketbook(wallet, 1))
-    }
-
-    fn mock_verification_key() -> VerificationKeyAuth {
-        ttp_keygen(1, 1).unwrap().remove(0).verification_key()
-    }
-
-    #[tokio::test]
-    async fn get_ticketbooks_info_empty() {
-        let manager = MemoryEcachTicketbookManager::new();
-        let info = manager.get_ticketbooks_info().await;
-        assert!(info.is_empty());
-    }
-
-    #[tokio::test]
-    async fn get_ticketbooks_info_maps_inserted_ticketbook() -> anyhow::Result<()> {
-        let manager = MemoryEcachTicketbookManager::new();
-        let ticketbook = mock_ticketbook()?;
-        let total_tickets = 100;
-        let used_tickets = 25;
-
-        manager
-            .insert_new_ticketbook(&ticketbook, total_tickets, used_tickets)
-            .await;
-
-        let info = manager.get_ticketbooks_info().await;
-        assert_eq!(info.len(), 1);
-        let entry = &info[0];
-        assert_eq!(entry.id, 0);
-        assert_eq!(entry.expiration_date, ticketbook.expiration_date());
-        assert_eq!(
-            entry.ticketbook_type,
-            ticketbook.ticketbook_type().to_string()
-        );
-        assert_eq!(entry.epoch_id, ticketbook.epoch_id() as u32);
-        assert_eq!(entry.total_tickets, total_tickets);
-        assert_eq!(entry.used_tickets, used_tickets);
-
-        Ok(())
-    }
-
-    #[tokio::test]
-    async fn contains_ticketbook_reflects_insertion() -> anyhow::Result<()> {
-        let manager = MemoryEcachTicketbookManager::new();
-        let ticketbook = mock_ticketbook()?;
-
-        assert!(!manager.contains_ticketbook(&ticketbook).await);
-
-        manager.insert_new_ticketbook(&ticketbook, 100, 0).await;
-
-        assert!(manager.contains_ticketbook(&ticketbook).await);
-        Ok(())
-    }
-
-    #[tokio::test]
-    async fn insert_new_ticketbook_assigns_incrementing_ids() -> anyhow::Result<()> {
-        let manager = MemoryEcachTicketbookManager::new();
-        let ticketbook = mock_ticketbook()?;
-
-        manager.insert_new_ticketbook(&ticketbook, 100, 0).await;
-        manager.insert_new_ticketbook(&ticketbook, 100, 0).await;
-
-        let mut ids: Vec<i64> = manager
-            .get_ticketbooks_info()
-            .await
-            .into_iter()
-            .map(|i| i.id)
-            .collect();
-        ids.sort();
-        assert_eq!(ids, vec![0, 1]);
-        Ok(())
-    }
-
-    #[tokio::test]
-    async fn get_next_unspent_ticketbook_updates_spent_and_exhausts() -> anyhow::Result<()> {
-        let manager = MemoryEcachTicketbookManager::new();
-        let ticketbook = mock_ticketbook()?;
-        let typ = ticketbook.ticketbook_type().to_string();
-
-        // total = 3, used = 0 — leaves 3 tickets available
-        manager.insert_new_ticketbook(&ticketbook, 3, 0).await;
-
-        let first = manager
-            .get_next_unspent_ticketbook_and_update(typ.clone(), 2)
-            .await;
-        assert!(first.is_some());
-        let first = first.unwrap();
-        assert_eq!(first.total_tickets, 3);
-        // returned ticketbook reflects state *before* the update
-        assert_eq!(first.ticketbook.spent_tickets(), 0);
-
-        // next withdrawal of 2 should be rejected (only 1 left)
-        let second = manager
-            .get_next_unspent_ticketbook_and_update(typ.clone(), 2)
-            .await;
-        assert!(second.is_none());
-
-        // but a withdrawal of 1 succeeds
-        let third = manager
-            .get_next_unspent_ticketbook_and_update(typ.clone(), 1)
-            .await;
-        assert!(third.is_some());
-
-        // and now nothing left
-        let fourth = manager.get_next_unspent_ticketbook_and_update(typ, 1).await;
-        assert!(fourth.is_none());
-
-        Ok(())
-    }
-
-    #[tokio::test]
-    async fn get_next_unspent_ticketbook_filters_by_type() -> anyhow::Result<()> {
-        let manager = MemoryEcachTicketbookManager::new();
-        let ticketbook = mock_ticketbook()?;
-
-        manager.insert_new_ticketbook(&ticketbook, 5, 0).await;
-
-        let mismatched = manager
-            .get_next_unspent_ticketbook_and_update("nonexistent_type".to_string(), 1)
-            .await;
-        assert!(mismatched.is_none());
-        Ok(())
-    }
-
-    #[tokio::test]
-    async fn revert_ticketbook_withdrawal_resets_spent_only_when_expected_matches(
-    ) -> anyhow::Result<()> {
-        let manager = MemoryEcachTicketbookManager::new();
-        let ticketbook = mock_ticketbook()?;
-        let typ = ticketbook.ticketbook_type().to_string();
-
-        manager.insert_new_ticketbook(&ticketbook, 10, 0).await;
-        manager
-            .get_next_unspent_ticketbook_and_update(typ.clone(), 4)
-            .await
-            .expect("should withdraw");
-
-        // stale expected_current_total_spent — should be rejected
-        assert!(!manager.revert_ticketbook_withdrawal(0, 4, 99).await);
-        // spent_tickets unchanged
-        let used_after_failed = manager.get_ticketbooks_info().await[0].used_tickets;
-        assert_eq!(used_after_failed, 4);
-
-        // matching expected — should succeed and restore
-        assert!(manager.revert_ticketbook_withdrawal(0, 4, 4).await);
-        let used_after_revert = manager.get_ticketbooks_info().await[0].used_tickets;
-        assert_eq!(used_after_revert, 0);
-
-        // unknown ticketbook_id is rejected
-        assert!(!manager.revert_ticketbook_withdrawal(999, 1, 0).await);
-
-        Ok(())
-    }
-
-    #[tokio::test]
-    async fn pending_ticketbook_round_trip() {
-        let manager = MemoryEcachTicketbookManager::new();
-        let issuance = mock_issuance(7);
-        let deposit_id = issuance.deposit_id() as i64;
-
-        assert!(manager.get_pending_ticketbooks().await.is_empty());
-
-        manager.insert_pending_ticketbook(&issuance).await;
-
-        let pending = manager.get_pending_ticketbooks().await;
-        assert_eq!(pending.len(), 1);
-        assert_eq!(pending[0].pending_id, deposit_id);
-        assert_eq!(
-            pending[0].pending_ticketbook.deposit_id(),
-            issuance.deposit_id()
-        );
-
-        manager.remove_pending_ticketbook(deposit_id).await;
-        assert!(manager.get_pending_ticketbooks().await.is_empty());
-
-        // removing a non-existent id is a no-op
-        manager.remove_pending_ticketbook(999).await;
-    }
-
-    #[tokio::test]
-    async fn emergency_credential_lifecycle() {
-        let manager = MemoryEcachTicketbookManager::new();
-
-        let cred_a = EmergencyCredentialContent {
-            typ: "type-a".to_string(),
-            content: vec![1, 2, 3],
-            expiration: None,
-        };
-        let cred_b = EmergencyCredentialContent {
-            typ: "type-a".to_string(),
-            content: vec![4, 5, 6],
-            expiration: None,
-        };
-        let cred_c = EmergencyCredentialContent {
-            typ: "type-b".to_string(),
-            content: vec![7, 8, 9],
-            expiration: None,
-        };
-
-        assert!(manager.get_emergency_credential("type-a").await.is_none());
-
-        manager.insert_emergency_credential(&cred_a).await;
-        manager.insert_emergency_credential(&cred_b).await;
-        manager.insert_emergency_credential(&cred_c).await;
-
-        // get returns the first inserted entry for the type
-        let first = manager.get_emergency_credential("type-a").await.unwrap();
-        assert_eq!(first.id, 0);
-        assert_eq!(first.data.content, vec![1, 2, 3]);
-
-        // remove by id drops only that entry; type-a now exposes cred_b
-        manager.remove_emergency_credential(0).await;
-        let after_remove = manager.get_emergency_credential("type-a").await.unwrap();
-        assert_eq!(after_remove.id, 1);
-        assert_eq!(after_remove.data.content, vec![4, 5, 6]);
-
-        // remove by type clears the bucket entirely
-        manager.remove_emergency_credentials_of_type("type-a").await;
-        assert!(manager.get_emergency_credential("type-a").await.is_none());
-
-        // unrelated type is untouched
-        assert!(manager.get_emergency_credential("type-b").await.is_some());
-    }
-
-    #[tokio::test]
-    async fn master_verification_key_round_trip() {
-        let manager = MemoryEcachTicketbookManager::new();
-        let key = mock_verification_key();
-        let epoch = EpochVerificationKey {
-            epoch_id: 7,
-            key: key.clone(),
-        };
-
-        assert!(manager.get_master_verification_key(7).await.is_none());
-
-        manager.insert_master_verification_key(&epoch).await;
-
-        assert_eq!(manager.get_master_verification_key(7).await, Some(key));
-        assert!(manager.get_master_verification_key(8).await.is_none());
-    }
-
-    #[tokio::test]
-    async fn coin_index_signatures_round_trip() {
-        let manager = MemoryEcachTicketbookManager::new();
-        let sigs = AggregatedCoinIndicesSignatures {
-            epoch_id: 3,
-            signatures: vec![],
-        };
-
-        assert!(manager.get_coin_index_signatures(3).await.is_none());
-
-        manager.insert_coin_index_signatures(&sigs).await;
-
-        let retrieved = manager.get_coin_index_signatures(3).await;
-        assert!(retrieved.is_some());
-        assert!(retrieved.unwrap().is_empty());
-        assert!(manager.get_coin_index_signatures(4).await.is_none());
-    }
-
-    #[tokio::test]
-    async fn expiration_date_signatures_round_trip() {
-        let manager = MemoryEcachTicketbookManager::new();
-        let date = nym_ecash_time::ecash_today().date();
-        let sigs = AggregatedExpirationDateSignatures {
-            epoch_id: 5,
-            expiration_date: date,
-            signatures: vec![],
-        };
-
-        assert!(manager
-            .get_expiration_date_signatures(date, 5)
-            .await
-            .is_none());
-
-        manager.insert_expiration_date_signatures(&sigs).await;
-
-        let retrieved = manager.get_expiration_date_signatures(date, 5).await;
-        assert!(retrieved.is_some());
-        assert!(retrieved.unwrap().is_empty());
-
-        // wrong epoch / wrong date → miss
-        assert!(manager
-            .get_expiration_date_signatures(date, 6)
-            .await
-            .is_none());
-    }
-}
@@ -36,13 +36,5 @@ nym-ecash-contract-common = { workspace = true }
 nym-network-defaults = { workspace = true }
 nym-serde-helpers = { workspace = true, features = ["date"] }

-[target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio]
-workspace = true
-features = ["time"]
-
-[target."cfg(target_arch = \"wasm32\")".dependencies.wasmtimer]
-workspace = true
-features = ["tokio"]
-
 [dev-dependencies]
 rand = { workspace = true }
@@ -6,7 +6,6 @@ use crate::ecash::bandwidth::serialiser::VersionedSerialise;
 use crate::ecash::bandwidth::CredentialSigningData;
 use crate::ecash::utils::cred_exp_date;
 use crate::error::Error;
-use log::{debug, warn};
 use nym_api_requests::ecash::BlindSignRequestBody;
 use nym_credentials_interface::{
    aggregate_wallets, generate_keypair_user_from_seed, issue_verify, withdrawal_request,
@@ -18,15 +17,8 @@ use nym_ecash_contract_common::deposit::DepositId;
 use nym_ecash_time::{ecash_default_expiration_date, ecash_today, EcashTime};
 use nym_validator_client::nym_api::{EpochId, NymApiClientExt};
 use serde::{Deserialize, Serialize};
-use std::time::Duration;
 use time::Date;

-#[cfg(not(target_arch = "wasm32"))]
-use tokio::time::sleep;
-
-#[cfg(target_arch = "wasm32")]
-use wasmtimer::tokio::sleep;
-
 pub use nym_validator_client::nyxd::{Coin, Hash};

 #[derive(Serialize, Deserialize)]
@@ -200,49 +192,6 @@ impl IssuanceTicketBook {
        Ok(unblinded_signature)
    }

-    // ideally this would have been generic over credential type, but we really don't need secp256k1 keys for bandwidth vouchers
-    pub async fn obtain_partial_ticketbook_credential_with_retries(
-        &self,
-        client: &nym_http_api_client::Client,
-        signer_index: u64,
-        validator_vk: &VerificationKeyAuth,
-        signing_data: CredentialSigningData,
-        max_attempts: usize,
-    ) -> Result<PartialWallet, Error> {
-        let Some(client_url) = client.base_urls().first() else {
-            return Err(Error::CredentialShareObtainFailed);
-        };
-        let mut last_err = None;
-        for attempt in 0..max_attempts {
-            if attempt > 0 {
-                sleep(Duration::from_millis(500 * attempt as u64)).await;
-            }
-            debug!(
-                "attempt {} / {max_attempts} to obtain partial ticketbook credential from {client_url}",
-                attempt + 1,
-            );
-            match self
-                .obtain_partial_ticketbook_credential(
-                    client,
-                    signer_index,
-                    validator_vk,
-                    signing_data.clone(),
-                )
-                .await
-            {
-                Ok(partial_wallet) => return Ok(partial_wallet),
-                Err(err) => {
-                    warn!(
-                        "attempt {} / {max_attempts} to obtain partial ticketbook credential from {client_url} failed: {err}",
-                        attempt + 1,
-                    );
-                    last_err = Some(err);
-                }
-            }
-        }
-        Err(last_err.unwrap_or(Error::CredentialShareObtainFailed))
-    }
-
    // ideally this would have been generic over credential type, but we really don't need secp256k1 keys for bandwidth vouchers
    pub async fn obtain_partial_ticketbook_credential(
        &self,
@@ -137,8 +137,6 @@ pub async fn obtain_aggregate_wallet(
    ecash_api_clients: &[EcashApiClient],
    threshold: u64,
 ) -> Result<WalletSignatures, Error> {
-    const MAX_ATTEMPTS: usize = 2;
-
    if ecash_api_clients.len() < threshold as usize {
        return Err(Error::NoValidatorsAvailable);
    }
@@ -156,12 +154,11 @@ pub async fn obtain_aggregate_wallet(
        );

        match voucher
-            .obtain_partial_ticketbook_credential_with_retries(
+            .obtain_partial_ticketbook_credential(
                &ecash_api_client.api_client,
                ecash_api_client.node_id,
                &ecash_api_client.verification_key,
                request.clone(),
-                MAX_ATTEMPTS,
            )
            .await
        {
@@ -170,11 +167,6 @@ pub async fn obtain_aggregate_wallet(
                warn!("failed to obtain partial credential from API {ecash_api_client}: {err}",);
            }
        };
-
-        // we got sufficient number of shares
-        if wallets.len() >= threshold as usize {
-            break;
-        }
    }
    if wallets.len() < threshold as usize {
        return Err(Error::NotEnoughShares);
@@ -63,9 +63,6 @@ pub enum Error {

    #[error("failed to create a secp256k1 signature")]
    Secp256k1SignFailure,
-
-    #[error("failed to obtain a valid credential share")]
-    CredentialShareObtainFailed,
 }

 impl From<NymAPIError> for Error {
@@ -1,7 +1,21 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use super::PublicKey;
+use super::{PrivateKey, PublicKey};
+
+pub mod bs58_x25519_private_key {
+    use super::*;
+    use serde::{Deserialize, Deserializer, Serializer};
+
+    pub fn serialize<S: Serializer>(key: &PrivateKey, serializer: S) -> Result<S::Ok, S::Error> {
+        serializer.serialize_str(&key.to_base58_string())
+    }
+
+    pub fn deserialize<'de, D: Deserializer<'de>>(deserializer: D) -> Result<PrivateKey, D::Error> {
+        let s = String::deserialize(deserializer)?;
+        PrivateKey::from_base58_string(s).map_err(serde::de::Error::custom)
+    }
+}

 pub mod bs58_x25519_pubkey {
    use super::*;
@@ -31,5 +31,3 @@ pub use aes_gcm_siv::{Aes128GcmSiv, Aes256GcmSiv};
 pub use blake3;
 #[cfg(feature = "stream_cipher")]
 pub use ctr;
-#[cfg(feature = "hashing")]
-pub use sha2;
@@ -6,7 +6,7 @@ use nym_coconut_dkg_common::verification_key::VerificationKeyShare;
 use nym_crypto::asymmetric::ed25519;
 use std::time::Duration;
 use time::OffsetDateTime;
-use tracing::warn;
+use tracing::{debug, warn};

 pub trait Verifiable {
    fn verify_signature(&self, pub_key: &ed25519::PublicKey) -> bool;
@@ -36,7 +36,6 @@ pub trait ChainResponse: Verifiable + TimestampedResponse {

        // we rely on information provided from the api itself AS LONG AS it's not too outdated
        if self.timestamp() + stale_response_threshold < now {
-            warn!("chain status response is stale");
            return false;
        }
        self.chain_synced()
@@ -97,27 +96,26 @@ pub trait SignerResponse: Verifiable + TimestampedResponse {

        // we rely on information provided from the api itself AS LONG AS it's not too outdated
        if self.timestamp() + stale_response_threshold < now {
-            warn!("stale signer response");
            return false;
        }

        if !self.has_signing_keys() {
-            warn!("missing signing keys");
+            debug!("missing signing keys");
            return false;
        }

        if self.signer_disabled() {
-            warn!("signer functionalities are explicitly disabled");
+            debug!("signer functionalities explicitly disabled");
            return false;
        }

        if !self.is_ecash_signer() {
-            warn!("signer doesn't recognise it's a signer for this epoch");
+            debug!("signer doesn't recognise it's a signer for this epoch");
            return false;
        }

        if dkg_epoch_id != self.dkg_ecash_epoch_id() {
-            warn!(
+            debug!(
                "mismatched dkg epoch id. current: {dkg_epoch_id}, signer's: {}",
                self.dkg_ecash_epoch_id()
            );
@@ -11,11 +11,10 @@ use nym_crypto::asymmetric::ed25519;
 use serde::{Deserialize, Serialize};
 use std::time::Duration;
 use time::OffsetDateTime;
-use tracing::warn;
 use utoipa::ToSchema;

-pub(crate) const CHAIN_STALL_THRESHOLD: Duration = Duration::from_secs(10 * 60);
-pub(crate) const STALE_RESPONSE_THRESHOLD: Duration = Duration::from_secs(10 * 60);
+pub(crate) const CHAIN_STALL_THRESHOLD: Duration = Duration::from_secs(5 * 60);
+pub(crate) const STALE_RESPONSE_THRESHOLD: Duration = Duration::from_secs(5 * 60);

 // the reason for generics is not to remove duplication of code,
 // but because without them, we'd be having problems with circular dependencies,
@@ -189,7 +188,6 @@ where
        };

        let SignerStatus::Tested { result } = &self.status else {
-            warn!("no valid chain response");
            return false;
        };
        result
@@ -241,7 +239,6 @@ where
        };

        let SignerStatus::Tested { result } = &self.status else {
-            warn!("no valid signer response");
            return false;
        };
        result.signing_status.signing_available(
@@ -195,9 +195,9 @@ impl ClientUnderTest {
 pub(crate) async fn check_client(
    dealer_details: DealerDetails,
    dkg_epoch: u64,
-    contract_share: Option<ContractVKShare>,
+    contract_share: Option<&ContractVKShare>,
 ) -> TypedSignerResult {
-    let dealer_information = RawDealerInformation::new(&dealer_details, contract_share.as_ref());
+    let dealer_information = RawDealerInformation::new(&dealer_details, contract_share);

    // 7. attempt to construct client instances out of them
    let Ok(parsed_information) = dealer_information.parse() else {
@@ -2,8 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::client_check::check_client;
-use futures::stream;
-use futures::stream::StreamExt;
+use futures::stream::{FuturesUnordered, StreamExt};
 use nym_ecash_signer_check_types::status::{SignerResult, Status};
 use nym_network_defaults::NymNetworkDetails;
 use nym_validator_client::QueryHttpRpcNyxdClient;
@@ -66,7 +65,7 @@ where
    C: DkgQueryClient + Sync,
 {
    let dkg_details = dkg_details_with_client(client).await?;
-    check_known_dealers(dkg_details, None).await
+    check_known_dealers(dkg_details).await
 }

 pub async fn dkg_details_with_client<C>(client: &C) -> Result<DkgDetails, SignerCheckError>
@@ -110,21 +109,18 @@ where

 pub async fn check_known_dealers(
    dkg_details: DkgDetails,
-    concurrency: impl Into<Option<usize>>,
 ) -> Result<SignersTestResult, SignerCheckError> {
    // 6. for each dealer attempt to perform the checks
-    let epoch_id = dkg_details.dkg_epoch.epoch_id;
-    let submitted = dkg_details.submitted_shared;
-    let dealers = dkg_details.network_dealers.len();
-
-    let tasks = dkg_details.network_dealers.into_iter().map(move |d| {
-        let share = submitted.get(&d.assigned_index).cloned();
-        check_client(d, epoch_id, share)
-    });
-
-    let limit = concurrency.into().filter(|&n| n > 0).unwrap_or(dealers);
-
-    let results = stream::iter(tasks).buffer_unordered(limit).collect().await;
+    let results = dkg_details
+        .network_dealers
+        .into_iter()
+        .map(|d| {
+            let share = dkg_details.submitted_shared.get(&d.assigned_index);
+            check_client(d, dkg_details.dkg_epoch.epoch_id, share)
+        })
+        .collect::<FuturesUnordered<_>>()
+        .collect::<Vec<_>>()
+        .await;

    Ok(SignersTestResult {
        threshold: dkg_details.threshold,
@@ -10,9 +10,7 @@ fn sanitize_fragment(segment: &str) -> &str {
    segment.trim_matches(|c: char| c.is_whitespace() || c == '/')
 }

-/// Defines a path that can be used to make a request to an API.
 pub trait RequestPath: Debug {
-    /// Sanitise the request path by removing empty segments and trimming whitespace and slashes
    fn to_sanitized_segments(&self) -> Vec<&str>;
 }

@@ -1,39 +0,0 @@
-// Copyright 2026 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use axum::extract::{ConnectInfo, FromRequestParts};
-use axum::http::request::Parts;
-use axum_client_ip::RightmostXForwardedFor;
-use std::convert::Infallible;
-use std::net::{IpAddr, Ipv4Addr, SocketAddr};
-use tracing::warn;
-
-/// Best-effort client IP extractor.
-///
-/// Prefers the rightmost entry of `X-Forwarded-For` (set by a trusted reverse
-/// proxy); falls back to the TCP peer address when the header is absent, and to
-/// the unspecified address when neither is available (tests).
-#[derive(Debug, Clone, Copy)]
-pub struct ClientIpAddr(pub IpAddr);
-
-impl<S> FromRequestParts<S> for ClientIpAddr
-where
-    S: Send + Sync,
-{
-    type Rejection = Infallible;
-
-    async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
-        if let Ok(RightmostXForwardedFor(ip)) =
-            RightmostXForwardedFor::from_request_parts(parts, state).await
-        {
-            return Ok(ClientIpAddr(ip));
-        }
-        if let Ok(ConnectInfo(addr)) =
-            ConnectInfo::<SocketAddr>::from_request_parts(parts, state).await
-        {
-            return Ok(ClientIpAddr(addr.ip()));
-        }
-        warn!("ClientIpAddr: no X-Forwarded-For or ConnectInfo found; using 0.0.0.0 fallback");
-        Ok(ClientIpAddr(IpAddr::V4(Ipv4Addr::UNSPECIFIED)))
-    }
-}
@@ -1,12 +1,12 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::middleware::client_ip::ClientIpAddr;
 use axum::extract::Request;
 use axum::http::HeaderValue;
 use axum::http::header::{HOST, USER_AGENT};
 use axum::middleware::Next;
 use axum::response::IntoResponse;
+use axum_client_ip::InsecureClientIp;
 use colored::Colorize;
 use std::time::Instant;
 use tracing::{debug, info};
@@ -17,24 +17,24 @@ enum LogLevel {
 }

 pub async fn log_request_info(
-    client_ip: ClientIpAddr,
+    insecure_client_ip: InsecureClientIp,
    request: Request,
    next: Next,
 ) -> impl IntoResponse {
-    log_request(client_ip, request, next, LogLevel::Info).await
+    log_request(insecure_client_ip, request, next, LogLevel::Info).await
 }

 pub async fn log_request_debug(
-    client_ip: ClientIpAddr,
+    insecure_client_ip: InsecureClientIp,
    request: Request,
    next: Next,
 ) -> impl IntoResponse {
-    log_request(client_ip, request, next, LogLevel::Debug).await
+    log_request(insecure_client_ip, request, next, LogLevel::Debug).await
 }

 /// Simple logger for requests
 async fn log_request(
-    ClientIpAddr(addr): ClientIpAddr,
+    InsecureClientIp(addr): InsecureClientIp,
    request: Request,
    next: Next,
    level: LogLevel,
@@ -2,5 +2,4 @@
 // SPDX-License-Identifier: Apache-2.0

 pub mod bearer_auth;
-pub mod client_ip;
 pub mod logging;
@@ -14,8 +14,6 @@ publish = true


 [features]
-default = ["codec"]
-codec = ["dep:tokio-util"]
 test-utils = ["pnet_packet"]

 [dependencies]
@@ -31,5 +29,6 @@ semver = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 thiserror = { workspace = true }
 time = { workspace = true }
-tokio-util = { workspace = true, features = ["codec"], optional = true }
+tokio = { workspace = true, features = ["time"] }
+tokio-util = { workspace = true, features = ["codec"] }
 tracing = { workspace = true }
@@ -1,7 +1,6 @@
 use std::time::Duration;

 use bytes::{Buf, Bytes, BytesMut};
-#[cfg(feature = "codec")]
 use tokio_util::codec::{Decoder, Encoder};

 #[derive(thiserror::Error, Debug)]
@@ -39,23 +38,6 @@ impl MultiIpPacketCodec {
        bundled_packets.extend_from_slice(&packet);
        bundled_packets.freeze()
    }
-
-    /// Decode one length-prefixed packet from `src`, advancing past it.
-    ///
-    /// Same logic as the `Decoder` impl but available without the `codec`
-    /// feature (i.e. without depending on `tokio-util`).
-    pub fn decode_one(&mut self, src: &mut BytesMut) -> Result<Option<IprPacket>, Error> {
-        if src.len() < LENGTH_PREFIX_SIZE {
-            return Ok(None);
-        }
-        let packet_size = u16::from_be_bytes([src[0], src[1]]) as usize;
-        if src.len() < packet_size + LENGTH_PREFIX_SIZE {
-            return Ok(None);
-        }
-        src.advance(LENGTH_PREFIX_SIZE);
-        let packet = src.split_to(packet_size);
-        Ok(Some(IprPacket::Data(packet.freeze())))
-    }
 }

 impl Default for MultiIpPacketCodec {
@@ -100,7 +82,6 @@ impl From<Vec<u8>> for IprPacket {
    }
 }

-#[cfg(feature = "codec")]
 impl Encoder<IprPacket> for MultiIpPacketCodec {
    type Error = Error;

@@ -144,7 +125,6 @@ impl Encoder<IprPacket> for MultiIpPacketCodec {
    }
 }

-#[cfg(feature = "codec")]
 impl Decoder for MultiIpPacketCodec {
    type Item = IprPacket;
    type Error = Error;
@@ -172,7 +152,7 @@ impl Decoder for MultiIpPacketCodec {
    }
 }

-#[cfg(all(test, feature = "codec"))]
+#[cfg(test)]
 mod tests {
    use super::*;

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use bytes::{Bytes, BytesMut};
+use tokio_util::codec::Decoder;
 use tracing::{error, info, warn};

 use crate::{
@@ -83,7 +84,7 @@ pub fn handle_ipr_response(data: &[u8]) -> Option<MixnetMessageOutcome> {
                let mut buf = BytesMut::from(data_response.ip_packet.as_ref());
                let mut packets = Vec::new();
                loop {
-                    match codec.decode_one(&mut buf) {
+                    match codec.decode(&mut buf) {
                        Ok(Some(packet)) => packets.push(packet.into_bytes()),
                        Ok(None) => break,
                        Err(e) => {
@@ -19,10 +19,11 @@ exclude = ["build.rs"]

 [dependencies]
 dotenvy = { workspace = true, optional = true }
+log = { workspace = true, optional = true }
 schemars = { workspace = true, features = ["preserve_order"], optional = true }
 serde = { workspace = true, features = ["derive"], optional = true }
-serde_json = { workspace = true, optional = true }
-tracing = { workspace = true, optional = true }
+serde_json = {workspace = true, optional = true }
+tracing = {workspace = true, optional = true }
 url = { workspace = true, optional = true }
 utoipa = { workspace = true, optional = true }

@@ -31,9 +32,9 @@ utoipa = { workspace = true, optional = true }

 [features]
 default = ["env", "network"]
-env = ["dotenvy", "serde_json", "tracing"]
+env = ["dotenvy", "log", "serde_json", "tracing"]
 network = ["schemars", "serde", "url"]
-utoipa = ["dep:utoipa"]
+utoipa = [ "dep:utoipa" ]

 [build-dependencies]
 regex = { workspace = true }
@@ -27,20 +27,16 @@ fn print_env_vars_with_keys_in_file<P: AsRef<Path> + Copy>(config_env_file: P) {
        .expect("Invalid path to environment configuration file");
    for item in items {
        let (key, val) = item.expect("Invalid item in environment configuration file");
-        tracing::debug!("{key}: {val}");
+        log::debug!("{key}: {val}");
    }
 }

-pub fn env_configured() -> bool {
-    std::env::var(var_names::CONFIGURED).is_ok()
-}
-
 pub fn setup_env<P: AsRef<Path>>(config_env_file: Option<P>) {
    match std::env::var(var_names::CONFIGURED) {
        // if the configuration is not already set in the env vars
        Err(std::env::VarError::NotPresent) => {
            if let Some(config_env_file) = &config_env_file {
-                tracing::debug!(
+                log::debug!(
                    "Loading environment variables from {:?}",
                    config_env_file.as_ref()
                );
@@ -51,12 +47,12 @@ pub fn setup_env<P: AsRef<Path>>(config_env_file: Option<P>) {
                // if nothing is set, the use mainnet defaults
                // if the user has not set `CONFIGURED`, then even if they set any of the env variables,
                // overwrite them
-                tracing::debug!("Loading mainnet defaults");
+                log::debug!("Loading mainnet defaults");
                crate::mainnet::export_to_env();
            }
        }
        Err(_) => {
-            tracing::debug!("Environment variables already set. Using them");
+            log::debug!("Environment variables already set. Using them");
            crate::mainnet::export_to_env()
        }
        _ => {
@@ -22,10 +22,10 @@ pub const VESTING_CONTRACT_ADDRESS: &str =
 pub const PERFORMANCE_CONTRACT_ADDRESS: &str = "";
 // /\ TODO: this has to be updated once the contract is deployed

-pub const NETWORK_MONITORS_CONTRACT_ADDRESS: &str =
-    "n1m3a2ltkjqud8mkmrpqvgllrtv2p4r6js6qwl7p8cqkzrq8jg6e2qwqgl8z";
-pub const NODE_FAMILIES_CONTRACT_ADDRESS: &str =
-    "n1na0vys0z077hq3zrz6pfea85zgv8ks3t5zysdt6y38c87q045hnsyf2g5x";
+// \/ TODO: this has to be updated once the contract is deployed
+pub const NODE_FAMILIES_CONTRACT_ADDRESS: &str = "";
+// /\ TODO: this has to be updated once the contract is deployed
+
 pub const ECASH_CONTRACT_ADDRESS: &str =
    "n1r7s6aksyc6pqardx88k3rkgfagwvj4z4zum9mmz2sfk3zm2mha0sd4dnun";
 pub const GROUP_CONTRACT_ADDRESS: &str =
@@ -40,10 +40,6 @@ pub const REWARDING_VALIDATOR_ADDRESS: &str = "n10yyd98e2tuwu0f7ypz9dy3hhjw7v772
 pub const NYXD_URL: &str = "https://rpc.nymtech.net";
 pub const NYXD_WS: &str = "wss://rpc.nymtech.net/websocket";

-// cluster of lite rpc nodes (not part of consensus, aggressive pruning, no archival state)
-pub const NYXD_QUERY_LITE: &str = "https://blockstream.nymtech.net";
-pub const NYXD_WS_LITE: &str = "wss://blockstream.nymtech.net/websocket";
-
 pub const NYM_API: &str = "https://validator.nymtech.net/api/";
 #[cfg(feature = "network")]
 pub const NYM_APIS: &[ApiUrlConst] = &[
@@ -141,11 +137,6 @@ pub fn read_parsed_var_if_not_default<T: std::str::FromStr>(
        .map(std::str::FromStr::from_str)
 }

-#[cfg(feature = "env")]
-pub fn read_parsed_var<T: std::str::FromStr>(var: &str) -> Result<T, T::Err> {
-    std::env::var(var).unwrap_or_default().parse()
-}
-
 #[cfg(all(feature = "env", feature = "network"))]
 pub fn export_to_env() {
    use crate::var_names;
@@ -176,14 +167,6 @@ pub fn export_to_env() {
        var_names::COCONUT_DKG_CONTRACT_ADDRESS,
        COCONUT_DKG_CONTRACT_ADDRESS,
    );
-    set_var_to_default(
-        var_names::PERFORMANCE_CONTRACT_ADDRESS,
-        PERFORMANCE_CONTRACT_ADDRESS,
-    );
-    set_var_to_default(
-        var_names::NETWORK_MONITORS_CONTRACT_ADDRESS,
-        NETWORK_MONITORS_CONTRACT_ADDRESS,
-    );
    set_var_to_default(
        var_names::REWARDING_VALIDATOR_ADDRESS,
        REWARDING_VALIDATOR_ADDRESS,
@@ -203,8 +186,6 @@ pub fn export_to_env() {
        var_names::UPGRADE_MODE_ATTESTER_ED25519_BS58_PUBKEY,
        UPGRADE_MODE_ATTESTER_ED25519_BS58_PUBKEY,
    );
-    set_var_to_default(var_names::NYXD_QUERY_LITE, NYXD_QUERY_LITE);
-    set_var_to_default(var_names::NYXD_WS_LITE, NYXD_WS_LITE);
 }

 #[cfg(all(feature = "env", feature = "network"))]
@@ -256,6 +237,4 @@ pub fn export_to_env_if_not_set() {
        var_names::UPGRADE_MODE_ATTESTER_ED25519_BS58_PUBKEY,
        UPGRADE_MODE_ATTESTER_ED25519_BS58_PUBKEY,
    );
-    set_var_conditionally_to_default(var_names::NYXD_QUERY_LITE, NYXD_QUERY_LITE);
-    set_var_conditionally_to_default(var_names::NYXD_WS_LITE, NYXD_WS_LITE);
 }
@@ -40,8 +40,6 @@ pub struct NymContracts {
    #[serde(default)]
    pub performance_contract_address: Option<String>,
    #[serde(default)]
-    pub network_monitors_contract_address: Option<String>,
-    #[serde(default)]
    pub node_families_contract_address: Option<String>,
    pub ecash_contract_address: Option<String>,
    pub group_contract_address: Option<String>,
@@ -76,15 +74,6 @@ pub struct ApiUrl {
    pub front_hosts: Option<Vec<String>>,
 }

-impl From<Url> for ApiUrl {
-    fn from(value: Url) -> Self {
-        ApiUrl {
-            url: value.to_string(),
-            front_hosts: None,
-        }
-    }
-}
-
 #[derive(Copy, Clone, Debug, Serialize)]
 pub struct ApiUrlConst<'a> {
    pub url: &'a str,
@@ -194,10 +183,6 @@ impl NymNetworkDetails {
            .with_group_contract(get_optional_env(var_names::GROUP_CONTRACT_ADDRESS))
            .with_multisig_contract(get_optional_env(var_names::MULTISIG_CONTRACT_ADDRESS))
            .with_coconut_dkg_contract(get_optional_env(var_names::COCONUT_DKG_CONTRACT_ADDRESS))
-            .with_performance_contract(get_optional_env(var_names::PERFORMANCE_CONTRACT_ADDRESS))
-            .with_network_monitors_contract(get_optional_env(
-                var_names::NETWORK_MONITORS_CONTRACT_ADDRESS,
-            ))
            .with_nym_vpn_api_url(get_optional_env(var_names::NYM_VPN_API))
            .with_nym_vpn_api_urls(nym_vpn_api_urls)
            .with_nym_api_urls(nym_api_urls)
@@ -219,9 +204,6 @@ impl NymNetworkDetails {
                performance_contract_address: parse_optional_str(
                    mainnet::PERFORMANCE_CONTRACT_ADDRESS,
                ),
-                network_monitors_contract_address: parse_optional_str(
-                    mainnet::NETWORK_MONITORS_CONTRACT_ADDRESS,
-                ),
                node_families_contract_address: parse_optional_str(
                    mainnet::NODE_FAMILIES_CONTRACT_ADDRESS,
                ),
@@ -252,7 +234,7 @@ impl NymNetworkDetails {

        fn set_optional_var(var_name: &str, value: Option<String>) {
            if let Some(value) = value {
-                unsafe { set_var(var_name, value) }
+                unsafe {set_var(var_name, value)}
            }
        }
        unsafe {
@@ -278,7 +260,6 @@ impl NymNetworkDetails {

            set_optional_var(var_names::MIXNET_CONTRACT_ADDRESS, self.contracts.mixnet_contract_address);
            set_optional_var(var_names::VESTING_CONTRACT_ADDRESS, self.contracts.vesting_contract_address);
-            set_optional_var(var_names::NETWORK_MONITORS_CONTRACT_ADDRESS, self.contracts.network_monitors_contract_address);
            set_optional_var(var_names::NODE_FAMILIES_CONTRACT_ADDRESS, self.contracts.node_families_contract_address);
            set_optional_var(var_names::ECASH_CONTRACT_ADDRESS, self.contracts.ecash_contract_address);
            set_optional_var(var_names::GROUP_CONTRACT_ADDRESS, self.contracts.group_contract_address);
@@ -398,31 +379,15 @@ impl NymNetworkDetails {
        self
    }

-    #[must_use]
-    pub fn with_performance_contract<S: Into<String>>(mut self, contract: Option<S>) -> Self {
-        self.contracts.performance_contract_address = contract.map(Into::into);
-        self
-    }
-
-    #[must_use]
-    pub fn with_network_monitors_contract<S: Into<String>>(mut self, contract: Option<S>) -> Self {
-        self.contracts.network_monitors_contract_address = contract.map(Into::into);
-        self
-    }
-
    #[must_use]
    pub fn with_nym_vpn_api_url<S: Into<String>>(mut self, endpoint: Option<S>) -> Self {
        self.nym_vpn_api_url = endpoint.map(Into::into);
        self
    }

-    pub fn set_nym_api_urls<U: Into<ApiUrl>>(&mut self, urls: Vec<U>) {
-        self.nym_api_urls = Some(urls.into_iter().map(Into::into).collect());
-    }
-
    #[must_use]
-    pub fn with_nym_api_urls<U: Into<ApiUrl>>(mut self, urls: Vec<U>) -> Self {
-        self.set_nym_api_urls(urls);
+    pub fn with_nym_api_urls(mut self, urls: Vec<ApiUrl>) -> Self {
+        self.nym_api_urls = Some(urls);
        self
    }

@@ -19,15 +19,11 @@ pub const GROUP_CONTRACT_ADDRESS: &str = "GROUP_CONTRACT_ADDRESS";
 pub const MULTISIG_CONTRACT_ADDRESS: &str = "MULTISIG_CONTRACT_ADDRESS";
 pub const NODE_FAMILIES_CONTRACT_ADDRESS: &str = "NODE_FAMILIES_CONTRACT_ADDRESS";
 pub const COCONUT_DKG_CONTRACT_ADDRESS: &str = "COCONUT_DKG_CONTRACT_ADDRESS";
-pub const PERFORMANCE_CONTRACT_ADDRESS: &str = "PERFORMANCE_CONTRACT_ADDRESS";
-pub const NETWORK_MONITORS_CONTRACT_ADDRESS: &str = "NETWORK_MONITORS_CONTRACT_ADDRESS";
 pub const REWARDING_VALIDATOR_ADDRESS: &str = "REWARDING_VALIDATOR_ADDRESS";
 pub const NYXD: &str = "NYXD";
 pub const NYM_API: &str = "NYM_API";
 pub const NYM_APIS: &str = "NYM_APIS";
 pub const NYXD_WEBSOCKET: &str = "NYXD_WS";
-pub const NYXD_QUERY_LITE: &str = "NYXD_LITE";
-pub const NYXD_WS_LITE: &str = "NYXD_WS_LITE";
 pub const EXIT_POLICY_URL: &str = "EXIT_POLICY";
 pub const NYM_VPN_API: &str = "NYM_VPN_API";
 pub const NYM_VPN_APIS: &str = "NYM_VPN_APIS";
@@ -18,7 +18,7 @@ bytes.workspace = true
 futures.workspace = true
 nym-config = { workspace = true }
 nym-common = { workspace = true }
-nym-ip-packet-requests = { workspace = true, default-features = true }
+nym-ip-packet-requests = { workspace = true }
 nym-sdk = { workspace = true }
 pnet_packet.workspace = true
 thiserror.workspace = true
@@ -25,9 +25,6 @@ pub enum Error {

    #[error("failed to create ipv4 packet")]
    Ipv4PacketCreationFailure,
-
-    #[error("packet length {length} exceeds the u16 IP header field")]
-    PacketLengthOverflow { length: usize },
 }

 // Result type based on our error type
@@ -79,14 +79,9 @@ pub fn wrap_icmp_in_ipv4(
    let mut ipv4_packet =
        MutableIpv4Packet::owned(ipv4_buffer).ok_or(Error::Ipv4PacketCreationFailure)?;

-    let total_length_u16 =
-        u16::try_from(total_length).map_err(|_| Error::PacketLengthOverflow {
-            length: total_length,
-        })?;
-
    ipv4_packet.set_version(4);
    ipv4_packet.set_header_length(5);
-    ipv4_packet.set_total_length(total_length_u16);
+    ipv4_packet.set_total_length(total_length as u16);
    ipv4_packet.set_ttl(64);
    ipv4_packet.set_next_level_protocol(pnet_packet::ip::IpNextHeaderProtocols::Icmp);
    ipv4_packet.set_source(source);
@@ -106,18 +101,12 @@ pub fn wrap_icmp_in_ipv6(
    source: Ipv6Addr,
    destination: Ipv6Addr,
 ) -> Result<Ipv6Packet> {
-    let payload_length = icmp_echo_request.packet().len();
-    let payload_length_u16 =
-        u16::try_from(payload_length).map_err(|_| Error::PacketLengthOverflow {
-            length: payload_length,
-        })?;
-
-    let ipv6_buffer = vec![0u8; 40 + payload_length];
+    let ipv6_buffer = vec![0u8; 40 + icmp_echo_request.packet().len()];
    let mut ipv6_packet =
        MutableIpv6Packet::owned(ipv6_buffer).ok_or(Error::Ipv4PacketCreationFailure)?;

    ipv6_packet.set_version(6);
-    ipv6_packet.set_payload_length(payload_length_u16);
+    ipv6_packet.set_payload_length(icmp_echo_request.packet().len() as u16);
    ipv6_packet.set_next_header(pnet_packet::ip::IpNextHeaderProtocols::Icmpv6);
    ipv6_packet.set_hop_limit(64);
    ipv6_packet.set_source(source);
@@ -175,122 +164,3 @@ pub(crate) fn is_icmp_v6_echo_reply(packet: &Bytes) -> Option<(u16, Ipv6Addr, Ip
    }
    None
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use pnet_packet::icmp::IcmpTypes;
-    use pnet_packet::icmpv6::Icmpv6Types;
-    use pnet_packet::ip::IpNextHeaderProtocols;
-
-    const V4_SRC: Ipv4Addr = Ipv4Addr::new(10, 0, 0, 1);
-    const V4_DST: Ipv4Addr = Ipv4Addr::new(10, 0, 0, 2);
-    const V6_SRC: Ipv6Addr = Ipv6Addr::new(0xfe80, 0, 0, 0, 0, 0, 0, 1);
-    const V6_DST: Ipv6Addr = Ipv6Addr::new(0xfe80, 0, 0, 0, 0, 0, 0, 2);
-
-    #[test]
-    fn icmpv4_echo_request_sets_fields_and_valid_checksum() {
-        let echo = create_icmpv4_echo_request(42, 7).unwrap();
-        assert_eq!(echo.get_sequence_number(), 42);
-        assert_eq!(echo.get_identifier(), 7);
-        assert_eq!(echo.get_icmp_type(), IcmpTypes::EchoRequest);
-
-        // pnet's `checksum` skips the checksum word, so recomputing on the produced
-        // packet must equal the stored value.
-        let icmp = IcmpPacket::new(echo.packet()).unwrap();
-        assert_eq!(echo.get_checksum(), pnet_packet::icmp::checksum(&icmp));
-    }
-
-    #[test]
-    fn icmpv6_echo_request_sets_fields_and_valid_checksum() {
-        let echo = create_icmpv6_echo_request(99, 12, &V6_SRC, &V6_DST).unwrap();
-        assert_eq!(echo.get_sequence_number(), 99);
-        assert_eq!(echo.get_identifier(), 12);
-        assert_eq!(echo.get_icmpv6_type(), Icmpv6Types::EchoRequest);
-
-        let icmpv6 = icmpv6::Icmpv6Packet::new(echo.packet()).unwrap();
-        assert_eq!(
-            echo.get_checksum(),
-            pnet_packet::icmpv6::checksum(&icmpv6, &V6_SRC, &V6_DST)
-        );
-    }
-
-    #[test]
-    fn wrap_icmp_in_ipv4_sets_headers_and_payload() {
-        let echo = create_icmpv4_echo_request(1, 2).unwrap();
-        let echo_bytes = echo.packet().to_vec();
-        let packet = wrap_icmp_in_ipv4(echo, V4_SRC, V4_DST).unwrap();
-
-        assert_eq!(packet.get_version(), 4);
-        assert_eq!(packet.get_header_length(), 5);
-        assert_eq!(packet.get_total_length() as usize, 20 + echo_bytes.len());
-        assert_eq!(packet.get_ttl(), 64);
-        assert_eq!(
-            packet.get_next_level_protocol(),
-            IpNextHeaderProtocols::Icmp
-        );
-        assert_eq!(packet.get_source(), V4_SRC);
-        assert_eq!(packet.get_destination(), V4_DST);
-        assert_eq!(packet.payload(), echo_bytes.as_slice());
-    }
-
-    #[test]
-    fn wrap_icmp_in_ipv6_sets_headers_and_payload() {
-        let echo = create_icmpv6_echo_request(1, 2, &V6_SRC, &V6_DST).unwrap();
-        let echo_bytes = echo.packet().to_vec();
-        let packet = wrap_icmp_in_ipv6(echo, V6_SRC, V6_DST).unwrap();
-
-        assert_eq!(packet.get_version(), 6);
-        assert_eq!(packet.get_payload_length() as usize, echo_bytes.len());
-        assert_eq!(packet.get_next_header(), IpNextHeaderProtocols::Icmpv6);
-        assert_eq!(packet.get_hop_limit(), 64);
-        assert_eq!(packet.get_source(), V6_SRC);
-        assert_eq!(packet.get_destination(), V6_DST);
-        assert_eq!(packet.payload(), echo_bytes.as_slice());
-    }
-
-    #[test]
-    fn compute_ipv4_checksum_is_zero_on_correctly_checksummed_packet() {
-        let echo = create_icmpv4_echo_request(1, 2).unwrap();
-        let packet = wrap_icmp_in_ipv4(echo, V4_SRC, V4_DST).unwrap();
-        // RFC 1071: summing every 16-bit word of a header that already contains its
-        // own checksum yields all-ones; the one's complement is therefore zero.
-        assert_eq!(compute_ipv4_checksum(&packet), 0);
-    }
-
-    #[test]
-    fn is_icmp_echo_reply_extracts_identifier_and_addresses() {
-        // pnet's EchoReply/EchoRequest share the same byte layout (only the ICMP
-        // type field differs) and `is_icmp_echo_reply` does not check the type,
-        // so a wrapped echo *request* exercises the same parsing path.
-        let identifier = 1234;
-        let echo = create_icmpv4_echo_request(7, identifier).unwrap();
-        let packet = wrap_icmp_in_ipv4(echo, V4_SRC, V4_DST).unwrap();
-        let bytes = Bytes::copy_from_slice(packet.packet());
-
-        assert_eq!(
-            is_icmp_echo_reply(&bytes),
-            Some((identifier, V4_SRC, V4_DST))
-        );
-    }
-
-    #[test]
-    fn is_icmp_v6_echo_reply_extracts_identifier_and_addresses() {
-        let identifier = 5678;
-        let echo = create_icmpv6_echo_request(7, identifier, &V6_SRC, &V6_DST).unwrap();
-        let packet = wrap_icmp_in_ipv6(echo, V6_SRC, V6_DST).unwrap();
-        let bytes = Bytes::copy_from_slice(packet.packet());
-
-        assert_eq!(
-            is_icmp_v6_echo_reply(&bytes),
-            Some((identifier, V6_SRC, V6_DST))
-        );
-    }
-
-    #[test]
-    fn is_icmp_echo_reply_returns_none_for_undersized_bytes() {
-        let bytes = Bytes::from_static(&[0u8; 4]);
-        assert!(is_icmp_echo_reply(&bytes).is_none());
-        assert!(is_icmp_v6_echo_reply(&bytes).is_none());
-    }
-}
@@ -6,7 +6,7 @@ use std::{

 use ansi_term::Color::Yellow;
 use bytes::{Buf, BytesMut};
-use log::{debug, error, trace, warn};
+use log::{debug, error, warn};
 use std::thread;

 use crate::MAX_RTO;
@@ -499,9 +499,21 @@ impl KcpSession {
            self.snd_buf.len(),
            post_retain_sns
        );
+        // Corrected format string arguments for the removed count log
+        debug!(
+            "[ConvID: {}, Thread: {:?}] parse_una(una={}): Removed {} segment(s) from snd_buf ({} -> {}). Remaining sns: {:?}",
+            self.conv,
+            thread::current().id(),
+            una,
+            removed_count,
+            original_len,
+            self.snd_buf.len(),
+            post_retain_sns
+        );

-        if removed_count == 0 {
-            trace!(
+        if removed_count > 0 {
+            // Use trace level if no segments were removed but buffer wasn't empty
+            debug!(
                "[ConvID: {}, Thread: {:?}] parse_una(una={}): No segments removed from snd_buf (len={}). Remaining sns: {:?}",
                self.conv,
                thread::current().id(),
@@ -509,17 +521,6 @@ impl KcpSession {
                original_len,
                self.snd_buf.iter().map(|s| s.sn).collect::<Vec<_>>()
            );
-        } else {
-            debug!(
-                "[ConvID: {}, Thread: {:?}] parse_una(una={}): Removed {} segment(s) from snd_buf ({} -> {}). Remaining sns: {:?}",
-                self.conv,
-                thread::current().id(),
-                una,
-                removed_count,
-                original_len,
-                self.snd_buf.len(),
-                post_retain_sns
-            );
        }

        // Update the known acknowledged sequence number.
@@ -1,7 +1,7 @@
 [package]
 name = "nym-kkt"
 description = "Key transport protocol for the Nym network"
-version = "1.21.1"
+version = "1.21.0"
 authors = ["Georgio Nicolas <georgio@nymtech.net>"]
 edition = { workspace = true }
 license.workspace = true
@@ -4,13 +4,11 @@ description = "Lewes Protocol data structure for the Nym network"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 license.workspace = true
 repository.workspace = true
 homepage.workspace = true
 documentation.workspace = true
-rust-version.workspace = true
-readme.workspace = true
-publish = true

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

@@ -23,5 +21,9 @@ thiserror.workspace = true
 nym-common.workspace = true


+[dev-dependencies]
+nym-lp.workspace = true
+
+
 [lints]
 workspace = true
@@ -0,0 +1,103 @@
+# nym-lp-data
+
+Trait definitions and data structures for Lewes Protocol (LP) processing pipelines in the Nym mixnet.
+
+This crate is a *vocabulary* crate — it defines the traits that clients and mix nodes implement to compose a packet-processing pipeline, plus a few generic data wrappers (`TimedData`, `AddressedTimedData`, `PipelineData`) that thread per-packet state through every stage. It contains no concrete cryptography, transport, or network code. A concrete implementation live in [`nym-mix-sim`](../../nym-mix-sim).
+
+## Crate layout
+
+| Module | Purpose |
+|--------|---------|
+| [`common`](src/common)     | Wire-layer traits ([`Framing`], [`FramingUnwrap`], [`Transport`], [`TransportUnwrap`]) and their composed supertraits ([`WireWrappingPipeline`], [`WireUnwrappingPipeline`]) shared by both clients and mixnodes, plus [`NoOpWireWrapper`] / [`NoOpWireUnwrapper`] marker traits for opting into a pass-through wire layer |
+| [`clients`](src/clients)   | Client-side outbound/inbound pipeline traits: [`Chunking`], [`Reliability`], [`Obfuscation`], [`RoutingSecurity`], plus the supertraits [`ClientWrappingPipeline`] / [`ClientUnwrappingPipeline`], a `Pipeline` composition struct, no-op marker traits, and a tick-driven [`ClientWrappingPipelineDriver`] |
+| [`mixnodes`](src/mixnodes) | Mixnode processing trait [`NymNodeProcessingPipeline`] (unwrap → mix → re-wrap) and a `Pipeline` composition struct |
+
+[`Framing`]: src/common/traits.rs
+[`FramingUnwrap`]: src/common/traits.rs
+[`Transport`]: src/common/traits.rs
+[`TransportUnwrap`]: src/common/traits.rs
+[`WireWrappingPipeline`]: src/common/traits.rs
+[`WireUnwrappingPipeline`]: src/common/traits.rs
+[`NoOpWireWrapper`]: src/common/helpers.rs
+[`NoOpWireUnwrapper`]: src/common/helpers.rs
+[`Chunking`]: src/clients/traits.rs
+[`Reliability`]: src/clients/traits.rs
+[`Obfuscation`]: src/clients/traits.rs
+[`RoutingSecurity`]: src/clients/traits.rs
+[`ClientWrappingPipeline`]: src/clients/traits.rs
+[`ClientUnwrappingPipeline`]: src/clients/traits.rs
+[`ClientWrappingPipelineDriver`]: src/clients/driver.rs
+[`NymNodeProcessingPipeline`]: src/mixnodes/traits.rs
+
+## Core data types
+
+```text
+TimedData<Ts, D>           ──  pairs a value of type D with a timestamp Ts
+TimedPayload<Ts>           ──  alias for TimedData<Ts, Vec<u8>>
+
+AddressedTimedData<Ts, D, NdId>  ──  TimedData plus a destination address
+AddressedTimedPayload<Ts, NdId>  ──  alias for AddressedTimedData<Ts, Vec<u8>, NdId>
+
+PipelineData<Ts, D, Opts, NdId>  ──  TimedData plus per-message Opts
+                                     (used inside the client wrapping pipeline)
+PipelinePayload<Ts, Opts, NdId>  ──  alias for PipelineData<Ts, Vec<u8>, Opts, NdId>
+```
+
+`Ts` is the timestamp / tick-context type, `NdId` is the next-hop identifier type, and `Opts` is an [`InputOptions`](src/clients/mod.rs)-implementing per-message marker that toggles which optional pipeline stages run for a given payload (reliability, obfuscation, routing security).
+
+## Client wrapping pipeline
+
+The outbound client pipeline composes six stages, each represented by its own trait:
+
+```text
+                               Vec<u8>  ──▶  Chunking  ──▶  Reliability  ──▶  Obfuscation
+                                                                                   │
+                                                                                   ▼
+        AddressedTimedData<Ts, Pkt, NdId>  ◀──  Transport  ◀──  Framing  ◀──  RoutingSecurity
+```
+
+[`ClientWrappingPipeline`] is the supertrait that ties them together and provides a default `process()` method which runs all six stages in order on every tick. Each stage is opt-in per message via the active [`InputOptions`].
+
+### Pipeline tick semantics
+
+`process()` is intended to be called on every tick (with or without an input payload):
+
+- [`Reliability::reliable_encode`] is always called once with `Some(input)` (when present), then once more with `None` so that timer-driven retransmissions can fire even when no new payload arrived.
+- [`Obfuscation::obfuscate`] follows the same pattern — once with the real input and once with `None` so that cover-traffic loops can fire on idle ticks.
+- [`Chunking`] and [`RoutingSecurity`] only run when a payload is actually present.
+
+This convention is what allows pipelines to support Poisson cover traffic and SURB-ACK retransmission without the caller having to know whether anything is in flight.
+
+## Mixnode processing pipeline
+
+The mixnode pipeline is simpler — three stages that consume a packet and emit zero or more re-wrapped output packets:
+
+```text
+Pkt  ──▶  WireUnwrappingPipeline  ──▶  mix  ──▶  WireWrappingPipeline  ──▶  Vec<AddressedTimedData<Ts, Pkt, NdId>>
+        (TransportUnwrap +              ▲       (Framing + Transport)
+         FramingUnwrap)                 │
+                                        └──  implementor decrypts, routes,
+                                              schedules delays, etc.
+```
+
+Implementors fill in `mix()`; everything else is provided by the [`NymNodeProcessingPipeline`] supertrait's default `process()`.
+
+## Helpers
+
+- **Client-stage no-op marker traits** ([`NoOpReliability`], [`NoOpRoutingSecurity`], [`NoOpObfuscation`] in [`clients/helpers.rs`](src/clients/helpers.rs)) — implement these to opt out of a pipeline stage with zero overhead. Useful for stub or testing pipelines.
+- **Wire-layer no-op marker traits** ([`NoOpWireWrapper`], [`NoOpWireUnwrapper`] in [`common/helpers.rs`](src/common/helpers.rs)) — collapse the entire wire layer (framing + transport, or their inverses) to a pass-through. Use these when your packet type is already self-contained on the wire (e.g. a Sphinx packet) and needs no extra framing or transport header. `NoOpWireWrapper` requires `Pkt: From<Vec<u8>>`; `NoOpWireUnwrapper` requires `Pkt: Into<Vec<u8>>` and `Mk: Default`.
+- **`Pipeline` composition structs** (in [`clients/types.rs`](src/clients/types.rs)) — generic structs that aggregate one component per pipeline stage and provide blanket impls of the relevant supertraits, so you can build a working pipeline by plugging in any combination of stage implementations.
+- **[`ClientWrappingPipelineDriver`](src/clients/driver.rs)** — wraps a dyn-compatible client pipeline behind a tick-driven `tick(timestamp) -> Vec<(Pkt, NdId)>` interface, with an internal mpsc channel for application-supplied input payloads. Reads new input only when the internal buffer is empty so buffered packets do not stack additional latency on top.
+
+[`NoOpReliability`]: src/clients/helpers.rs
+[`NoOpRoutingSecurity`]: src/clients/helpers.rs
+[`NoOpObfuscation`]: src/clients/helpers.rs
+[`InputOptions`]: src/clients/mod.rs
+[`Reliability::reliable_encode`]: src/clients/traits.rs
+[`Obfuscation::obfuscate`]: src/clients/traits.rs
+
+## Example users
+
+[`nym-mix-sim`](../../nym-mix-sim) is the reference consumer: it ships two complete pipeline implementations (a pass-through `Simple*` family and a full Sphinx + Poisson + SURB-ACK family) on top of the traits defined here. See its source for end-to-end examples of implementing each pipeline stage.
+
+The integration test under [`tests/integration`](tests/integration) wires together a small synthetic pipeline (`MockChunking`, `KcpReliability`, `SphinxSecurity`, `KekwObfuscation`, `LpFraming`, `LpTransport`) against the [`nym-lp`](../nym-lp) packet types — a useful starting point if you want to read a self-contained example of every trait being implemented.
@@ -0,0 +1,93 @@
+// Copyright 2026 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use std::sync::mpsc;
+
+use crate::AddressedTimedData;
+use crate::clients::InputOptions;
+use crate::clients::traits::DynClientWrappingPipeline;
+
+/// Drives a [`DynClientWrappingPipeline`] tick-by-tick, feeding it raw application
+/// payloads and emitting transport packets whose scheduled timestamp is due.
+///
+/// ## How it works
+///
+/// 1. The caller submits raw byte payloads via [`ClientWrappingPipelineDriver::input_sender`].
+/// 2. On each call to [`ClientWrappingPipelineDriver::tick`], the driver reads one pending
+///    payload (only when both the packet buffer and the obfuscation buffer are
+///    empty, to avoid adding extra latency on top of buffered data), runs it
+///    through the pipeline, and appends the resulting timestamped packets to an
+///    internal buffer.
+/// 3. Packets whose `timestamp ≤ now` are extracted from the buffer and
+///    returned to the caller for sending.
+///
+/// `Ts` must implement `Clone + PartialOrd` so that timestamps can be compared
+/// to decide which packets are due.
+///
+pub struct ClientWrappingPipelineDriver<Ts, Pkt, Opts, NdId>
+where
+    Ts: Clone + PartialOrd,
+    Opts: InputOptions<NdId>,
+{
+    pipeline: Box<dyn DynClientWrappingPipeline<Ts, Pkt, Opts, NdId>>,
+
+    packet_buffer: Vec<AddressedTimedData<Ts, Pkt, NdId>>,
+
+    input: mpsc::Receiver<(Vec<u8>, Opts)>,
+
+    // Keeping a ref so we don't have problem about it being dropped
+    input_sender: mpsc::SyncSender<(Vec<u8>, Opts)>,
+}
+
+impl<Ts, Pkt, Opts, NdId> ClientWrappingPipelineDriver<Ts, Pkt, Opts, NdId>
+where
+    Ts: Clone + PartialOrd,
+    Opts: InputOptions<NdId>,
+{
+    /// Create a new driver wrapping `pipeline`.
+    ///
+    /// Internally allocates a zero-capacity `sync_channel` for input payloads.
+    pub fn new(pipeline: impl DynClientWrappingPipeline<Ts, Pkt, Opts, NdId> + 'static) -> Self {
+        let (input_sender, input_receiver) = mpsc::sync_channel(0);
+
+        Self {
+            pipeline: Box::new(pipeline),
+            packet_buffer: Vec::new(),
+            input: input_receiver,
+            input_sender,
+        }
+    }
+
+    /// Return a clone of the sender half of the input channel.
+    ///
+    /// Send raw application payloads here; they will be picked up on the next
+    /// tick when the pipeline's internal buffers are empty.
+    pub fn input_sender(&self) -> mpsc::SyncSender<(Vec<u8>, Opts)> {
+        self.input_sender.clone()
+    }
+
+    /// Advance the driver by one tick.
+    ///
+    /// Reads a pending input payload (if both the packet buffer and the
+    /// obfuscation buffer are empty), runs it through the pipeline, then
+    /// returns all packets whose `timestamp ≤ now`.
+    pub fn tick(&mut self, timestamp: Ts) -> Vec<(Pkt, NdId)> {
+        // We're reading a message only if our buffer is empty
+        // Otherwise, we will have buffers adding latencies to data
+        let next_message = if self.packet_buffer.is_empty() {
+            self.input
+                .try_recv()
+                .inspect_err(|_| tracing::trace!("No message in the queue"))
+                .ok()
+        } else {
+            None
+        };
+        self.packet_buffer
+            .extend(self.pipeline.process(next_message, timestamp.clone()));
+
+        self.packet_buffer
+            .extract_if(.., |p| p.data.timestamp <= timestamp)
+            .map(|pkt| (pkt.data.data, pkt.dst))
+            .collect()
+    }
+}
@@ -0,0 +1,69 @@
+// Copyright 2026 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::PipelinePayload;
+use crate::clients::traits::{Obfuscation, Reliability, RoutingSecurity};
+
+/// Marker trait for a no-op [`Reliability`] implementation.
+///
+/// Implement this for your pipeline type to get a [`Reliability`] impl that
+/// passes the payload through unchanged with zero byte overhead.
+pub trait NoOpReliability {}
+
+impl<T, Ts, Opts, NdId> Reliability<Ts, Opts, NdId> for T
+where
+    T: NoOpReliability,
+{
+    const OVERHEAD_SIZE: usize = 0;
+    fn reliable_encode(
+        &mut self,
+        input: Option<PipelinePayload<Ts, Opts, NdId>>,
+        _: Ts,
+    ) -> Vec<PipelinePayload<Ts, Opts, NdId>> {
+        input.map(|payload| vec![payload]).unwrap_or_default()
+    }
+}
+
+/// Marker trait for a no-op [`RoutingSecurity`] implementation.
+///
+/// Implement this for your pipeline type to get a [`RoutingSecurity`] impl that
+/// passes the payload through unchanged with zero byte overhead and `nb_frames() == 1`.
+pub trait NoOpRoutingSecurity {}
+
+impl<T, Ts, Opts, NdId> RoutingSecurity<Ts, Opts, NdId> for T
+where
+    T: NoOpRoutingSecurity,
+{
+    const OVERHEAD_SIZE: usize = 0;
+
+    fn nb_frames(&self) -> usize {
+        1
+    }
+
+    fn encrypt(
+        &mut self,
+        input: PipelinePayload<Ts, Opts, NdId>,
+    ) -> PipelinePayload<Ts, Opts, NdId> {
+        input
+    }
+}
+
+/// Marker trait for a no-op [`Obfuscation`] implementation.
+///
+/// Implement this for your pipeline type to get an [`Obfuscation`] impl that
+/// passes the input through unchanged with no cover traffic, delay, or
+/// buffering.
+pub trait NoOpObfuscation {}
+
+impl<T, Ts, Opts, NdId> Obfuscation<Ts, Opts, NdId> for T
+where
+    T: NoOpObfuscation,
+{
+    fn obfuscate(
+        &mut self,
+        input: Option<PipelinePayload<Ts, Opts, NdId>>,
+        _: Ts,
+    ) -> Vec<PipelinePayload<Ts, Opts, NdId>> {
+        input.map(|payload| vec![payload]).unwrap_or_default()
+    }
+}
@@ -0,0 +1,30 @@
+// Copyright 2026 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod driver;
+pub mod helpers;
+pub mod traits;
+pub mod types;
+
+/// Per-message pipeline configuration carried alongside every payload.
+///
+/// Each pipeline stage (reliability, routing security, obfuscation) is optional
+/// and toggled per-message by the corresponding accessor.  The next-hop
+/// destination is also resolved from the options so that addressing is decided
+/// before the payload reaches [`Framing`].
+///
+/// # Type Parameters
+/// - `NdId`: addressing type used to identify the next-hop destination.
+///
+/// [`Framing`]: crate::common::traits::Framing
+pub trait InputOptions<NdId>: Clone {
+    /// Whether reliability encoding (e.g. SURB ACKs) should be applied.
+    fn reliability(&self) -> bool;
+    /// Whether routing-security encryption (e.g. Sphinx) should be applied.
+    fn routing_security(&self) -> bool;
+    /// Whether obfuscation (e.g. cover traffic) should be applied.
+    fn obfuscation(&self) -> bool;
+
+    /// Identifier of the next-hop node this message should be sent to.
+    fn next_hop(&self) -> NdId;
+}
@@ -0,0 +1,304 @@
+// Copyright 2026 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::PipelinePayload;
+use crate::clients::InputOptions;
+use crate::common::traits::{WireUnwrappingPipeline, WireWrappingPipeline};
+use crate::{AddressedTimedData, TimedPayload};
+
+/// Trait for splitting an incoming payload into timestamped chunks.
+///
+/// # Type Parameters
+/// - `Ts`: Timestamp type associated with each produced [`PipelinePayload`].
+/// - `Opts`: Per-message pipeline options (must implement [`InputOptions`]).
+/// - `NdId`: Addressing type for the next-hop destination.
+///
+/// # Required Methods
+/// - `chunked`: Split `input` into chunks of at most `chunk_size` bytes, tagging
+///   each chunk with `timestamp` and `input_options`.  Returns one
+///   [`PipelinePayload`] per chunk, ready to be fed through the rest of the
+///   pipeline.
+pub trait Chunking<Ts, Opts, NdId>
+where
+    Opts: InputOptions<NdId>,
+{
+    fn chunked(
+        &mut self,
+        input: Vec<u8>,
+        input_options: Opts,
+        chunk_size: usize,
+        timestamp: Ts,
+    ) -> Vec<PipelinePayload<Ts, Opts, NdId>>;
+}
+
+/// Trait for applying reliability encoding (e.g. SURB ACKs, retransmissions) to
+/// a timed payload.
+///
+/// # Type Parameters
+/// - `Ts`: Timestamp type carried by the [`PipelinePayload`].
+/// - `Opts`: Per-message pipeline options.
+/// - `NdId`: Addressing type for the next-hop destination.
+///
+/// # Associated Constants
+/// - `OVERHEAD_SIZE`: Number of additional bytes added by the reliability scheme.
+///
+/// # Required Methods
+/// - `reliable_encode`: Encode `input` with the reliability mechanism.  When
+///   `input` is `None`, the method is still called every tick so the layer can
+///   emit pending retransmissions or scheduled control packets.
+pub trait Reliability<Ts, Opts, NdId> {
+    const OVERHEAD_SIZE: usize;
+    fn reliable_encode(
+        &mut self,
+        input: Option<PipelinePayload<Ts, Opts, NdId>>,
+        timestamp: Ts,
+    ) -> Vec<PipelinePayload<Ts, Opts, NdId>>;
+}
+
+/// Trait for applying obfuscation (cover traffic, traffic shaping) to a timed payload.
+///
+/// When obfuscation is enabled, `obfuscate` must be called on every tick — not
+/// only on ticks that carry input — so the layer can produce cover traffic on
+/// schedule even when the application has nothing to send.
+///
+/// # Type Parameters
+/// - `Ts`: Timestamp type carried by the [`PipelinePayload`].
+/// - `Opts`: Per-message pipeline options.
+/// - `NdId`: Addressing type for the next-hop destination.
+pub trait Obfuscation<Ts, Opts, NdId> {
+    /// Obfuscate `input` at the given `timestamp`.
+    ///
+    /// # Parameters
+    /// - `input`: Payload to obfuscate, or `None` when the pipeline is ticking
+    ///   with no real message available.
+    /// - `timestamp`: Current timestamp.
+    ///
+    /// # Returns
+    /// A `Vec` of obfuscated payloads, possibly empty when no packet is due to be
+    /// emitted at this tick.
+    fn obfuscate(
+        &mut self,
+        input: Option<PipelinePayload<Ts, Opts, NdId>>,
+        timestamp: Ts,
+    ) -> Vec<PipelinePayload<Ts, Opts, NdId>>;
+}
+
+/// Trait for applying routing-security encryption (e.g. Sphinx) to a timed payload.
+///
+/// # Type Parameters
+/// - `Ts`: Timestamp type carried by the [`PipelinePayload`].
+/// - `Opts`: Per-message pipeline options.
+/// - `NdId`: Addressing type for the next-hop destination.
+///
+/// # Associated Constants
+/// - `OVERHEAD_SIZE`: Number of additional bytes added by the encryption scheme.
+///
+/// # Required Methods
+/// - `encrypt`: Encrypt the given payload, returning a new [`PipelinePayload`].
+///
+/// # Provided Methods
+/// - `nb_frames`: Number of transport frames that one encrypted payload expands
+///   into; defaults to `1`.  Override when the encryption scheme (e.g. Sphinx)
+///   produces multiple frames per input chunk.
+pub trait RoutingSecurity<Ts, Opts, NdId> {
+    const OVERHEAD_SIZE: usize;
+    fn nb_frames(&self) -> usize {
+        1
+    }
+    fn encrypt(
+        &mut self,
+        input: PipelinePayload<Ts, Opts, NdId>,
+    ) -> PipelinePayload<Ts, Opts, NdId>;
+}
+
+/// Full client-side outbound message pipeline.
+///
+/// Composes all six processing stages — [`Chunking`], [`Reliability`],
+/// [`Obfuscation`], [`RoutingSecurity`], and the shared [`WireWrappingPipeline`]
+/// (framing + transport) — into a single `process` call that takes a raw byte
+/// payload and returns a list of timestamped transport packets ready for sending.
+///
+/// # Type Parameters
+/// - `Ts`: Timestamp type carried through the pipeline.
+/// - `Pkt`: Final transport packet type produced by transport.
+/// - `Opts`: Per-message pipeline options (must implement [`InputOptions`]).
+/// - `NdId`: Addressing type for the next-hop destination.
+///
+/// # Provided Methods
+/// - `chunk_size`: Derived from `frame_size` (via [`WireWrappingPipeline`]) minus
+///   routing-security and reliability overheads, accounting for `nb_frames` expansion.
+/// - `process`: Runs the full pipeline in order:
+///   chunk → reliability encode → obfuscate → encrypt → frame → transport.
+pub trait ClientWrappingPipeline<Ts, Pkt, Opts, NdId>:
+    Chunking<Ts, Opts, NdId>
+    + Reliability<Ts, Opts, NdId>
+    + Obfuscation<Ts, Opts, NdId>
+    + RoutingSecurity<Ts, Opts, NdId>
+    + WireWrappingPipeline<Ts, Pkt, Opts, NdId>
+where
+    Ts: Clone,
+    NdId: Clone,
+    Opts: InputOptions<NdId>,
+{
+    fn chunk_size(&self, input_options: Opts) -> usize {
+        // Frame size comes from WireWrappingPipeline
+        let mut chunk_size = self.frame_size();
+
+        if input_options.routing_security() {
+            // SAFETY : While this CAN technically fail, it means that something is wrong in the code and it's pointless to continue anyway
+            #[allow(clippy::expect_used)]
+            let pre_security_chunk_size = (chunk_size * self.nb_frames())
+                .checked_sub(<Self as RoutingSecurity<_, _, _>>::OVERHEAD_SIZE)
+                .expect("not enough room in a packet for routing security overhead");
+            chunk_size = pre_security_chunk_size;
+        }
+
+        if input_options.reliability() {
+            // SAFETY : While this CAN technically fail, it means that something is wrong in the code and it's pointless to continue anyway
+            #[allow(clippy::expect_used)]
+            let pre_reliability_chunk_size = chunk_size
+                .checked_sub(<Self as Reliability<_, _, _>>::OVERHEAD_SIZE)
+                .expect("not enough room in a packet for reliability overhead");
+            chunk_size = pre_reliability_chunk_size;
+        }
+
+        chunk_size
+    }
+
+    fn process(
+        &mut self,
+        input: Option<(Vec<u8>, Opts)>, // Optional to be able to tick the pipeline without input
+        timestamp: Ts,
+    ) -> Vec<AddressedTimedData<Ts, Pkt, NdId>> {
+        let mut chunks = if let Some((input_data, input_options)) = input {
+            self.chunked(
+                input_data,
+                input_options.clone(),
+                self.chunk_size(input_options.clone()),
+                timestamp.clone(),
+            )
+        } else {
+            Vec::new()
+        };
+
+        // Reliability stage with chunks that needs reliability
+        chunks = chunks
+            .into_iter()
+            .flat_map(|chunk| {
+                if chunk.options.reliability() {
+                    self.reliable_encode(Some(chunk), timestamp.clone())
+                } else {
+                    vec![chunk]
+                }
+            })
+            .collect();
+
+        // Even if we had nothing go into the reliability stage, we need to catch potential retransmissions
+        // If we had, this should be a no-op, since it already has been called with the same timestamp
+        chunks.append(&mut self.reliable_encode(None, timestamp.clone()));
+
+        chunks = chunks
+            .into_iter()
+            .flat_map(|chunk| {
+                if chunk.options.obfuscation() {
+                    self.obfuscate(Some(chunk), timestamp.clone())
+                } else {
+                    vec![chunk]
+                }
+            })
+            .collect();
+
+        // Even if we had nothing go into the obfuscation stage, we need to catch potential cover traffic
+        // If we had, this should be a no-op, since it already has been called with the same timestamp
+        chunks.append(&mut self.obfuscate(None, timestamp.clone()));
+
+        chunks = chunks
+            .into_iter()
+            .map(|chunk| {
+                if chunk.options.routing_security() {
+                    self.encrypt(chunk)
+                } else {
+                    chunk
+                }
+            })
+            .collect();
+
+        chunks
+            .into_iter()
+            .flat_map(|payload| self.wire_wrap(payload))
+            .collect::<Vec<_>>()
+    }
+}
+
+/// Dyn-compatible mirror of [`ClientWrappingPipeline`].
+///
+/// All associated constants from the sub-traits are exposed as methods so the
+/// trait can be used as `dyn DynClientWrappingPipeline<Ts, Pkt, Opts, NdId>`,
+/// erasing the concrete pipeline type while keeping `Ts`, `Pkt`, `Opts`, and
+/// `NdId` visible.
+///
+/// Implement [`ClientWrappingPipeline`] on your concrete type; the blanket impl
+/// below provides `DynClientWrappingPipeline` for free.
+pub trait DynClientWrappingPipeline<Ts, Pkt, Opts, NdId> {
+    /// On-wire size of an output packet in bytes.
+    fn packet_size(&self) -> usize;
+
+    /// Run the full client wrapping pipeline; see [`ClientWrappingPipeline::process`].
+    fn process(
+        &mut self,
+        input: Option<(Vec<u8>, Opts)>,
+        timestamp: Ts,
+    ) -> Vec<AddressedTimedData<Ts, Pkt, NdId>>;
+}
+
+impl<T, Ts, Pkt, Opts, NdId> DynClientWrappingPipeline<Ts, Pkt, Opts, NdId> for T
+where
+    Ts: Clone,
+    NdId: Clone,
+    Opts: InputOptions<NdId>,
+    T: ClientWrappingPipeline<Ts, Pkt, Opts, NdId>,
+{
+    fn packet_size(&self) -> usize {
+        WireWrappingPipeline::packet_size(self)
+    }
+
+    fn process(
+        &mut self,
+        input: Option<(Vec<u8>, Opts)>,
+        timestamp: Ts,
+    ) -> Vec<AddressedTimedData<Ts, Pkt, NdId>> {
+        ClientWrappingPipeline::process(self, input, timestamp)
+    }
+}
+
+/// Full client-side inbound pipeline.
+///
+/// Combines the shared [`WireUnwrappingPipeline`] (transport + framing unwrap) with a
+/// blank [`process_unwrapped`](Self::process_unwrapped) step that the implementor
+/// fills in (routing-security decrypt, reliability decode, chunk reassembly, etc.).
+///
+/// # Type Parameters
+/// - `Ts`: Timestamp type.
+/// - `Pkt`: Transport packet type consumed as input.
+/// - `Mk`: Message-kind marker returned alongside reassembled payloads.
+///
+/// # Required Methods
+/// - `process_unwrapped`: Called with the reassembled payload and its message kind
+///   once a complete message is available. Returns the decoded application bytes,
+///   or `None` if reassembly is still in progress.
+///
+/// # Provided Methods
+/// - `unwrap`: Strips the wire layers via [`WireUnwrappingPipeline::wire_unwrap`],
+///   then delegates to `process_unwrapped`.
+pub trait ClientUnwrappingPipeline<Ts, Pkt, Mk>: WireUnwrappingPipeline<Ts, Pkt, Mk>
+where
+    Ts: Clone,
+{
+    fn process_unwrapped(&mut self, payload: TimedPayload<Ts>, kind: Mk) -> Option<Vec<u8>>;
+
+    fn unwrap(&mut self, input: Pkt, timestamp: Ts) -> Result<Option<Vec<u8>>, Self::Error> {
+        Ok(self
+            .wire_unwrap(input, timestamp)?
+            .and_then(|(payload, kind)| self.process_unwrapped(payload, kind)))
+    }
+}
@@ -0,0 +1,160 @@
+// Copyright 2026 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::clients::InputOptions;
+use crate::clients::traits::{
+    Chunking, ClientWrappingPipeline, Obfuscation, Reliability, RoutingSecurity,
+};
+use crate::common::traits::{Framing, Transport, WireWrappingPipeline};
+use crate::{AddressedTimedData, PipelinePayload};
+
+/// Generic composition struct that implements [`ClientWrappingPipeline`] by
+/// delegating each stage to a held component.
+///
+/// Type parameters correspond to the six pipeline stages:
+/// - `C`: [`Chunking`]
+/// - `R`: [`Reliability`]
+/// - `O`: [`Obfuscation`]
+/// - `Rs`: [`RoutingSecurity`]
+/// - `F`: [`Framing`]
+/// - `T`: [`Transport`]
+pub struct Pipeline<C, R, O, Rs, F, T> {
+    /// On-wire size of an output packet in bytes; returned by
+    /// [`WireWrappingPipeline::packet_size`].
+    pub packet_size: usize,
+    /// [`Chunking`] stage.
+    pub chunking: C,
+    /// [`Reliability`] stage.
+    pub reliability: R,
+    /// [`Obfuscation`] stage.
+    pub obfuscation: O,
+    /// [`RoutingSecurity`] stage.
+    pub security: Rs,
+    /// [`Framing`] stage.
+    pub framing: F,
+    /// [`Transport`] stage.
+    pub transport: T,
+}
+
+impl<Ts, Opts, NdId, C, R, O, Rs, F, T> Chunking<Ts, Opts, NdId> for Pipeline<C, R, O, Rs, F, T>
+where
+    Opts: InputOptions<NdId>,
+    C: Chunking<Ts, Opts, NdId>,
+{
+    fn chunked(
+        &mut self,
+        input: Vec<u8>,
+        input_options: Opts,
+        chunk_size: usize,
+        timestamp: Ts,
+    ) -> Vec<PipelinePayload<Ts, Opts, NdId>> {
+        self.chunking
+            .chunked(input, input_options, chunk_size, timestamp)
+    }
+}
+
+impl<Ts, Opts, NdId, C, R, O, Rs, F, T> Reliability<Ts, Opts, NdId> for Pipeline<C, R, O, Rs, F, T>
+where
+    R: Reliability<Ts, Opts, NdId>,
+{
+    const OVERHEAD_SIZE: usize = R::OVERHEAD_SIZE;
+
+    fn reliable_encode(
+        &mut self,
+        input: Option<PipelinePayload<Ts, Opts, NdId>>,
+        timestamp: Ts,
+    ) -> Vec<PipelinePayload<Ts, Opts, NdId>> {
+        self.reliability.reliable_encode(input, timestamp)
+    }
+}
+
+impl<Ts, Opts, NdId, C, R, O, Rs, F, T> Obfuscation<Ts, Opts, NdId> for Pipeline<C, R, O, Rs, F, T>
+where
+    O: Obfuscation<Ts, Opts, NdId>,
+{
+    fn obfuscate(
+        &mut self,
+        input: Option<PipelinePayload<Ts, Opts, NdId>>,
+        timestamp: Ts,
+    ) -> Vec<PipelinePayload<Ts, Opts, NdId>> {
+        self.obfuscation.obfuscate(input, timestamp)
+    }
+}
+
+impl<Ts, Opts, NdId, C, R, O, Rs, F, T> RoutingSecurity<Ts, Opts, NdId>
+    for Pipeline<C, R, O, Rs, F, T>
+where
+    Rs: RoutingSecurity<Ts, Opts, NdId>,
+{
+    const OVERHEAD_SIZE: usize = Rs::OVERHEAD_SIZE;
+
+    fn nb_frames(&self) -> usize {
+        self.security.nb_frames()
+    }
+
+    fn encrypt(
+        &mut self,
+        input: PipelinePayload<Ts, Opts, NdId>,
+    ) -> PipelinePayload<Ts, Opts, NdId> {
+        self.security.encrypt(input)
+    }
+}
+
+impl<Ts, Opts, NdId, C, R, O, Rs, F, T> Framing<Ts, Opts, NdId> for Pipeline<C, R, O, Rs, F, T>
+where
+    F: Framing<Ts, Opts, NdId>,
+{
+    type Frame = F::Frame;
+    const OVERHEAD_SIZE: usize = F::OVERHEAD_SIZE;
+
+    fn to_frame(
+        &mut self,
+        payload: PipelinePayload<Ts, Opts, NdId>,
+        frame_size: usize,
+    ) -> Vec<AddressedTimedData<Ts, F::Frame, NdId>> {
+        self.framing.to_frame(payload, frame_size)
+    }
+}
+
+impl<Ts, Pkt, NdId, C, R, O, Rs, F, T> Transport<Ts, Pkt, NdId> for Pipeline<C, R, O, Rs, F, T>
+where
+    T: Transport<Ts, Pkt, NdId>,
+{
+    type Frame = T::Frame;
+    const OVERHEAD_SIZE: usize = T::OVERHEAD_SIZE;
+
+    fn to_transport_packet(
+        &mut self,
+        frame: AddressedTimedData<Ts, T::Frame, NdId>,
+    ) -> AddressedTimedData<Ts, Pkt, NdId> {
+        self.transport.to_transport_packet(frame)
+    }
+}
+
+impl<Ts, Pkt, Opts, NdId, C, R, O, Rs, F, T> WireWrappingPipeline<Ts, Pkt, Opts, NdId>
+    for Pipeline<C, R, O, Rs, F, T>
+where
+    Ts: Clone,
+    NdId: Clone,
+    F: Framing<Ts, Opts, NdId>,
+    T: Transport<Ts, Pkt, NdId, Frame = F::Frame>,
+{
+    fn packet_size(&self) -> usize {
+        self.packet_size
+    }
+}
+
+impl<Ts, Pkt, Opts, NdId, C, R, O, Rs, F, T> ClientWrappingPipeline<Ts, Pkt, Opts, NdId>
+    for Pipeline<C, R, O, Rs, F, T>
+where
+    Ts: Clone,
+    NdId: Clone,
+    Opts: InputOptions<NdId>,
+    C: Chunking<Ts, Opts, NdId>,
+    R: Reliability<Ts, Opts, NdId>,
+    O: Obfuscation<Ts, Opts, NdId>,
+    Rs: RoutingSecurity<Ts, Opts, NdId>,
+    F: Framing<Ts, Opts, NdId>,
+    T: Transport<Ts, Pkt, NdId, Frame = F::Frame>,
+{
+}
@@ -0,0 +1,105 @@
+// Copyright 2026 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    AddressedTimedData, AddressedTimedPayload, PipelinePayload, TimedData, TimedPayload,
+    common::traits::{
+        Framing, FramingUnwrap, Transport, TransportUnwrap, WireUnwrappingPipeline,
+        WireWrappingPipeline,
+    },
+};
+
+/// Marker trait for a no-op [`WireWrappingPipeline`] implementation.
+///
+/// Implement this for your pipeline type to get a [`WireWrappingPipeline`] impl that
+/// passes the payload through unchanged with zero byte overhead.
+pub trait NoOpWireWrapper {
+    const PACKET_SIZE: usize = 1500;
+}
+
+impl<T, Ts, Opts, NdId> Framing<Ts, Opts, NdId> for T
+where
+    T: NoOpWireWrapper,
+{
+    type Frame = Vec<u8>;
+    const OVERHEAD_SIZE: usize = 0;
+    fn to_frame(
+        &mut self,
+        payload: PipelinePayload<Ts, Opts, NdId>,
+        _: usize,
+    ) -> Vec<AddressedTimedPayload<Ts, NdId>> {
+        vec![payload.into_addressed()]
+    }
+}
+
+impl<T, Ts, Pkt, NdId> Transport<Ts, Pkt, NdId> for T
+where
+    T: NoOpWireWrapper,
+    Pkt: From<Vec<u8>>,
+{
+    type Frame = Vec<u8>;
+    const OVERHEAD_SIZE: usize = 0;
+    fn to_transport_packet(
+        &mut self,
+        frame: AddressedTimedPayload<Ts, NdId>,
+    ) -> AddressedTimedData<Ts, Pkt, NdId> {
+        frame.data_transform(|data| data.into())
+    }
+}
+
+impl<T, Ts, Pkt, Opts, NdId> WireWrappingPipeline<Ts, Pkt, Opts, NdId> for T
+where
+    T: NoOpWireWrapper,
+    Ts: Clone,
+    Pkt: From<Vec<u8>>,
+    NdId: Clone,
+{
+    fn packet_size(&self) -> usize {
+        T::PACKET_SIZE
+    }
+}
+
+/// Marker trait for a no-op [`WireUnwrappingPipeline`] implementation.
+///
+/// Implement this for your pipeline type to get a [`WireUnwrappingPipeline`] impl that
+/// passes the payload through unchanged.
+pub trait NoOpWireUnwrapper {}
+
+impl<T, Ts, Mk> FramingUnwrap<Ts, Mk> for T
+where
+    T: NoOpWireUnwrapper,
+    Mk: Default,
+{
+    type Frame = Vec<u8>;
+    fn frame_to_message(&mut self, frame: TimedPayload<Ts>) -> Option<(TimedPayload<Ts>, Mk)> {
+        Some((frame, Default::default()))
+    }
+}
+
+impl<T, Ts, Pkt> TransportUnwrap<Ts, Pkt> for T
+where
+    T: NoOpWireUnwrapper,
+    Pkt: Into<Vec<u8>>,
+{
+    type Frame = Vec<u8>;
+    type Error = std::convert::Infallible;
+    fn packet_to_frame(
+        &mut self,
+        packet: Pkt,
+        timestamp: Ts,
+    ) -> Result<TimedPayload<Ts>, Self::Error> {
+        Ok(TimedData {
+            timestamp,
+            data: packet.into(),
+        })
+    }
+}
+
+impl<T, Ts, Pkt, Mk> WireUnwrappingPipeline<Ts, Pkt, Mk> for T
+where
+    T: NoOpWireUnwrapper,
+    Ts: Clone,
+    Pkt: Into<Vec<u8>>,
+    Mk: Default,
+{
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Simon Wicky	8573004c34	rebasing cleanup	2026-05-20 11:38:35 +02:00
Simon Wicky	5636c5afc4	name change	2026-05-20 11:34:03 +02:00
Simon Wicky	f505c29926	some PR review	2026-05-20 11:33:44 +02:00
Simon Wicky	95bec7422c	tweaks and checked arithmetic	2026-05-20 11:33:31 +02:00
Simon Wicky	c02c28f7cb	add mut to transport layer	2026-05-20 11:33:31 +02:00
Simon Wicky	6fb4a98667	comments update	2026-05-20 11:33:30 +02:00
Simon Wicky	4a50f6dcd0	options in framing layer	2026-05-20 11:33:30 +02:00
Simon Wicky	53dec68378	remove anyhow error for in trait one	2026-05-20 11:33:30 +02:00
Simon Wicky	f0ecdfd295	delete unnecessary unfinished type	2026-05-20 11:33:30 +02:00
Simon Wicky	668477c5c3	remove unnecessary imports	2026-05-20 11:33:30 +02:00
Simon Wicky	53aaa71178	cargo fmt	2026-05-20 11:33:30 +02:00
Simon Wicky	35517f1df6	nym-mix-sim crate	2026-05-20 11:33:29 +02:00
Simon Wicky	ed5ddf0170	nym-lp-data crate	2026-05-20 11:33:14 +02:00
Simon Wicky	644e669a15	helper changes	2026-05-20 11:32:02 +02:00
Simon Wicky	1fd25529ce	crate description	2026-05-20 11:28:36 +02:00
Simon Wicky	8677b98bcb	fmt	2026-05-20 11:18:04 +02:00
Simon Wicky	ca031af69a	one more bit	2026-05-20 11:14:44 +02:00
Simon Wicky	7c0264b839	moving lp packets in lp-data crate	2026-05-20 11:10:46 +02:00