moved prebuild to its own script

destructive commit to test something on ci
2024-10-28 14:54:52 +01:00 · 2024-10-28 14:52:16 +01:00
332 changed files with 6762 additions and 19152 deletions
@@ -6,27 +6,20 @@ on:
 jobs:
  build:
    runs-on: arc-ubuntu-20.04
-    defaults:
-      run:
-        working-directory: documentation/docs
    steps:
      - uses: actions/checkout@v4
      - name: Install Dependencies (Linux)
        run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler git python3 && sudo apt-get update --fix-missing
      - name: Install pip3
-        run: sudo apt install -y python3-pip
+        run: sudo apt install -y python3-pip  
      - name: Install Python3 modules
        run: sudo pip3 install pandas tabulate
      - name: Install rsync
        run: sudo apt-get install rsync
      - uses: rlespinasse/github-slug-action@v3.x
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4.0.0
-        with:
-          version: 9
      - uses: actions/setup-node@v4
        with:
-          node-version: 20
+          node-version: 18
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
@@ -36,13 +29,33 @@ jobs:
        with:
          command: build
          args: --workspace --release
+      - name: Install mdbook and plugins
+        run: cd documentation && ./install_mdbook_deps.sh
+      - name: Remove existing Nym config directory (`~/.nym/`)
+        run: cd documentation && ./remove_existing_config.sh
+        continue-on-error: false
+# This is the original flow
+#      - name: Build all projects in documentation/ & move to ~/dist/docs/
+#        run: cd documentation && ./build_all_to_dist.sh

-      - name: Install project dependencies
-        run: pnpm i
-      - name: Build project
-        run: pnpm run build
-      - name: Move files to /dist/
-        run: ../scripts/move-to-dist.sh
+# This is a workaround replacement which builds on the last working commit b332a6b55668f60988e36961f3f62a794ba82ddb and then on current branch
+      - name: Save current branch to ~/current_branch
+        run: git rev-parse --abbrev-ref HEAD > ~/current_branch
+      - name: Git pull, reset & switch to b332a6b55668f60988e36961f3f62a794ba82ddb
+        run: git pull && git reset --hard && git checkout b332a6b55668f60988e36961f3f62a794ba82ddb
+      - name: Build all projects in documentation/ & move to ~/dist/docs/ from b332a6b55668f60988e36961f3f62a794ba82ddb
+        run: cd documentation && ./build_all_to_dist.sh
+
+      - name: Switch to current branch
+        run: git checkout $echo "$(cat ~/current_branch)"
+      - name: Build all projects in documentation/ & move to ~/dist/docs/ on current branch
+        run: cd documentation && ./build_all_to_dist.sh && rm ~/current_branch
+
+# End of replacemet
+
+      - name: Post process
+        run: cd documentation && ./post_process.sh
+        continue-on-error: false

      - name: Create Vercel project file
        uses: mobiledevops/secret-to-file-action@v1
@@ -57,12 +57,6 @@ jobs:
          command: fmt
          args: --all -- --check

-      - name: Clippy
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --workspace --all-targets -- -D warnings
-
      - name: Build all binaries
        uses: actions-rs/cargo@v1
        with:
@@ -88,3 +82,9 @@ jobs:
        with:
          command: test
          args: --workspace -- --ignored
+
+      - name: Clippy
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: --workspace --all-targets -- -D warnings
@@ -3,35 +3,28 @@ name: ci-docs
 on:
  workflow_dispatch:
  push:
-    branches-ignore: [master]
+    branches-ignore: master
    paths:
-      - "documentation/docs/**"
-      - ".github/workflows/ci-docs.yml"
+      - 'documentation/docs/**'
+      - '.github/workflows/ci-docs.yml'

 jobs:
  build:
    runs-on: arc-ubuntu-20.04
-    defaults:
-      run:
-        working-directory: documentation/docs
    steps:
      - uses: actions/checkout@v4
      - name: Install Dependencies (Linux)
        run: sudo apt-get update && sudo apt-get install -y build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler git python3 && sudo apt-get update --fix-missing
      - name: Install pip3
-        run: sudo apt install -y python3-pip
+        run: sudo apt install -y python3-pip  
      - name: Install Python3 modules
        run: sudo pip3 install pandas tabulate
      - name: Install rsync
        run: sudo apt-get install rsync
      - uses: rlespinasse/github-slug-action@v3.x
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4.0.0
-        with:
-          version: 9
      - uses: actions/setup-node@v4
        with:
-          node-version: 20
+          node-version: 18
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
@@ -41,13 +34,30 @@ jobs:
        with:
          command: build
          args: --workspace --release
+      - name: Install mdbook and plugins
+        run: cd documentation && ./install_mdbook_deps.sh
+      - name: Remove existing Nym config directory (`~/.nym/`)
+        run: cd documentation && ./remove_existing_config.sh
+        continue-on-error: false

-      - name: Install project dependencies
-        run: pnpm i
-      - name: Build project
-        run: pnpm run build
-      - name: Move files to /dist/
-        run: ../scripts/move-to-dist.sh
+# This is the original flow
+#      - name: Build all projects in documentation/ & move to ~/dist/docs/
+#        run: cd documentation && ./build_all_to_dist.sh
+
+# This is a workaround replacement which builds on the last working commit b332a6b55668f60988e36961f3f62a794ba82ddb and then on current branch
+      - name: Save current branch to ~/current_branch
+        run: git rev-parse --abbrev-ref HEAD > ~/current_branch
+      - name: Git pull, reset & switch to b332a6b55668f60988e36961f3f62a794ba82ddb
+        run: git pull && git reset --hard && git checkout b332a6b55668f60988e36961f3f62a794ba82ddb
+      - name: Build all projects in documentation/ & move to ~/dist/docs/ from b332a6b55668f60988e36961f3f62a794ba82ddb
+        run: cd documentation && ./build_all_to_dist.sh
+
+      - name: Switch to current branch
+        run: git checkout $echo "$(cat ~/current_branch)"
+      - name: Build all projects in documentation/ & move to ~/dist/docs/ on current branch
+        run: cd documentation && ./build_all_to_dist.sh && rm ~/current_branch
+
+# End of replacemet

      - name: Deploy branch to CI www
        continue-on-error: true
@@ -58,5 +68,5 @@ jobs:
          SOURCE: "dist/docs/"
          REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
          REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
-          TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/docs-nextra-${{ env.GITHUB_REF_SLUG }}
+          TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/docs-${{ env.GITHUB_REF_SLUG }}
          EXCLUDE: "/node_modules/"
@@ -0,0 +1,45 @@
+name: ci-nym-credential-proxy
+
+on:
+  pull_request:
+    paths:
+      - 'common/**'
+      - 'nym-credential-proxy/**'
+      - '.github/workspace/ci-nym-credential-proxy.yml'
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: arc-ubuntu-22.04
+    env:
+      CARGO_TERM_COLOR: always
+      MANIFEST_PATH: "--manifest-path nym-credential-proxy/Cargo.toml"
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Install rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+          components: rustfmt, clippy
+
+      - name: Check formatting
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: ${{ env.MANIFEST_PATH }} --all -- --check
+
+      - name: Build
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: ${{ env.MANIFEST_PATH }} --workspace --all-targets
+
+      - name: Clippy
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: ${{ env.MANIFEST_PATH }} --workspace --all-targets -- -D warnings
@@ -0,0 +1,79 @@
+name: ci-sdk-docs-typescript
+
+on:
+  pull_request:
+    paths:
+      - "sdk/typescript/**"
+      - "wasm/**"
+      - '.github/workflows/ci-sdk-docs-typescript.yml'
+
+jobs:
+  build:
+    runs-on: custom-linux
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install rsync
+        run: sudo apt-get install rsync
+        continue-on-error: true
+      - uses: rlespinasse/github-slug-action@v3.x
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18.17
+      - name: Install Rust stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - name: Setup yarn
+        run: npm install -g yarn
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.20'
+
+      - name: Install wasm-pack
+        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+
+      - name: Install wasm-opt
+        uses: ./.github/actions/install-wasm-opt
+        with:
+          version: '116'
+
+      - name: Build branch WASM packages
+        run: make sdk-wasm-build
+
+      - name: Install
+        run: yarn
+      - name: Build
+        run: yarn docs:prod:build
+      - name: Deploy branch to CI www (docs)
+        continue-on-error: true
+        uses: easingthemes/ssh-deploy@main
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.CI_WWW_SSH_PRIVATE_KEY }}
+          ARGS: "-rltgoDzvO --delete"
+          SOURCE: "dist/ts/"
+          REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
+          REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
+          TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/sdk-ts-docs-${{ env.GITHUB_REF_SLUG }}
+          EXCLUDE: "/dist/, /node_modules/"
+      - name: Matrix - Node Install
+        run: npm install
+        working-directory: .github/workflows/support-files
+      - name: Matrix - Send Notification
+        env:
+          NYM_NOTIFICATION_KIND: ts-packages
+          NYM_PROJECT_NAME: "sdk-ts-docs"
+          NYM_CI_WWW_BASE: "${{ secrets.NYM_CI_WWW_BASE }}/docs/sdk/typescript"
+          NYM_CI_WWW_LOCATION: "sdk-ts-docs-${{ env.GITHUB_REF_SLUG }}"
+          GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
+          GIT_BRANCH: "${GITHUB_REF##*/}"
+          IS_SUCCESS: "${{ job.status == 'success' }}"
+          MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
+          MATRIX_ROOM: "${{ secrets.MATRIX_ROOM }}"
+          MATRIX_USER_ID: "${{ secrets.MATRIX_USER_ID }}"
+          MATRIX_TOKEN: "${{ secrets.MATRIX_TOKEN }}"
+          MATRIX_DEVICE_ID: "${{ secrets.MATRIX_DEVICE_ID }}"
+        uses: docker://keybaseio/client:stable-node
+        with:
+          args: .github/workflows/support-files/notifications/entry_point.sh
@@ -4,9 +4,7 @@ on:
  pull_request:
    branches:
      - develop
-      - "release/**"
-    paths-ignore:
-      - "documentation/**"
+      - 'release/**'
    types:
      - labeled
      - unlabeled
@@ -1,55 +0,0 @@
-name: Build and upload Data observatory container to harbor.nymte.ch
-on:
-  workflow_dispatch:
-
-env:
-  WORKING_DIRECTORY: "nym-data-observatory"
-  CONTAINER_NAME: "data-observatory"
-
-jobs:
-  build-container:
-    runs-on: arc-ubuntu-22.04-dind
-    steps:
-      - name: Login to Harbor
-        uses: docker/login-action@v3
-        with:
-          registry: harbor.nymte.ch
-          username: ${{ secrets.HARBOR_ROBOT_USERNAME }}
-          password: ${{ secrets.HARBOR_ROBOT_SECRET }}
-
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Configure git identity
-        run: |
-          git config --global user.email "lawrence@nymtech.net"
-          git config --global user.name "Lawrence Stalder"
-
-      - name: Get version from cargo.toml
-        uses: mikefarah/yq@v4.44.3
-        id: get_version
-        with:
-          cmd: yq -oy '.package.version' ${{ env.WORKING_DIRECTORY }}/Cargo.toml
-
-      - name: Check if tag exists
-        run: |
-          if git rev-parse ${{ steps.get_version.outputs.value }} >/dev/null 2>&1; then
-            echo "Tag ${{ steps.get_version.outputs.value }} already exists"
-          fi
-
-      - name: Remove existing tag if exists
-        run: |
-          if git rev-parse ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }} >/dev/null 2>&1; then
-            git push --delete origin ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}
-            git tag -d ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}
-          fi
-
-      - name: Create tag
-        run: |
-          git tag -a ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }} -m "Version ${{ steps.get_version.outputs.result }}"
-          git push origin ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}
-
-      - name: BuildAndPushImageOnHarbor
-        run: |
-          docker build -f ${{ env.WORKING_DIRECTORY }}/Dockerfile . -t harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }}:${{ steps.get_version.outputs.result }} -t harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }}:latest
-          docker push harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }} --all-tags
@@ -1,56 +0,0 @@
-name: Build and upload Node Status agent container to harbor.nymte.ch
-
-on:
-  workflow_dispatch:
-
-env:
-  WORKING_DIRECTORY: "nym-node-status-agent"
-  CONTAINER_NAME: "node-status-agent"
-
-jobs:
-  build-container:
-    runs-on: arc-ubuntu-22.04-dind
-    steps:
-      - name: Login to Harbor
-        uses: docker/login-action@v3
-        with:
-          registry: harbor.nymte.ch
-          username: ${{ secrets.HARBOR_ROBOT_USERNAME }}
-          password: ${{ secrets.HARBOR_ROBOT_SECRET }}
-
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Configure git identity
-        run: |
-          git config --global user.email "lawrence@nymtech.net"
-          git config --global user.name "Lawrence Stalder"
-
-      - name: Get version from cargo.toml
-        uses: mikefarah/yq@v4.44.3
-        id: get_version
-        with:
-          cmd: yq -oy '.package.version' ${{ env.WORKING_DIRECTORY }}/Cargo.toml
-
-      - name: Check if tag exists
-        run: |
-          if git rev-parse ${{ steps.get_version.outputs.value }} >/dev/null 2>&1; then
-            echo "Tag ${{ steps.get_version.outputs.value }} already exists"
-          fi
-
-      - name: Remove existing tag if exists
-        run: |
-          if git rev-parse ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }} >/dev/null 2>&1; then
-            git push --delete origin ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}
-            git tag -d ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}
-          fi
-
-      - name: Create tag
-        run: |
-          git tag -a ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }} -m "Version ${{ steps.get_version.outputs.result }}"
-          git push origin ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}
-
-      - name: BuildAndPushImageOnHarbor
-        run: |
-          docker build -f ${{ env.WORKING_DIRECTORY }}/Dockerfile . -t harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }}:${{ steps.get_version.outputs.result }} -t harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }}:latest
-          docker push harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }} --all-tags
@@ -1,55 +1,11 @@
 name: Build and upload Node Status API container to harbor.nymte.ch
+
 on:
  workflow_dispatch:

-env:
-  WORKING_DIRECTORY: "nym-node-status-api"
-  CONTAINER_NAME: "node-status-api"
-
 jobs:
-  build-container:
-    runs-on: arc-ubuntu-22.04-dind
+  my-job:
+    runs-on: arc-ubuntu-22.04
    steps:
-      - name: Login to Harbor
-        uses: docker/login-action@v3
-        with:
-          registry: harbor.nymte.ch
-          username: ${{ secrets.HARBOR_ROBOT_USERNAME }}
-          password: ${{ secrets.HARBOR_ROBOT_SECRET }}
-
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Configure git identity
-        run: |
-          git config --global user.email "lawrence@nymtech.net"
-          git config --global user.name "Lawrence Stalder"
-
-      - name: Get version from cargo.toml
-        uses: mikefarah/yq@v4.44.3
-        id: get_version
-        with:
-          cmd: yq -oy '.package.version' ${{ env.WORKING_DIRECTORY }}/Cargo.toml
-
-      - name: Check if tag exists
-        run: |
-          if git rev-parse ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }} >/dev/null 2>&1; then
-            echo "Tag ${{ steps.get_version.outputs.result }} already exists"
-          fi
-
-      - name: Remove existing tag if exists
-        run: |
-          if git rev-parse ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }} >/dev/null 2>&1; then
-            git push --delete origin ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}
-            git tag -d ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}
-          fi
-
-      - name: Create tag
-        run: |
-          git tag -a ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }} -m "Version ${{ steps.get_version.outputs.result }}"
-          git push origin ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}
-
-      - name: BuildAndPushImageOnHarbor
-        run: |
-          docker build -f ${{ env.WORKING_DIRECTORY }}/Dockerfile . -t harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }}:${{ steps.get_version.outputs.result }} -t harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }}:latest
-          docker push harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }} --all-tags
+      - name: my-step
+        run: echo "Hello World!"
@@ -1,55 +0,0 @@
-name: Build and upload nym node container to harbor.nymte.ch
-on:
-  workflow_dispatch:
-
-env:
-  WORKING_DIRECTORY: "nym-node"
-  CONTAINER_NAME: "nym-node"
-
-jobs:
-  build-container:
-    runs-on: arc-ubuntu-22.04-dind
-    steps:
-      - name: Login to Harbor
-        uses: docker/login-action@v3
-        with:
-          registry: harbor.nymte.ch
-          username: ${{ secrets.HARBOR_ROBOT_USERNAME }}
-          password: ${{ secrets.HARBOR_ROBOT_SECRET }}
-
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Configure git identity
-        run: |
-          git config --global user.email "lawrence@nymtech.net"
-          git config --global user.name "Lawrence Stalder"
-
-      - name: Get version from cargo.toml
-        uses: mikefarah/yq@v4.44.3
-        id: get_version
-        with:
-          cmd: yq -oy '.package.version' ${{ env.WORKING_DIRECTORY }}/Cargo.toml
-
-      - name: Check if tag exists
-        run: |
-          if git rev-parse ${{ steps.get_version.outputs.value }} >/dev/null 2>&1; then
-            echo "Tag ${{ steps.get_version.outputs.value }} already exists"
-          fi
-
-      - name: Remove existing tag if exists
-        run: |
-          if git rev-parse ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }} >/dev/null 2>&1; then
-            git push --delete origin ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}
-            git tag -d ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}
-          fi
-
-      - name: Create tag
-        run: |
-          git tag -a ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }} -m "Version ${{ steps.get_version.outputs.result }}"
-          git push origin ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}
-
-      - name: BuildAndPushImageOnHarbor
-        run: |
-          docker build -f ${{ env.WORKING_DIRECTORY }}/Dockerfile . -t harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }}:${{ steps.get_version.outputs.result }} -t harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }}:latest
-          docker push harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }} --all-tags
@@ -318,21 +318,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
 dependencies = [
 "concurrent-queue",
- "event-listener 2.5.3",
+ "event-listener",
 "futures-core",
 ]

-[[package]]
-name = "async-lock"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
-dependencies = [
- "event-listener 5.3.1",
- "event-listener-strategy",
- "pin-project-lite",
-]
-
 [[package]]
 name = "async-stream"
 version = "0.3.5"
@@ -474,7 +463,6 @@ checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae"
 dependencies = [
 "async-trait",
 "axum-core 0.4.5",
- "axum-macros",
 "bytes",
 "futures-util",
 "http 1.1.0",
@@ -501,17 +489,6 @@ dependencies = [
 "tracing",
 ]

-[[package]]
-name = "axum-client-ip"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eefda7e2b27e1bda4d6fa8a06b50803b8793769045918bc37ad062d48a6efac"
-dependencies = [
- "axum 0.7.7",
- "forwarded-header-value",
- "serde",
-]
-
 [[package]]
 name = "axum-core"
 version = "0.3.4"
@@ -573,17 +550,6 @@ dependencies = [
 "tracing",
 ]

-[[package]]
-name = "axum-macros"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.82",
-]
-
 [[package]]
 name = "axum-test"
 version = "16.2.0"
@@ -2373,15 +2339,6 @@ dependencies = [
 "env_filter",
 "humantime 2.1.0",
 "log",
- ]
-
-[[package]]
-name = "envy"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f47e0157f2cb54f5ae1bd371b30a2ae4311e1c028f575cd4e81de7353215965"
-dependencies = [
- "serde",
 ]

 [[package]]
@@ -2426,27 +2383,6 @@ version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"

-[[package]]
-name = "event-listener"
-version = "5.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
-dependencies = [
- "event-listener 5.3.1",
- "pin-project-lite",
-]
-
 [[package]]
 name = "explorer-api"
 version = "1.1.41"
@@ -2646,7 +2582,7 @@ checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
 dependencies = [
 "futures-core",
 "futures-sink",
- "spin",
+ "spin 0.9.8",
 ]

 [[package]]
@@ -2670,16 +2606,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e"

-[[package]]
-name = "forwarded-header-value"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835f84f38484cc86f110a805655697908257fb9a7af005234060891557198e9"
-dependencies = [
- "nonempty",
- "thiserror",
-]
-
 [[package]]
 name = "fs-err"
 version = "2.11.0"
@@ -3667,7 +3593,7 @@ dependencies = [
 "crossbeam-utils",
 "curl",
 "curl-sys",
- "event-listener 2.5.3",
+ "event-listener",
 "futures-lite",
 "http 0.2.12",
 "log",
@@ -3797,11 +3723,11 @@ dependencies = [

 [[package]]
 name = "lazy_static"
-version = "1.5.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 dependencies = [
- "spin",
+ "spin 0.5.2",
 ]

 [[package]]
@@ -4149,30 +4075,6 @@ dependencies = [
 "wasm-utils",
 ]

-[[package]]
-name = "moka"
-version = "0.12.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32cf62eb4dd975d2dde76432fb1075c49e3ee2331cf36f1f8fd4b66550d32b6f"
-dependencies = [
- "async-lock",
- "async-trait",
- "crossbeam-channel",
- "crossbeam-epoch",
- "crossbeam-utils",
- "event-listener 5.3.1",
- "futures-util",
- "once_cell",
- "parking_lot",
- "quanta",
- "rustc_version 0.4.0",
- "smallvec",
- "tagptr",
- "thiserror",
- "triomphe",
- "uuid",
-]
-
 [[package]]
 name = "multer"
 version = "2.1.0"
@@ -4187,7 +4089,7 @@ dependencies = [
 "log",
 "memchr",
 "mime",
- "spin",
+ "spin 0.9.8",
 "tokio",
 "tokio-util",
 "version_check",
@@ -4317,12 +4219,6 @@ dependencies = [
 "minimal-lexical",
 ]

-[[package]]
-name = "nonempty"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7"
-
 [[package]]
 name = "notify"
 version = "5.2.0"
@@ -5018,13 +4914,6 @@ dependencies = [
 "nym-multisig-contract-common",
 ]

-[[package]]
-name = "nym-common-models"
-version = "0.1.0"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "nym-compact-ecash"
 version = "0.1.0"
@@ -5099,75 +4988,6 @@ dependencies = [
 "tokio",
 ]

-[[package]]
-name = "nym-credential-proxy"
-version = "0.1.1"
-dependencies = [
- "anyhow",
- "async-trait",
- "axum 0.7.7",
- "bip39",
- "bs58",
- "cfg-if",
- "clap 4.5.20",
- "colored",
- "dotenvy",
- "futures",
- "humantime 2.1.0",
- "nym-bin-common",
- "nym-compact-ecash",
- "nym-config",
- "nym-credential-proxy-requests",
- "nym-credentials",
- "nym-credentials-interface",
- "nym-crypto",
- "nym-http-api-common",
- "nym-network-defaults",
- "nym-validator-client",
- "rand",
- "reqwest 0.12.4",
- "serde",
- "serde_json",
- "sqlx",
- "strum 0.26.3",
- "strum_macros 0.26.4",
- "tempfile",
- "thiserror",
- "time",
- "tokio",
- "tokio-util",
- "tower 0.4.13",
- "tower-http",
- "tracing",
- "url",
- "utoipa",
- "utoipa-swagger-ui",
- "uuid",
- "zeroize",
-]
-
-[[package]]
-name = "nym-credential-proxy-requests"
-version = "0.1.0"
-dependencies = [
- "async-trait",
- "nym-credentials",
- "nym-credentials-interface",
- "nym-http-api-client",
- "nym-http-api-common",
- "nym-serde-helpers",
- "reqwest 0.12.4",
- "schemars",
- "serde",
- "serde_json",
- "time",
- "tsify",
- "utoipa",
- "uuid",
- "wasm-bindgen",
- "wasmtimer",
-]
-
 [[package]]
 name = "nym-credential-storage"
 version = "0.1.0"
@@ -5409,12 +5229,12 @@ dependencies = [
 name = "nym-explorer-client"
 version = "0.1.0"
 dependencies = [
+ "log",
 "nym-explorer-api-requests",
 "reqwest 0.12.4",
 "serde",
 "thiserror",
 "tokio",
- "tracing",
 "url",
 ]

@@ -5459,7 +5279,6 @@ dependencies = [
 "nym-credentials-interface",
 "nym-crypto",
 "nym-gateway-requests",
- "nym-gateway-stats-storage",
 "nym-gateway-storage",
 "nym-ip-packet-router",
 "nym-mixnet-client",
@@ -5468,11 +5287,9 @@ dependencies = [
 "nym-network-requester",
 "nym-node-http-api",
 "nym-pemstore",
- "nym-sdk",
 "nym-sphinx",
 "nym-statistics-common",
 "nym-task",
- "nym-topology",
 "nym-types",
 "nym-validator-client",
 "nym-wireguard",
@@ -5557,19 +5374,6 @@ dependencies = [
 "zeroize",
 ]

-[[package]]
-name = "nym-gateway-stats-storage"
-version = "0.1.0"
-dependencies = [
- "nym-credentials-interface",
- "nym-sphinx",
- "sqlx",
- "thiserror",
- "time",
- "tokio",
- "tracing",
-]
-
 [[package]]
 name = "nym-gateway-storage"
 version = "0.1.0"
@@ -5636,7 +5440,6 @@ name = "nym-http-api-common"
 version = "0.1.0"
 dependencies = [
 "axum 0.7.7",
- "axum-client-ip",
 "bytes",
 "colored",
 "mime",
@@ -6082,61 +5885,6 @@ dependencies = [
 "utoipa",
 ]

-[[package]]
-name = "nym-node-status-agent"
-version = "0.1.4"
-dependencies = [
- "anyhow",
- "clap 4.5.20",
- "nym-bin-common",
- "nym-common-models",
- "reqwest 0.12.4",
- "serde_json",
- "tokio",
- "tokio-util",
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "nym-node-status-api"
-version = "0.1.5"
-dependencies = [
- "anyhow",
- "axum 0.7.7",
- "chrono",
- "clap 4.5.20",
- "cosmwasm-std",
- "envy",
- "futures-util",
- "moka",
- "nym-bin-common",
- "nym-common-models",
- "nym-explorer-client",
- "nym-network-defaults",
- "nym-node-requests",
- "nym-task",
- "nym-validator-client",
- "regex",
- "reqwest 0.12.4",
- "serde",
- "serde_json",
- "serde_json_path",
- "sqlx",
- "strum 0.26.3",
- "strum_macros 0.26.4",
- "thiserror",
- "tokio",
- "tokio-util",
- "tower-http",
- "tracing",
- "tracing-log 0.2.0",
- "tracing-subscriber",
- "utoipa",
- "utoipa-swagger-ui",
- "utoipauto",
-]
-
 [[package]]
 name = "nym-node-tester-utils"
 version = "0.1.0"
@@ -6731,6 +6479,7 @@ dependencies = [
 "flate2",
 "futures",
 "itertools 0.13.0",
+ "log",
 "nym-api-requests",
 "nym-coconut-bandwidth-contract-common",
 "nym-coconut-dkg-common",
@@ -6754,7 +6503,6 @@ dependencies = [
 "thiserror",
 "time",
 "tokio",
- "tracing",
 "ts-rs",
 "url",
 "wasmtimer",
@@ -6812,31 +6560,6 @@ dependencies = [
 "ts-rs",
 ]

-[[package]]
-name = "nym-vpn-api-lib-wasm"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "getrandom",
- "js-sys",
- "nym-bin-common",
- "nym-compact-ecash",
- "nym-credential-proxy-requests",
- "nym-credentials",
- "nym-credentials-interface",
- "nym-crypto",
- "nym-ecash-time",
- "serde",
- "serde-wasm-bindgen 0.6.5",
- "serde_json",
- "thiserror",
- "time",
- "tsify",
- "wasm-bindgen",
- "wasm-utils",
- "zeroize",
-]
-
 [[package]]
 name = "nym-wallet-types"
 version = "1.0.0"
@@ -6973,9 +6696,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"

 [[package]]
 name = "oneshot-uniffi"
@@ -7689,21 +7412,6 @@ dependencies = [
 "psl-types",
 ]

-[[package]]
-name = "quanta"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5"
-dependencies = [
- "crossbeam-utils",
- "libc",
- "once_cell",
- "raw-cpuid",
- "wasi",
- "web-sys",
- "winapi",
-]
-
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -7795,15 +7503,6 @@ dependencies = [
 "rand_core 0.6.4",
 ]

-[[package]]
-name = "raw-cpuid"
-version = "11.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
-dependencies = [
- "bitflags 2.5.0",
-]
-
 [[package]]
 name = "rayon"
 version = "1.10.0"
@@ -8033,7 +7732,7 @@ dependencies = [
 "cfg-if",
 "getrandom",
 "libc",
- "spin",
+ "spin 0.9.8",
 "untrusted",
 "windows-sys 0.52.0",
 ]
@@ -8451,7 +8150,6 @@ dependencies = [
 "schemars_derive",
 "serde",
 "serde_json",
- "uuid",
 ]

 [[package]]
@@ -8664,59 +8362,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "serde_json_path"
-version = "0.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bc0207b6351893eafa1e39aa9aea452abb6425ca7b02dd64faf29109e7a33ba"
-dependencies = [
- "inventory",
- "nom",
- "once_cell",
- "regex",
- "serde",
- "serde_json",
- "serde_json_path_core",
- "serde_json_path_macros",
- "thiserror",
-]
-
-[[package]]
-name = "serde_json_path_core"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3d64fe53ce1aaa31bea2b2b46d3b6ab6a37e61854bedcbd9f174e188f3f7d79"
-dependencies = [
- "inventory",
- "once_cell",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "serde_json_path_macros"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a31e8177a443fd3e94917f12946ae7891dfb656e6d4c5e79b8c5d202fbcb723"
-dependencies = [
- "inventory",
- "once_cell",
- "serde_json_path_core",
- "serde_json_path_macros_internal",
-]
-
-[[package]]
-name = "serde_json_path_macros_internal"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75dde5a1d2ed78dfc411fc45592f72d3694436524d3353683ecb3d22009731dc"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.82",
-]
-
 [[package]]
 name = "serde_path_to_error"
 version = "0.1.16"
@@ -9019,6 +8664,12 @@ dependencies = [
 "subtle 2.5.0",
 ]

+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
 [[package]]
 name = "spin"
 version = "0.9.8"
@@ -9075,7 +8726,7 @@ dependencies = [
 "crc",
 "crossbeam-queue",
 "either",
- "event-listener 2.5.3",
+ "event-listener",
 "futures-channel",
 "futures-core",
 "futures-intrusive",
@@ -9485,12 +9136,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "tagptr"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417"
-
 [[package]]
 name = "tap"
 version = "1.0.1"
@@ -10263,12 +9908,6 @@ dependencies = [
 "syn 1.0.109",
 ]

-[[package]]
-name = "triomphe"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3"
-
 [[package]]
 name = "try-lock"
 version = "0.2.5"
@@ -19,33 +19,33 @@ members = [
    "clients/native",
    "clients/native/websocket-requests",
    "clients/socks5",
-    "common/async-file-watcher",
    "common/authenticator-requests",
+    "common/async-file-watcher",
    "common/bandwidth-controller",
    "common/bin-common",
    "common/client-core",
    "common/client-core/config-types",
-    "common/client-core/gateways-storage",
    "common/client-core/surb-storage",
+    "common/client-core/gateways-storage",
    "common/client-libs/gateway-client",
    "common/client-libs/mixnet-client",
    "common/client-libs/validator-client",
    "common/commands",
    "common/config",
    "common/cosmwasm-smart-contracts/coconut-bandwidth-contract",
+    "common/cosmwasm-smart-contracts/ecash-contract",
    "common/cosmwasm-smart-contracts/coconut-dkg",
    "common/cosmwasm-smart-contracts/contracts-common",
-    "common/cosmwasm-smart-contracts/ecash-contract",
    "common/cosmwasm-smart-contracts/group-contract",
    "common/cosmwasm-smart-contracts/mixnet-contract",
    "common/cosmwasm-smart-contracts/multisig-contract",
    "common/cosmwasm-smart-contracts/vesting-contract",
    "common/country-group",
    "common/credential-storage",
-    "common/credential-utils",
-    "common/credential-verification",
    "common/credentials",
+    "common/credential-utils",
    "common/credentials-interface",
+    "common/credential-verification",
    "common/crypto",
    "common/dkg",
    "common/ecash-double-spending",
@@ -54,21 +54,19 @@ members = [
    "common/exit-policy",
    "common/gateway-requests",
    "common/gateway-storage",
-    "common/gateway-stats-storage",
    "common/http-api-client",
    "common/http-api-common",
    "common/inclusion-probability",
    "common/ip-packet-requests",
    "common/ledger",
    "common/mixnode-common",
-    "common/models",
    "common/network-defaults",
    "common/node-tester-utils",
    "common/nonexhaustive-delayqueue",
+    "common/nymcoconut",
+    "common/nym_offline_compact_ecash",
    "common/nym-id",
    "common/nym-metrics",
-    "common/nym_offline_compact_ecash",
-    "common/nymcoconut",
    "common/nymsphinx",
    "common/nymsphinx/acknowledgements",
    "common/nymsphinx/addressing",
@@ -98,35 +96,30 @@ members = [
    "common/wasm/utils",
    "common/wireguard",
    "common/wireguard-types",
-    # "documentation/autodoc",
+    "documentation/autodoc",
    "explorer-api",
    "explorer-api/explorer-api-requests",
    "explorer-api/explorer-client",
    "gateway",
    "integrations/bity",
    "mixnode",
-    "sdk/ffi/cpp",
-    "sdk/ffi/go",
-    "sdk/ffi/shared",
    "sdk/lib/socks5-listener",
    "sdk/rust/nym-sdk",
+    "sdk/ffi/shared",
+    "sdk/ffi/go",
+    "sdk/ffi/cpp",
    "service-providers/authenticator",
    "service-providers/common",
    "service-providers/ip-packet-router",
    "service-providers/network-requester",
-    "nym-api",
-    "nym-api/nym-api-requests",
-    "nym-browser-extension/storage",
-    "nym-credential-proxy/nym-credential-proxy",
-    "nym-credential-proxy/nym-credential-proxy-requests",
-    "nym-credential-proxy/vpn-api-lib-wasm",
-    "nym-data-observatory",
    "nym-network-monitor",
+    "nym-api",
+    "nym-browser-extension/storage",
+    "nym-api/nym-api-requests",
+    "nym-data-observatory",
    "nym-node",
    "nym-node/nym-node-http-api",
    "nym-node/nym-node-requests",
-    "nym-node-status-api",
-    "nym-node-status-agent",
    "nym-outfox",
    "nym-validator-rewarder",
    "tools/echo-server",
@@ -144,27 +137,23 @@ members = [
    "wasm/mix-fetch",
    "wasm/node-tester",
    "wasm/zknym-lib",
+    "tools/internal/testnet-manager",
+    "tools/internal/testnet-manager/dkg-bypass-contract",
    "tools/echo-server",
    "tools/internal/contract-state-importer/importer-cli",
    "tools/internal/contract-state-importer/importer-contract",
-    "tools/internal/testnet-manager",
-    "tools/internal/testnet-manager/dkg-bypass-contract",
 ]

 default-members = [
    "clients/native",
    "clients/socks5",
-    "common/models",
    "explorer-api",
    "gateway",
    "mixnode",
    "nym-api",
-    "nym-credential-proxy/nym-credential-proxy",
    "nym-data-observatory",
    "nym-node",
-    "nym-node-status-api",
    "nym-validator-rewarder",
-    "nym-node-status-api",
    "service-providers/authenticator",
    "service-providers/ip-packet-router",
    "service-providers/network-requester",
@@ -198,14 +187,16 @@ aead = "0.5.2"
 anyhow = "1.0.90"
 argon2 = "0.5.0"
 async-trait = "0.1.83"
-axum-client-ip = "0.6.1"
 axum = "0.7.5"
 axum-extra = "0.9.4"
 base64 = "0.22.1"
 bincode = "1.3.3"
 bip39 = { version = "2.0.0", features = ["zeroize"] }
-bit-vec = "0.7.0"                                     # can we unify those?
+
+# can we unify those?
+bit-vec = "0.7.0"
 bitvec = "1.0.0"
+
 blake3 = "1.5.4"
 bloomfilter = "1.0.14"
 bs58 = "0.5.1"
@@ -243,12 +234,10 @@ dotenvy = "0.15.6"
 ecdsa = "0.16"
 ed25519-dalek = "2.1"
 etherparse = "0.13.0"
-envy = "0.4"
 eyre = "0.6.9"
 fastrand = "2.1.1"
 flate2 = "1.0.34"
 futures = "0.3.28"
-futures-util = "0.3"
 generic-array = "0.14.7"
 getrandom = "0.2.10"
 getset = "0.1.3"
@@ -272,17 +261,16 @@ ipnetwork = "0.20"
 isocountry = "0.3.2"
 itertools = "0.13.0"
 k256 = "0.13"
-lazy_static = "1.5.0"
+lazy_static = "1.4.0"
 ledger-transport = "0.10.0"
 ledger-transport-hid = "0.10.0"
 log = "0.4"
 maxminddb = "0.23.0"
 mime = "0.3.17"
-moka = { version = "0.12", features = ["future"] }
 nix = "0.27.1"
 notify = "5.1.0"
 okapi = "0.7.0"
-once_cell = "1.20.2"
+once_cell = "1.7.2"
 opentelemetry = "0.19.0"
 opentelemetry-jaeger = "0.18.0"
 parking_lot = "0.12.3"
@@ -312,7 +300,6 @@ serde = "1.0.211"
 serde_bytes = "0.11.15"
 serde_derive = "1.0"
 serde_json = "1.0.132"
-serde_json_path = "0.6.7"
 serde_repr = "0.1"
 serde_with = "3.9.0"
 serde_yaml = "0.9.25"
@@ -321,7 +308,6 @@ si-scale = "0.2.3"
 sphinx-packet = "0.1.1"
 sqlx = "0.7.4"
 strum = "0.26"
-strum_macros = "0.26"
 subtle-encoding = "0.5"
 syn = "1"
 sysinfo = "0.30.13"
@@ -343,7 +329,6 @@ tracing = "0.1.37"
 tracing-opentelemetry = "0.19.0"
 tracing-subscriber = "0.3.16"
 tracing-tree = "0.2.2"
-tracing-log = "0.2"
 ts-rs = "10.0.0"
 tungstenite = { version = "0.20.1", default-features = false }
 url = "2.5"
@@ -410,6 +395,7 @@ wasm-bindgen-futures = "0.4.45"
 wasmtimer = "0.2.0"
 web-sys = "0.3.72"

+
 # Profile settings for individual crates

 # Compile-time verified queries do quite a bit of work at compile time. Incremental
@@ -45,4 +45,3 @@ tracing = [
    "opentelemetry",
 ]
 clap = [ "dep:clap", "dep:clap_complete", "dep:clap_complete_fig" ]
-models = []
@@ -112,7 +112,7 @@ impl GeoAwareTopologyProvider {
    async fn get_topology(&self) -> Option<NymTopology> {
        let mixnodes = match self
            .validator_client
-            .get_all_basic_active_mixing_assigned_nodes(Some(self.client_version.clone()))
+            .get_basic_active_mixing_assigned_nodes(Some(self.client_version.clone()))
            .await
        {
            Err(err) => {
@@ -6,6 +6,7 @@ pub(crate) use accessor::{TopologyAccessor, TopologyReadPermit};
 use futures::StreamExt;
 use log::*;
 use nym_sphinx::addressing::nodes::NodeIdentity;
+use nym_topology::provider_trait::TopologyProvider;
 use nym_topology::NymTopologyError;
 use std::time::Duration;

@@ -17,11 +18,7 @@ use wasmtimer::tokio::sleep;

 mod accessor;
 pub mod geo_aware_provider;
-pub mod nym_api_provider;
-
-pub use geo_aware_provider::GeoAwareTopologyProvider;
-pub use nym_api_provider::{Config as NymApiTopologyProviderConfig, NymApiTopologyProvider};
-pub use nym_topology::provider_trait::TopologyProvider;
+pub(crate) mod nym_api_provider;

 // TODO: move it to config later
 const MAX_FAILURE_COUNT: usize = 10;
@@ -14,10 +14,9 @@ use url::Url;
 pub const DEFAULT_MIN_MIXNODE_PERFORMANCE: u8 = 50;
 pub const DEFAULT_MIN_GATEWAY_PERFORMANCE: u8 = 50;

-#[derive(Debug)]
-pub struct Config {
-    pub min_mixnode_performance: u8,
-    pub min_gateway_performance: u8,
+pub(crate) struct Config {
+    pub(crate) min_mixnode_performance: u8,
+    pub(crate) min_gateway_performance: u8,
 }

 impl Default for Config {
@@ -30,7 +29,7 @@ impl Default for Config {
    }
 }

-pub struct NymApiTopologyProvider {
+pub(crate) struct NymApiTopologyProvider {
    config: Config,

    validator_client: nym_validator_client::client::NymApiClient,
@@ -41,7 +40,7 @@ pub struct NymApiTopologyProvider {
 }

 impl NymApiTopologyProvider {
-    pub fn new(
+    pub(crate) fn new(
        config: Config,
        mut nym_api_urls: Vec<Url>,
        client_version: String,
@@ -99,7 +98,7 @@ impl NymApiTopologyProvider {
    async fn get_current_compatible_topology(&mut self) -> Option<NymTopology> {
        let mixnodes = match self
            .validator_client
-            .get_all_basic_active_mixing_assigned_nodes(Some(self.client_version.clone()))
+            .get_basic_active_mixing_assigned_nodes(Some(self.client_version.clone()))
            .await
        {
            Err(err) => {
@@ -121,9 +121,7 @@ pub async fn current_mixnodes<R: Rng>(

    log::trace!("Fetching list of mixnodes from: {nym_api}");

-    let mixnodes = client
-        .get_all_basic_active_mixing_assigned_nodes(None)
-        .await?;
+    let mixnodes = client.get_basic_active_mixing_assigned_nodes(None).await?;
    let valid_mixnodes = mixnodes
        .iter()
        .filter_map(|mixnode| mixnode.try_into().ok())
@@ -25,7 +25,7 @@ serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 nym-http-api-client = { path = "../../../common/http-api-client" }
 thiserror = { workspace = true }
-tracing = { workspace = true }
+log = { workspace = true }
 url = { workspace = true, features = ["serde"] }
 tokio = { workspace = true, features = ["sync", "time"] }
 time = { workspace = true, features = ["formatting"] }
@@ -19,7 +19,7 @@ use nym_api_requests::ecash::{
 };
 use nym_api_requests::models::{
    GatewayCoreStatusResponse, MixnodeCoreStatusResponse, MixnodeStatusResponse,
-    NymNodeDescription, RewardEstimationResponse, StakeSaturationResponse,
+    RewardEstimationResponse, StakeSaturationResponse,
 };
 use nym_api_requests::models::{LegacyDescribedGateway, MixNodeBondAnnotated};
 use nym_api_requests::nym_nodes::SkimmedNode;
@@ -30,10 +30,10 @@ use time::Date;
 use url::Url;

 pub use crate::nym_api::NymApiClientExt;
-use nym_mixnet_contract_common::NymNodeDetails;
 pub use nym_mixnet_contract_common::{
    mixnode::MixNodeDetails, GatewayBond, IdentityKey, IdentityKeyRef, NodeId,
 };
+
 // re-export the type to not break existing imports
 pub use crate::coconut::EcashApiClient;

@@ -106,9 +106,7 @@ impl Config {

 pub struct Client<C, S = NoSigner> {
    // ideally they would have been read-only, but unfortunately rust doesn't have such features
-    // #[deprecated(note = "please use `nym_api_client` instead")]
    pub nym_api: nym_api::Client,
-    // pub nym_api_client: NymApiClient,
    pub nyxd: NyxdClient<C, S>,
 }

@@ -245,50 +243,6 @@ impl<C, S> Client<C, S> {
        Ok(self.nym_api.get_gateways().await?)
    }

-    // TODO: combine with NymApiClient...
-    pub async fn get_all_cached_described_nodes(
-        &self,
-    ) -> Result<Vec<NymNodeDescription>, ValidatorClientError> {
-        // TODO: deal with paging in macro or some helper function or something, because it's the same pattern everywhere
-        let mut page = 0;
-        let mut descriptions = Vec::new();
-
-        loop {
-            let mut res = self.nym_api.get_nodes_described(Some(page), None).await?;
-
-            descriptions.append(&mut res.data);
-            if descriptions.len() < res.pagination.total {
-                page += 1
-            } else {
-                break;
-            }
-        }
-
-        Ok(descriptions)
-    }
-
-    // TODO: combine with NymApiClient...
-    pub async fn get_all_cached_bonded_nym_nodes(
-        &self,
-    ) -> Result<Vec<NymNodeDetails>, ValidatorClientError> {
-        // TODO: deal with paging in macro or some helper function or something, because it's the same pattern everywhere
-        let mut page = 0;
-        let mut bonds = Vec::new();
-
-        loop {
-            let mut res = self.nym_api.get_nym_nodes(Some(page), None).await?;
-
-            bonds.append(&mut res.data);
-            if bonds.len() < res.pagination.total {
-                page += 1
-            } else {
-                break;
-            }
-        }
-
-        Ok(bonds)
-    }
-
    pub async fn blind_sign(
        &self,
        request_body: &BlindSignRequestBody,
@@ -311,13 +265,6 @@ impl NymApiClient {
        NymApiClient { nym_api }
    }

-    #[cfg(not(target_arch = "wasm32"))]
-    pub fn new_with_timeout(api_url: Url, timeout: std::time::Duration) -> Self {
-        let nym_api = nym_api::Client::new(api_url, Some(timeout));
-
-        NymApiClient { nym_api }
-    }
-
    pub fn new_with_user_agent(api_url: Url, user_agent: UserAgent) -> Self {
        let nym_api = nym_api::Client::builder::<_, ValidatorClientError>(api_url)
            .expect("invalid api url")
@@ -336,7 +283,7 @@ impl NymApiClient {
        self.nym_api.change_base_url(new_endpoint);
    }

-    #[deprecated(note = "use get_all_basic_active_mixing_assigned_nodes instead")]
+    #[deprecated(note = "use get_basic_active_mixing_assigned_nodes instead")]
    pub async fn get_basic_mixnodes(
        &self,
        semver_compatibility: Option<String>,
@@ -373,7 +320,7 @@ impl NymApiClient {
        loop {
            let mut res = self
                .nym_api
-                .get_basic_entry_assigned_nodes(
+                .get_all_basic_entry_assigned_nodes(
                    semver_compatibility.clone(),
                    false,
                    Some(page),
@@ -394,7 +341,7 @@ impl NymApiClient {

    /// retrieve basic information for nodes that got assigned 'mixing' node in this epoch
    /// this includes legacy mixnodes and nym-nodes
-    pub async fn get_all_basic_active_mixing_assigned_nodes(
+    pub async fn get_basic_active_mixing_assigned_nodes(
        &self,
        semver_compatibility: Option<String>,
    ) -> Result<Vec<SkimmedNode>, ValidatorClientError> {
@@ -424,32 +371,6 @@ impl NymApiClient {
        Ok(nodes)
    }

-    /// retrieve basic information for all bonded nodes on the network
-    pub async fn get_all_basic_nodes(
-        &self,
-        semver_compatibility: Option<String>,
-    ) -> Result<Vec<SkimmedNode>, ValidatorClientError> {
-        // TODO: deal with paging in macro or some helper function or something, because it's the same pattern everywhere
-        let mut page = 0;
-        let mut nodes = Vec::new();
-
-        loop {
-            let mut res = self
-                .nym_api
-                .get_basic_nodes(semver_compatibility.clone(), false, Some(page), None)
-                .await?;
-
-            nodes.append(&mut res.nodes.data);
-            if nodes.len() < res.nodes.pagination.total {
-                page += 1
-            } else {
-                break;
-            }
-        }
-
-        Ok(nodes)
-    }
-
    pub async fn get_cached_active_mixnodes(
        &self,
    ) -> Result<Vec<MixNodeDetails>, ValidatorClientError> {
@@ -476,48 +397,6 @@ impl NymApiClient {
        Ok(self.nym_api.get_gateways_described().await?)
    }

-    pub async fn get_all_described_nodes(
-        &self,
-    ) -> Result<Vec<NymNodeDescription>, ValidatorClientError> {
-        // TODO: deal with paging in macro or some helper function or something, because it's the same pattern everywhere
-        let mut page = 0;
-        let mut descriptions = Vec::new();
-
-        loop {
-            let mut res = self.nym_api.get_nodes_described(Some(page), None).await?;
-
-            descriptions.append(&mut res.data);
-            if descriptions.len() < res.pagination.total {
-                page += 1
-            } else {
-                break;
-            }
-        }
-
-        Ok(descriptions)
-    }
-
-    pub async fn get_all_bonded_nym_nodes(
-        &self,
-    ) -> Result<Vec<NymNodeDetails>, ValidatorClientError> {
-        // TODO: deal with paging in macro or some helper function or something, because it's the same pattern everywhere
-        let mut page = 0;
-        let mut bonds = Vec::new();
-
-        loop {
-            let mut res = self.nym_api.get_nym_nodes(Some(page), None).await?;
-
-            bonds.append(&mut res.data);
-            if bonds.len() < res.pagination.total {
-                page += 1
-            } else {
-                break;
-            }
-        }
-
-        Ok(bonds)
-    }
-
    pub async fn get_gateway_core_status_count(
        &self,
        identity: IdentityKeyRef<'_>,
@@ -121,36 +121,36 @@ async fn test_nyxd_connection(
    {
        Ok(Err(NyxdError::TendermintErrorRpc(e))) => {
            // If we get a tendermint-rpc error, we classify the node as not contactable
-            tracing::warn!("Checking: nyxd url: {url}: {}: {}", "failed".red(), e);
+            log::warn!("Checking: nyxd url: {url}: {}: {}", "failed".red(), e);
            false
        }
        Ok(Err(NyxdError::AbciError { code, log, .. })) => {
            // We accept the mixnet contract not found as ok from a connection standpoint. This happens
            // for example on a pre-launch network.
-            tracing::debug!(
+            log::debug!(
                "Checking: nyxd url: {url}: {}, but with abci error: {code}: {log}",
                "success".green()
            );
            code == 18
        }
        Ok(Err(error @ NyxdError::NoContractAddressAvailable(_))) => {
-            tracing::warn!("Checking: nyxd url: {url}: {}: {error}", "failed".red());
+            log::warn!("Checking: nyxd url: {url}: {}: {error}", "failed".red());
            false
        }
        Ok(Err(e)) => {
            // For any other error, we're optimistic and just try anyway.
-            tracing::warn!(
+            log::warn!(
                "Checking: nyxd_url: {url}: {}, but with error: {e}",
                "success".green()
            );
            true
        }
        Ok(Ok(_)) => {
-            tracing::debug!("Checking: nyxd_url: {url}: {}", "success".green());
+            log::debug!("Checking: nyxd_url: {url}: {}", "success".green());
            true
        }
        Err(e) => {
-            tracing::warn!("Checking: nyxd_url: {url}: {}: {e}", "failed".red());
+            log::warn!("Checking: nyxd_url: {url}: {}: {e}", "failed".red());
            false
        }
    };
@@ -169,15 +169,15 @@ async fn test_nym_api_connection(
    .await
    {
        Ok(Ok(_)) => {
-            tracing::debug!("Checking: api_url: {url}: {}", "success".green());
+            log::debug!("Checking: api_url: {url}: {}", "success".green());
            true
        }
        Ok(Err(e)) => {
-            tracing::debug!("Checking: api_url: {url}: {}: {e}", "failed".red());
+            log::debug!("Checking: api_url: {url}: {}: {e}", "failed".red());
            false
        }
        Err(e) => {
-            tracing::debug!("Checking: api_url: {url}: {}: {e}", "failed".red());
+            log::debug!("Checking: api_url: {url}: {}: {e}", "failed".red());
            false
        }
    };
@@ -11,10 +11,9 @@ use nym_api_requests::ecash::models::{
 };
 use nym_api_requests::ecash::VerificationKeyResponse;
 use nym_api_requests::models::{
-    AnnotationResponse, LegacyDescribedMixNode, NodePerformanceResponse, NymNodeDescription,
+    AnnotationResponse, LegacyDescribedMixNode, NodePerformanceResponse,
 };
 use nym_api_requests::nym_nodes::PaginatedCachedNodesResponse;
-use nym_api_requests::pagination::PaginatedResponse;
 pub use nym_api_requests::{
    ecash::{
        models::{
@@ -39,10 +38,9 @@ use nym_contracts_common::IdentityKey;
 pub use nym_http_api_client::Client;
 use nym_http_api_client::{ApiClient, NO_PARAMS};
 use nym_mixnet_contract_common::mixnode::MixNodeDetails;
-use nym_mixnet_contract_common::{GatewayBond, IdentityKeyRef, NodeId, NymNodeDetails};
+use nym_mixnet_contract_common::{GatewayBond, IdentityKeyRef, NodeId};
 use time::format_description::BorrowedFormatItem;
 use time::Date;
-use tracing::instrument;

 pub mod error;
 pub mod routes;
@@ -54,13 +52,11 @@ pub fn rfc_3339_date() -> Vec<BorrowedFormatItem<'static>> {
 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
 #[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 pub trait NymApiClientExt: ApiClient {
-    #[instrument(level = "debug", skip(self))]
    async fn get_mixnodes(&self) -> Result<Vec<MixNodeDetails>, NymAPIError> {
        self.get_json(&[routes::API_VERSION, routes::MIXNODES], NO_PARAMS)
            .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_mixnodes_detailed(&self) -> Result<Vec<MixNodeBondAnnotated>, NymAPIError> {
        self.get_json(
            &[
@@ -74,7 +70,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_gateways_detailed(&self) -> Result<Vec<GatewayBondAnnotated>, NymAPIError> {
        self.get_json(
            &[
@@ -88,7 +83,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_mixnodes_detailed_unfiltered(
        &self,
    ) -> Result<Vec<MixNodeBondAnnotated>, NymAPIError> {
@@ -104,13 +98,11 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_gateways(&self) -> Result<Vec<GatewayBond>, NymAPIError> {
        self.get_json(&[routes::API_VERSION, routes::GATEWAYS], NO_PARAMS)
            .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_gateways_described(&self) -> Result<Vec<LegacyDescribedGateway>, NymAPIError> {
        self.get_json(
            &[routes::API_VERSION, routes::GATEWAYS, routes::DESCRIBED],
@@ -119,7 +111,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_mixnodes_described(&self) -> Result<Vec<LegacyDescribedMixNode>, NymAPIError> {
        self.get_json(
            &[routes::API_VERSION, routes::MIXNODES, routes::DESCRIBED],
@@ -128,45 +119,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn get_nodes_described(
-        &self,
-        page: Option<u32>,
-        per_page: Option<u32>,
-    ) -> Result<PaginatedResponse<NymNodeDescription>, NymAPIError> {
-        let mut params = Vec::new();
-
-        if let Some(page) = page {
-            params.push(("page", page.to_string()))
-        }
-
-        if let Some(per_page) = per_page {
-            params.push(("per_page", per_page.to_string()))
-        }
-
-        self.get_json(&[routes::API_VERSION, "nym-nodes", "described"], &params)
-            .await
-    }
-
-    async fn get_nym_nodes(
-        &self,
-        page: Option<u32>,
-        per_page: Option<u32>,
-    ) -> Result<PaginatedResponse<NymNodeDetails>, NymAPIError> {
-        let mut params = Vec::new();
-
-        if let Some(page) = page {
-            params.push(("page", page.to_string()))
-        }
-
-        if let Some(per_page) = per_page {
-            params.push(("per_page", per_page.to_string()))
-        }
-
-        self.get_json(&[routes::API_VERSION, "nym-nodes", "bonded"], &params)
-            .await
-    }
-
-    #[tracing::instrument(level = "debug", skip_all)]
    async fn get_basic_mixnodes(
        &self,
        semver_compatibility: Option<String>,
@@ -190,7 +142,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_basic_gateways(
        &self,
        semver_compatibility: Option<String>,
@@ -216,8 +167,7 @@ pub trait NymApiClientExt: ApiClient {

    /// retrieve basic information for nodes are capable of operating as an entry gateway
    /// this includes legacy gateways and nym-nodes
-    #[instrument(level = "debug", skip(self))]
-    async fn get_basic_entry_assigned_nodes(
+    async fn get_all_basic_entry_assigned_nodes(
        &self,
        semver_compatibility: Option<String>,
        no_legacy: bool,
@@ -258,7 +208,6 @@ pub trait NymApiClientExt: ApiClient {

    /// retrieve basic information for nodes that got assigned 'mixing' node in this epoch
    /// this includes legacy mixnodes and nym-nodes
-    #[instrument(level = "debug", skip(self))]
    async fn get_basic_active_mixing_assigned_nodes(
        &self,
        semver_compatibility: Option<String>,
@@ -298,39 +247,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn get_basic_nodes(
-        &self,
-        semver_compatibility: Option<String>,
-        no_legacy: bool,
-        page: Option<u32>,
-        per_page: Option<u32>,
-    ) -> Result<PaginatedCachedNodesResponse<SkimmedNode>, NymAPIError> {
-        let mut params = Vec::new();
-
-        if let Some(arg) = &semver_compatibility {
-            params.push(("semver_compatibility", arg.clone()))
-        }
-
-        if no_legacy {
-            params.push(("no_legacy", "true".to_string()))
-        }
-
-        if let Some(page) = page {
-            params.push(("page", page.to_string()))
-        }
-
-        if let Some(per_page) = per_page {
-            params.push(("per_page", per_page.to_string()))
-        }
-
-        self.get_json(
-            &[routes::API_VERSION, "unstable", "nym-nodes", "skimmed"],
-            &params,
-        )
-        .await
-    }
-
-    #[instrument(level = "debug", skip(self))]
    async fn get_active_mixnodes(&self) -> Result<Vec<MixNodeDetails>, NymAPIError> {
        self.get_json(
            &[routes::API_VERSION, routes::MIXNODES, routes::ACTIVE],
@@ -339,7 +255,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_active_mixnodes_detailed(&self) -> Result<Vec<MixNodeBondAnnotated>, NymAPIError> {
        self.get_json(
            &[
@@ -354,7 +269,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_rewarded_mixnodes(&self) -> Result<Vec<MixNodeDetails>, NymAPIError> {
        self.get_json(
            &[routes::API_VERSION, routes::MIXNODES, routes::REWARDED],
@@ -363,7 +277,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_mixnode_report(
        &self,
        mix_id: NodeId,
@@ -381,7 +294,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_gateway_report(
        &self,
        identity: IdentityKeyRef<'_>,
@@ -399,7 +311,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_mixnode_history(
        &self,
        mix_id: NodeId,
@@ -417,7 +328,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_gateway_history(
        &self,
        identity: IdentityKeyRef<'_>,
@@ -435,7 +345,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_rewarded_mixnodes_detailed(
        &self,
    ) -> Result<Vec<MixNodeBondAnnotated>, NymAPIError> {
@@ -452,7 +361,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_gateway_core_status_count(
        &self,
        identity: IdentityKeyRef<'_>,
@@ -484,7 +392,6 @@ pub trait NymApiClientExt: ApiClient {
        }
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_mixnode_core_status_count(
        &self,
        mix_id: NodeId,
@@ -517,7 +424,6 @@ pub trait NymApiClientExt: ApiClient {
        }
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_mixnode_status(
        &self,
        mix_id: NodeId,
@@ -535,7 +441,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_mixnode_reward_estimation(
        &self,
        mix_id: NodeId,
@@ -553,7 +458,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn compute_mixnode_reward_estimation(
        &self,
        mix_id: NodeId,
@@ -573,7 +477,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_mixnode_stake_saturation(
        &self,
        mix_id: NodeId,
@@ -591,7 +494,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_mixnode_inclusion_probability(
        &self,
        mix_id: NodeId,
@@ -609,7 +511,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_current_node_performance(
        &self,
        node_id: NodeId,
@@ -640,7 +541,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_mixnodes_blacklisted(&self) -> Result<Vec<NodeId>, NymAPIError> {
        self.get_json(
            &[routes::API_VERSION, routes::MIXNODES, routes::BLACKLISTED],
@@ -649,7 +549,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn get_gateways_blacklisted(&self) -> Result<Vec<IdentityKey>, NymAPIError> {
        self.get_json(
            &[routes::API_VERSION, routes::GATEWAYS, routes::BLACKLISTED],
@@ -658,7 +557,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self, request_body))]
    async fn blind_sign(
        &self,
        request_body: &BlindSignRequestBody,
@@ -675,7 +573,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self, request_body))]
    async fn verify_ecash_ticket(
        &self,
        request_body: &VerifyEcashTicketBody,
@@ -692,7 +589,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self, request_body))]
    async fn batch_redeem_ecash_tickets(
        &self,
        request_body: &BatchRedeemTicketsBody,
@@ -709,7 +605,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn double_spending_filter_v1(&self) -> Result<SpentCredentialsResponse, NymAPIError> {
        self.get_json(
            &[
@@ -722,7 +617,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn partial_expiration_date_signatures(
        &self,
        expiration_date: Option<Date>,
@@ -746,7 +640,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn partial_coin_indices_signatures(
        &self,
        epoch_id: Option<EpochId>,
@@ -767,7 +660,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn global_expiration_date_signatures(
        &self,
        expiration_date: Option<Date>,
@@ -791,7 +683,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn global_coin_indices_signatures(
        &self,
        epoch_id: Option<EpochId>,
@@ -812,7 +703,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn master_verification_key(
        &self,
        epoch_id: Option<EpochId>,
@@ -832,7 +722,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn epoch_credentials(
        &self,
        dkg_epoch: EpochId,
@@ -849,7 +738,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn issued_credential(
        &self,
        credential_id: i64,
@@ -866,7 +754,6 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    #[instrument(level = "debug", skip(self))]
    async fn issued_credentials(
        &self,
        credential_ids: Vec<i64>,
@@ -8,9 +8,9 @@ use crate::nyxd::CosmWasmClient;
 use async_trait::async_trait;
 use cosmrs::AccountId;
 use cosmwasm_std::Addr;
+use log::trace;
 use nym_coconut_dkg_common::types::{ChunkIndex, NodeIndex, StateAdvanceResponse};
 use serde::Deserialize;
-use tracing::trace;

 use nym_coconut_dkg_common::dealer::RegisteredDealerDetails;
 pub use nym_coconut_dkg_common::{
@@ -29,6 +29,7 @@ use cosmrs::proto::cosmwasm::wasm::v1::{
 };
 use cosmrs::tendermint::{block, chain, Hash};
 use cosmrs::{AccountId, Coin as CosmosCoin, Tx};
+use log::trace;
 use prost::Message;
 use serde::{Deserialize, Serialize};

@@ -67,7 +68,7 @@ pub trait CosmWasmClient: TendermintRpcClient {
        Res: Message + Default,
    {
        if let Some(ref abci_path) = path {
-            tracing::trace!("performing query on abci path {abci_path}")
+            trace!("performing query on abci path {abci_path}")
        }
        let mut buf = Vec::with_capacity(req.encoded_len());
        req.encode(&mut buf)?;
@@ -296,7 +297,7 @@ pub trait CosmWasmClient: TendermintRpcClient {

        let start = Instant::now();
        loop {
-            tracing::debug!(
+            log::debug!(
                "Polling for result of including {} in a block...",
                broadcasted.hash
            );
@@ -521,7 +522,7 @@ pub trait CosmWasmClient: TendermintRpcClient {
            .make_abci_query::<_, QuerySmartContractStateResponse>(path, req)
            .await?;

-        tracing::trace!("raw query response: {}", String::from_utf8_lossy(&res.data));
+        trace!("raw query response: {}", String::from_utf8_lossy(&res.data));
        Ok(serde_json::from_slice(&res.data)?)
    }

@@ -25,12 +25,12 @@ use cosmrs::proto::cosmos::tx::signing::v1beta1::SignMode;
 use cosmrs::staking::{MsgDelegate, MsgUndelegate};
 use cosmrs::tx::{self, Msg};
 use cosmrs::{cosmwasm, AccountId, Any, Tx};
+use log::debug;
 use serde::Serialize;
 use sha2::Digest;
 use sha2::Sha256;
 use std::time::SystemTime;
 use tendermint_rpc::endpoint::broadcast;
-use tracing::debug;

 fn empty_fee() -> tx::Fee {
    tx::Fee {
@@ -7,9 +7,9 @@ use base64::Engine;
 use cosmrs::abci::TxMsgData;
 use cosmrs::cosmwasm::MsgExecuteContractResponse;
 use cosmrs::proto::cosmos::base::query::v1beta1::{PageRequest, PageResponse};
+use log::error;
 use prost::bytes::Bytes;
 use tendermint_rpc::endpoint::broadcast;
-use tracing::error;

 pub use cosmrs::abci::MsgResponse;

@@ -17,7 +17,6 @@ use crate::{
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{Addr, Coin, Decimal, StdResult, Uint128};
 use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
 use serde_repr::{Deserialize_repr, Serialize_repr};

 /// Full details associated with given mixnode.
@@ -648,39 +647,14 @@ impl From<LegacyMixLayer> for u8 {
        export_to = "ts-packages/types/src/types/rust/PendingMixnodeChanges.ts"
    )
 )]
-// note: we had to remove `#[cw_serde]` as it enforces `#[serde(deny_unknown_fields)]` which we do not want
-// with the addition of  .cost_params_change field
-#[derive(
-    ::cosmwasm_schema::serde::Serialize,
-    ::cosmwasm_schema::serde::Deserialize,
-    ::std::clone::Clone,
-    ::std::fmt::Debug,
-    ::std::cmp::PartialEq,
-    ::cosmwasm_schema::schemars::JsonSchema,
-    Default,
-    Copy,
-)]
-#[schemars(crate = "::cosmwasm_schema::schemars")]
+#[cw_serde]
+#[derive(Default, Copy)]
 pub struct PendingMixNodeChanges {
    pub pledge_change: Option<EpochEventId>,
-
    #[serde(default)]
    pub cost_params_change: Option<IntervalEventId>,
 }

-#[derive(Default, Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
-pub struct LegacyPendingMixNodeChanges {
-    pub pledge_change: Option<EpochEventId>,
-}
-
-impl From<PendingMixNodeChanges> for LegacyPendingMixNodeChanges {
-    fn from(value: PendingMixNodeChanges) -> Self {
-        LegacyPendingMixNodeChanges {
-            pledge_change: value.pledge_change,
-        }
-    }
-}
-
 impl PendingMixNodeChanges {
    pub fn new_empty() -> PendingMixNodeChanges {
        PendingMixNodeChanges {
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair};
-use std::fmt::{self, Debug, Display, Formatter};
+use std::fmt::{self, Display, Formatter};
 use std::str::FromStr;
 use thiserror::Error;
 use zeroize::{Zeroize, ZeroizeOnDrop};
@@ -112,18 +112,12 @@ impl PemStorableKeyPair for KeyPair {
    }
 }

-#[derive(PartialEq, Eq, Hash, Copy, Clone)]
+#[derive(PartialEq, Eq, Hash, Copy, Clone, Debug)]
 pub struct PublicKey(x25519_dalek::PublicKey);

 impl Display for PublicKey {
    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        Display::fmt(&self.to_base58_string(), f)
-    }
-}
-
-impl Debug for PublicKey {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        Debug::fmt(&self.to_base58_string(), f)
+        write!(f, "{}", self.to_base58_string())
    }
 }

@@ -31,16 +31,8 @@ pub mod option_bs58_x25519_pubkey {
    pub fn deserialize<'de, D: Deserializer<'de>>(
        deserializer: D,
    ) -> Result<Option<PublicKey>, D::Error> {
-        match Option::<String>::deserialize(deserializer)? {
-            None => Ok(None),
-            Some(s) => {
-                if s.is_empty() {
-                    Ok(None)
-                } else {
-                    Some(PublicKey::from_base58_string(&s).map_err(serde::de::Error::custom))
-                        .transpose()
-                }
-            }
-        }
+        let s = Option::<String>::deserialize(deserializer)?;
+        s.map(|s| PublicKey::from_base58_string(&s).map_err(serde::de::Error::custom))
+            .transpose()
    }
 }
@@ -5,7 +5,7 @@ pub use ed25519_dalek::SignatureError;
 use ed25519_dalek::{Signer, SigningKey};
 pub use ed25519_dalek::{Verifier, PUBLIC_KEY_LENGTH, SECRET_KEY_LENGTH, SIGNATURE_LENGTH};
 use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair};
-use std::fmt::{self, Debug, Display, Formatter};
+use std::fmt::{self, Display, Formatter};
 use std::str::FromStr;
 use thiserror::Error;
 use zeroize::{Zeroize, ZeroizeOnDrop};
@@ -119,18 +119,12 @@ impl PemStorableKeyPair for KeyPair {
 }

 /// ed25519 EdDSA Public Key
-#[derive(Copy, Clone, Eq, PartialEq)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
 pub struct PublicKey(ed25519_dalek::VerifyingKey);

 impl Display for PublicKey {
    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        Display::fmt(&self.to_base58_string(), f)
-    }
-}
-
-impl Debug for PublicKey {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        Debug::fmt(&self.to_base58_string(), f)
+        write!(f, "{}", self.to_base58_string())
    }
 }

@@ -1,34 +0,0 @@
-[package]
-name = "nym-gateway-stats-storage"
-version = "0.1.0"
-authors.workspace = true
-repository.workspace = true
-homepage.workspace = true
-documentation.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[dependencies]
-sqlx = { workspace = true, features = [
-    "runtime-tokio-rustls",
-    "sqlite",
-    "macros",
-    "migrate",
-    "time",
-] }
-time = { workspace = true }
-thiserror = { workspace = true }
-tracing = { workspace = true }
-
-nym-sphinx = { path = "../nymsphinx" }
-nym-credentials-interface = { path = "../credentials-interface" }
-
-
-[build-dependencies]
-tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
-sqlx = { workspace = true, features = [
-    "runtime-tokio-rustls",
-    "sqlite",
-    "macros",
-    "migrate",
-] }
@@ -1,28 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use sqlx::{Connection, SqliteConnection};
-use std::env;
-
-#[tokio::main]
-async fn main() {
-    let out_dir = env::var("OUT_DIR").unwrap();
-    let database_path = format!("{}/gateway-stats-example.sqlite", out_dir);
-
-    let mut conn = SqliteConnection::connect(&format!("sqlite://{}?mode=rwc", database_path))
-        .await
-        .expect("Failed to create SQLx database connection");
-
-    sqlx::migrate!("./migrations")
-        .run(&mut conn)
-        .await
-        .expect("Failed to perform SQLx migrations");
-
-    #[cfg(target_family = "unix")]
-    println!("cargo:rustc-env=DATABASE_URL=sqlite://{}", &database_path);
-
-    #[cfg(target_family = "windows")]
-    // for some strange reason we need to add a leading `/` to the windows path even though it's
-    // not a valid windows path... but hey, it works...
-    println!("cargo:rustc-env=DATABASE_URL=sqlite:///{}", &database_path);
-}
@@ -1,26 +0,0 @@
-/*
- * Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
- * SPDX-License-Identifier: GPL-3.0-only
- */
-
-CREATE TABLE sessions_active
-(
-    client_address  TEXT                        NOT NULL PRIMARY KEY UNIQUE,
-    start_time      TIMESTAMP WITHOUT TIME ZONE NOT NULL,
-    typ             TEXT                        NOT NULL
-);
-
-CREATE TABLE sessions_finished
-(
-    id          INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    day         DATE    NOT NULL,
-    duration_ms INTEGER NOT NULL,
-    typ         TEXT    NOT NULL
-);
-
-CREATE TABLE sessions_unique_users
-(
-    day             DATE    NOT NULL,
-    client_address  TEXT    NOT NULL,
-    PRIMARY KEY (day, client_address)
-);
@@ -1,13 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use thiserror::Error;
-
-#[derive(Error, Debug)]
-pub enum StatsStorageError {
-    #[error("Database experienced an internal error: {0}")]
-    InternalDatabaseError(#[from] sqlx::Error),
-
-    #[error("Failed to perform database migration: {0}")]
-    MigrationError(#[from] sqlx::migrate::MigrateError),
-}
@@ -1,195 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use error::StatsStorageError;
-use models::{ActiveSession, FinishedSession, SessionType, StoredFinishedSession};
-use nym_sphinx::DestinationAddressBytes;
-use sessions::SessionManager;
-use sqlx::ConnectOptions;
-use std::path::Path;
-use time::Date;
-use tracing::{debug, error};
-
-pub mod error;
-pub mod models;
-mod sessions;
-
-// note that clone here is fine as upon cloning the same underlying pool will be used
-#[derive(Clone)]
-pub struct PersistentStatsStorage {
-    session_manager: SessionManager,
-}
-
-impl PersistentStatsStorage {
-    /// Initialises `PersistentStatsStorage` using the provided path.
-    ///
-    /// # Arguments
-    ///
-    /// * `database_path`: path to the database.
-    pub async fn init<P: AsRef<Path> + Send>(database_path: P) -> Result<Self, StatsStorageError> {
-        debug!(
-            "Attempting to connect to database {:?}",
-            database_path.as_ref().as_os_str()
-        );
-
-        // TODO: we can inject here more stuff based on our gateway global config
-        // struct. Maybe different pool size or timeout intervals?
-        let opts = sqlx::sqlite::SqliteConnectOptions::new()
-            .filename(database_path)
-            .create_if_missing(true)
-            .disable_statement_logging();
-
-        // TODO: do we want auto_vacuum ?
-
-        let connection_pool = match sqlx::SqlitePool::connect_with(opts).await {
-            Ok(db) => db,
-            Err(err) => {
-                error!("Failed to connect to SQLx database: {err}");
-                return Err(err.into());
-            }
-        };
-
-        if let Err(err) = sqlx::migrate!("./migrations").run(&connection_pool).await {
-            error!("Failed to perform migration on the SQLx database: {err}");
-            return Err(err.into());
-        }
-
-        // the cloning here are cheap as connection pool is stored behind an Arc
-        Ok(PersistentStatsStorage {
-            session_manager: sessions::SessionManager::new(connection_pool),
-        })
-    }
-
-    //Sessions fn
-    pub async fn insert_finished_session(
-        &self,
-        date: Date,
-        session: FinishedSession,
-    ) -> Result<(), StatsStorageError> {
-        Ok(self
-            .session_manager
-            .insert_finished_session(
-                date,
-                session.duration.whole_milliseconds() as i64,
-                session.typ.to_string().into(),
-            )
-            .await?)
-    }
-
-    pub async fn get_finished_sessions(
-        &self,
-        date: Date,
-    ) -> Result<Vec<StoredFinishedSession>, StatsStorageError> {
-        Ok(self.session_manager.get_finished_sessions(date).await?)
-    }
-
-    pub async fn delete_finished_sessions(
-        &self,
-        before_date: Date,
-    ) -> Result<(), StatsStorageError> {
-        Ok(self
-            .session_manager
-            .delete_finished_sessions(before_date)
-            .await?)
-    }
-
-    pub async fn insert_unique_user(
-        &self,
-        date: Date,
-        client_address_bs58: String,
-    ) -> Result<(), StatsStorageError> {
-        Ok(self
-            .session_manager
-            .insert_unique_user(date, client_address_bs58)
-            .await?)
-    }
-
-    pub async fn get_unique_users_count(&self, date: Date) -> Result<i32, StatsStorageError> {
-        Ok(self.session_manager.get_unique_users_count(date).await?)
-    }
-
-    pub async fn delete_unique_users(&self, before_date: Date) -> Result<(), StatsStorageError> {
-        Ok(self
-            .session_manager
-            .delete_unique_users(before_date)
-            .await?)
-    }
-
-    pub async fn insert_active_session(
-        &self,
-        client_address: DestinationAddressBytes,
-        session: ActiveSession,
-    ) -> Result<(), StatsStorageError> {
-        Ok(self
-            .session_manager
-            .insert_active_session(
-                client_address.as_base58_string(),
-                session.start,
-                session.typ.to_string().into(),
-            )
-            .await?)
-    }
-
-    pub async fn update_active_session_type(
-        &self,
-        client_address: DestinationAddressBytes,
-        session_type: SessionType,
-    ) -> Result<(), StatsStorageError> {
-        Ok(self
-            .session_manager
-            .update_active_session_type(
-                client_address.as_base58_string(),
-                session_type.to_string().into(),
-            )
-            .await?)
-    }
-
-    pub async fn get_active_session(
-        &self,
-        client_address: DestinationAddressBytes,
-    ) -> Result<Option<ActiveSession>, StatsStorageError> {
-        Ok(self
-            .session_manager
-            .get_active_session(client_address.as_base58_string())
-            .await?
-            .map(Into::into))
-    }
-
-    pub async fn get_all_active_sessions(&self) -> Result<Vec<ActiveSession>, StatsStorageError> {
-        Ok(self
-            .session_manager
-            .get_all_active_sessions()
-            .await?
-            .into_iter()
-            .map(Into::into)
-            .collect())
-    }
-
-    pub async fn get_started_sessions_count(
-        &self,
-        start_date: Date,
-    ) -> Result<i32, StatsStorageError> {
-        Ok(self
-            .session_manager
-            .get_started_sessions_count(start_date)
-            .await?)
-    }
-
-    pub async fn get_active_users(&self) -> Result<Vec<String>, StatsStorageError> {
-        Ok(self.session_manager.get_active_users().await?)
-    }
-
-    pub async fn delete_active_session(
-        &self,
-        client_address: DestinationAddressBytes,
-    ) -> Result<(), StatsStorageError> {
-        Ok(self
-            .session_manager
-            .delete_active_session(client_address.as_base58_string())
-            .await?)
-    }
-
-    pub async fn cleanup_active_sessions(&self) -> Result<(), StatsStorageError> {
-        Ok(self.session_manager.cleanup_active_sessions().await?)
-    }
-}
@@ -1,109 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use nym_credentials_interface::TicketType;
-use sqlx::prelude::FromRow;
-use time::{Duration, OffsetDateTime};
-
-#[derive(FromRow)]
-pub struct StoredFinishedSession {
-    duration_ms: i64,
-    typ: String,
-}
-
-impl StoredFinishedSession {
-    pub fn serialize(&self) -> (u64, String) {
-        (
-            self.duration_ms as u64, //we are sure that it fits in a u64, see `fn end_at`
-            self.typ.clone(),
-        )
-    }
-}
-
-pub struct FinishedSession {
-    pub duration: Duration,
-    pub typ: SessionType,
-}
-
-#[derive(PartialEq)]
-pub enum SessionType {
-    Vpn,
-    Mixnet,
-    Unknown,
-}
-
-impl SessionType {
-    pub fn to_string(&self) -> &str {
-        match self {
-            Self::Vpn => "vpn",
-            Self::Mixnet => "mixnet",
-            Self::Unknown => "unknown",
-        }
-    }
-
-    pub fn from_string(s: &str) -> Self {
-        match s {
-            "vpn" => Self::Vpn,
-            "mixnet" => Self::Mixnet,
-            _ => Self::Unknown,
-        }
-    }
-}
-
-impl From<TicketType> for SessionType {
-    fn from(value: TicketType) -> Self {
-        match value {
-            TicketType::V1MixnetEntry => Self::Mixnet,
-            TicketType::V1MixnetExit => Self::Mixnet,
-            TicketType::V1WireguardEntry => Self::Vpn,
-            TicketType::V1WireguardExit => Self::Vpn,
-        }
-    }
-}
-
-#[derive(FromRow)]
-pub(crate) struct StoredActiveSession {
-    start_time: OffsetDateTime,
-    typ: String,
-}
-
-pub struct ActiveSession {
-    pub start: OffsetDateTime,
-    pub typ: SessionType,
-}
-
-impl ActiveSession {
-    pub fn new(start_time: OffsetDateTime) -> Self {
-        ActiveSession {
-            start: start_time,
-            typ: SessionType::Unknown,
-        }
-    }
-
-    pub fn set_type(&mut self, ticket_type: TicketType) {
-        self.typ = ticket_type.into();
-    }
-
-    pub fn end_at(self, stop_time: OffsetDateTime) -> Option<FinishedSession> {
-        let session_duration = stop_time - self.start;
-        //ensure duration is positive to fit in a u64
-        //u64::max milliseconds is 500k millenia so no overflow issue
-        if session_duration > Duration::ZERO {
-            Some(FinishedSession {
-                duration: session_duration,
-                typ: self.typ,
-            })
-        } else {
-            None
-        }
-    }
-}
-
-impl From<StoredActiveSession> for ActiveSession {
-    fn from(value: StoredActiveSession) -> Self {
-        ActiveSession {
-            start: value.start_time,
-            typ: SessionType::from_string(&value.typ),
-        }
-    }
-}
@@ -1,177 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use time::{Date, OffsetDateTime};
-
-use crate::models::{StoredActiveSession, StoredFinishedSession};
-
-pub(crate) type Result<T> = std::result::Result<T, sqlx::Error>;
-
-#[derive(Clone)]
-pub(crate) struct SessionManager {
-    connection_pool: sqlx::SqlitePool,
-}
-
-impl SessionManager {
-    /// Creates new instance of the `SessionsManager` with the provided sqlite connection pool.
-    ///
-    /// # Arguments
-    ///
-    /// * `connection_pool`: database connection pool to use.
-    pub(crate) fn new(connection_pool: sqlx::SqlitePool) -> Self {
-        SessionManager { connection_pool }
-    }
-
-    pub(crate) async fn insert_finished_session(
-        &self,
-        date: Date,
-        duration_ms: i64,
-        typ: String,
-    ) -> Result<()> {
-        sqlx::query!(
-            "INSERT INTO sessions_finished (day, duration_ms, typ) VALUES (?, ?, ?)",
-            date,
-            duration_ms,
-            typ
-        )
-        .execute(&self.connection_pool)
-        .await?;
-        Ok(())
-    }
-
-    pub(crate) async fn get_finished_sessions(
-        &self,
-        date: Date,
-    ) -> Result<Vec<StoredFinishedSession>> {
-        sqlx::query_as("SELECT duration_ms, typ FROM sessions_finished WHERE day = ?")
-            .bind(date)
-            .fetch_all(&self.connection_pool)
-            .await
-    }
-
-    pub(crate) async fn delete_finished_sessions(&self, before_date: Date) -> Result<()> {
-        sqlx::query!("DELETE FROM sessions_finished WHERE day <= ? ", before_date)
-            .execute(&self.connection_pool)
-            .await?;
-        Ok(())
-    }
-
-    pub(crate) async fn insert_unique_user(
-        &self,
-        date: Date,
-        client_address_b58: String,
-    ) -> Result<()> {
-        sqlx::query!(
-            "INSERT OR IGNORE INTO sessions_unique_users (day, client_address) VALUES (?, ?)",
-            date,
-            client_address_b58,
-        )
-        .execute(&self.connection_pool)
-        .await?;
-        Ok(())
-    }
-
-    pub(crate) async fn get_unique_users_count(&self, date: Date) -> Result<i32> {
-        Ok(sqlx::query!(
-            "SELECT COUNT(*) as count FROM sessions_unique_users WHERE day = ?",
-            date
-        )
-        .fetch_one(&self.connection_pool)
-        .await?
-        .count)
-    }
-
-    pub(crate) async fn delete_unique_users(&self, before_date: Date) -> Result<()> {
-        sqlx::query!(
-            "DELETE FROM sessions_unique_users WHERE day <= ? ",
-            before_date
-        )
-        .execute(&self.connection_pool)
-        .await?;
-        Ok(())
-    }
-
-    pub(crate) async fn insert_active_session(
-        &self,
-        client_address_b58: String,
-        start_time: OffsetDateTime,
-        typ: String,
-    ) -> Result<()> {
-        sqlx::query!(
-            "INSERT INTO sessions_active (client_address, start_time, typ) VALUES (?, ?, ?)",
-            client_address_b58,
-            start_time,
-            typ
-        )
-        .execute(&self.connection_pool)
-        .await?;
-        Ok(())
-    }
-
-    pub(crate) async fn update_active_session_type(
-        &self,
-        client_address_b58: String,
-        typ: String,
-    ) -> Result<()> {
-        sqlx::query!(
-            "UPDATE sessions_active SET typ = ? WHERE client_address = ?",
-            typ,
-            client_address_b58,
-        )
-        .execute(&self.connection_pool)
-        .await?;
-        Ok(())
-    }
-
-    pub(crate) async fn get_active_session(
-        &self,
-        client_address_b58: String,
-    ) -> Result<Option<StoredActiveSession>> {
-        sqlx::query_as("SELECT start_time, typ FROM sessions_active WHERE client_address = ?")
-            .bind(client_address_b58)
-            .fetch_optional(&self.connection_pool)
-            .await
-    }
-
-    pub(crate) async fn get_all_active_sessions(&self) -> Result<Vec<StoredActiveSession>> {
-        sqlx::query_as("SELECT start_time, typ FROM sessions_active")
-            .fetch_all(&self.connection_pool)
-            .await
-    }
-
-    pub(crate) async fn get_started_sessions_count(&self, start_date: Date) -> Result<i32> {
-        Ok(sqlx::query!(
-            "SELECT COUNT(*) as count FROM sessions_active WHERE date(start_time) = ?",
-            start_date
-        )
-        .fetch_one(&self.connection_pool)
-        .await?
-        .count)
-    }
-
-    pub(crate) async fn get_active_users(&self) -> Result<Vec<String>> {
-        Ok(sqlx::query!("SELECT client_address from sessions_active")
-            .fetch_all(&self.connection_pool)
-            .await?
-            .into_iter()
-            .map(|record| record.client_address)
-            .collect())
-    }
-
-    pub(crate) async fn delete_active_session(&self, client_address_b58: String) -> Result<()> {
-        sqlx::query!(
-            "DELETE FROM sessions_active WHERE client_address = ?",
-            client_address_b58
-        )
-        .execute(&self.connection_pool)
-        .await?;
-        Ok(())
-    }
-
-    pub(crate) async fn cleanup_active_sessions(&self) -> Result<()> {
-        sqlx::query!("DELETE FROM sessions_active")
-            .execute(&self.connection_pool)
-            .await?;
-        Ok(())
-    }
-}
@@ -9,7 +9,7 @@ use serde::{Deserialize, Serialize};
 use std::fmt::Display;
 use std::time::Duration;
 use thiserror::Error;
-use tracing::{instrument, warn};
+use tracing::warn;
 use url::Url;

 pub use reqwest::IntoUrl;
@@ -35,9 +35,6 @@ pub enum HttpClientError<E: Display = String> {
        source: reqwest::Error,
    },

-    #[error("failed to deserialise received response: {source}")]
-    ResponseDeserialisationFailure { source: serde_json::Error },
-
    #[error("provided url is malformed: {source}")]
    MalformedUrl {
        #[from]
@@ -205,7 +202,6 @@ impl Client {
        self.reqwest_client.get(url)
    }

-    #[instrument(level = "debug", skip_all, fields(path=?path))]
    async fn send_get_request<K, V, E>(
        &self,
        path: PathSegments<'_>,
@@ -216,7 +212,6 @@ impl Client {
        V: AsRef<str>,
        E: Display,
    {
-        tracing::trace!("Sending GET request");
        let url = sanitize_url(&self.base_url, path, params);

        #[cfg(target_arch = "wasm32")]
@@ -282,7 +277,6 @@ impl Client {
        }
    }

-    #[instrument(level = "debug", skip_all)]
    pub async fn get_json<T, K, V, E>(
        &self,
        path: PathSegments<'_>,
@@ -518,14 +512,12 @@ pub fn sanitize_url<K: AsRef<str>, V: AsRef<str>>(
    url
 }

-#[tracing::instrument(level = "debug", skip_all)]
 pub async fn parse_response<T, E>(res: Response, allow_empty: bool) -> Result<T, HttpClientError<E>>
 where
    T: DeserializeOwned,
    E: DeserializeOwned + Display,
 {
    let status = res.status();
-    tracing::debug!("Status: {} (success: {})", &status, status.is_success());

    if !allow_empty {
        if let Some(0) = res.content_length() {
@@ -534,17 +526,7 @@ where
    }

    if res.status().is_success() {
-        let text = res.text().await?;
-        match serde_json::from_str(&text) {
-            Ok(res) => Ok(res),
-            Err(source) => {
-                #[cfg(debug_assertions)]
-                {
-                    tracing::trace!("Result:\n{:#?}", text);
-                }
-                Err(HttpClientError::ResponseDeserialisationFailure { source })
-            }
-        }
+        Ok(res.json().await?)
    } else if res.status() == StatusCode::NOT_FOUND {
        Err(HttpClientError::NotFound)
    } else {
@@ -11,7 +11,6 @@ license.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-axum-client-ip.workspace = true
 axum.workspace = true
 bytes = { workspace = true }
 colored.workspace = true
@@ -1,18 +1,18 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only

-use axum::extract::Request;
+use axum::extract::{ConnectInfo, Request};
 use axum::http::header::{HOST, USER_AGENT};
 use axum::http::HeaderValue;
 use axum::middleware::Next;
 use axum::response::IntoResponse;
-use axum_client_ip::InsecureClientIp;
 use colored::Colorize;
+use std::net::SocketAddr;
 use std::time::Instant;
 use tracing::info;

 pub async fn logger(
-    InsecureClientIp(addr): InsecureClientIp,
+    ConnectInfo(addr): ConnectInfo<SocketAddr>,
    request: Request,
    next: Next,
 ) -> impl IntoResponse {
@@ -1,14 +0,0 @@
-[package]
-name = "nym-common-models"
-version = "0.1.0"
-authors.workspace = true
-repository.workspace = true
-homepage.workspace = true
-documentation.workspace = true
-edition.workspace = true
-license.workspace = true
-rust-version.workspace = true
-readme.workspace = true
-
-[dependencies]
-serde = { workspace = true, features = ["derive"] }
@@ -1 +0,0 @@
-pub mod ns_api;
@@ -1,7 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, Deserialize, Serialize)]
-pub struct TestrunAssignment {
-    pub testrun_id: i64,
-    pub gateway_identity_key: String,
-}
@@ -286,10 +286,6 @@ impl NymTopology {
        self.get_gateway(gateway_identity).is_some()
    }

-    pub fn insert_gateway(&mut self, gateway: gateway::LegacyNode) {
-        self.gateways.push(gateway)
-    }
-
    pub fn set_gateways(&mut self, gateways: Vec<gateway::LegacyNode>) {
        self.gateways = gateways
    }
@@ -116,7 +116,7 @@ impl<'a> TryFrom<&'a SkimmedNode> for LegacyNode {
            });
        }

-        let layer = match value.role {
+        let layer = match value.epoch_role {
            NodeRole::Mixnode { layer } => layer
                .try_into()
                .map_err(|_| MixnodeConversionError::InvalidLayer)?,
@@ -68,7 +68,7 @@ pub async fn current_network_topology_async(

    let api_client = NymApiClient::new(url);
    let mixnodes = api_client
-        .get_all_basic_active_mixing_assigned_nodes(None)
+        .get_basic_active_mixing_assigned_nodes(None)
        .await?;
    let gateways = api_client.get_all_basic_entry_assigned_nodes(None).await?;

@@ -158,13 +158,10 @@ impl<St: Storage + Clone + 'static> PeerController<St> {
            .ok_or(Error::MissingClientBandwidthEntry)?
            .client_id
        {
-            let bandwidth = storage
-                .get_available_bandwidth(client_id)
-                .await?
-                .ok_or(Error::MissingClientBandwidthEntry)?;
+            storage.create_bandwidth_entry(client_id).await?;
            Ok(Some(BandwidthStorageManager::new(
                storage,
-                ClientBandwidth::new(bandwidth.into()),
+                ClientBandwidth::new(Default::default()),
                client_id,
                BandwidthFlushingBehaviourConfig::default(),
                true,
@@ -84,13 +84,12 @@ impl<St: Storage + Clone + 'static> PeerHandle<St> {
                .ok_or(Error::InconsistentConsumedBytes)?
                .try_into()
                .map_err(|_| Error::InconsistentConsumedBytes)?;
-            if spent_bandwidth > 0
-                && bandwidth_manager
-                    .write()
-                    .await
-                    .try_use_bandwidth(spent_bandwidth)
-                    .await
-                    .is_err()
+            if bandwidth_manager
+                .write()
+                .await
+                .try_use_bandwidth(spent_bandwidth)
+                .await
+                .is_err()
            {
                let success = self.remove_peer().await?;
                return Ok(!success);
@@ -433,7 +433,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.85",
+ "syn 2.0.59",
 ]

 [[package]]
@@ -1483,9 +1483,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.89"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
 dependencies = [
 "unicode-ident",
 ]
@@ -1660,7 +1660,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "serde_derive_internals",
- "syn 2.0.85",
+ "syn 2.0.59",
 ]

 [[package]]
@@ -1702,9 +1702,9 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.214"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
 "serde_derive",
 ]
@@ -1729,13 +1729,13 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.214"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.85",
+ "syn 2.0.59",
 ]

 [[package]]
@@ -1746,7 +1746,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.85",
+ "syn 2.0.59",
 ]

 [[package]]
@@ -1769,7 +1769,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.85",
+ "syn 2.0.59",
 ]

 [[package]]
@@ -1928,9 +1928,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.85"
+version = "2.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
+checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1954,7 +1954,7 @@ checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.85",
+ "syn 2.0.59",
 ]

 [[package]]
@@ -2120,5 +2120,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.85",
+ "syn 2.0.59",
 ]
@@ -3689,7 +3689,8 @@
              "format": "uint32",
              "minimum": 0.0
            }
-          }
+          },
+          "additionalProperties": false
        },
        "Percent": {
          "description": "Percent represents a value between 0 and 100% (i.e. between 0.0 and 1.0)",
@@ -5238,7 +5239,8 @@
              "format": "uint32",
              "minimum": 0.0
            }
-          }
+          },
+          "additionalProperties": false
        },
        "Percent": {
          "description": "Percent represents a value between 0 and 100% (i.e. between 0.0 and 1.0)",
@@ -5573,7 +5575,8 @@
              "format": "uint32",
              "minimum": 0.0
            }
-          }
+          },
+          "additionalProperties": false
        },
        "Percent": {
          "description": "Percent represents a value between 0 and 100% (i.e. between 0.0 and 1.0)",
@@ -7592,7 +7595,8 @@
              "format": "uint32",
              "minimum": 0.0
            }
-          }
+          },
+          "additionalProperties": false
        },
        "Percent": {
          "description": "Percent represents a value between 0 and 100% (i.e. between 0.0 and 1.0)",
@@ -315,7 +315,8 @@
          "format": "uint32",
          "minimum": 0.0
        }
-      }
+      },
+      "additionalProperties": false
    },
    "Percent": {
      "description": "Percent represents a value between 0 and 100% (i.e. between 0.0 and 1.0)",
@@ -323,7 +323,8 @@
          "format": "uint32",
          "minimum": 0.0
        }
-      }
+      },
+      "additionalProperties": false
    },
    "Percent": {
      "description": "Percent represents a value between 0 and 100% (i.e. between 0.0 and 1.0)",
@@ -317,7 +317,8 @@
          "format": "uint32",
          "minimum": 0.0
        }
-      }
+      },
+      "additionalProperties": false
    },
    "Percent": {
      "description": "Percent represents a value between 0 and 100% (i.e. between 0.0 and 1.0)",
@@ -319,7 +319,8 @@
          "format": "uint32",
          "minimum": 0.0
        }
-      }
+      },
+      "additionalProperties": false
    },
    "Percent": {
      "description": "Percent represents a value between 0 and 100% (i.e. between 0.0 and 1.0)",
@@ -4,7 +4,6 @@
 use super::helpers::must_get_gateway_bond_by_owner;
 use super::storage;
 use crate::constants::default_node_costs;
-use crate::interval::storage as interval_storage;
 use crate::mixnet_contract_settings::storage as mixnet_params_storage;
 use crate::nodes::helpers::save_new_nymnode_with_id;
 use crate::nodes::transactions::add_nym_node_inner;
@@ -116,10 +115,6 @@ pub fn try_migrate_to_nymnode(
            comment: "legacy gateway did not have a pre-assigned node id".to_string(),
        })?;

-    let current_epoch =
-        interval_storage::current_interval(deps.storage)?.current_epoch_absolute_id();
-    let previous_epoch = current_epoch.saturating_sub(1);
-
    // create nym-node entry
    // for gateways it's quite straightforward as there are no delegations or rewards to worry about
    save_new_nymnode_with_id(
@@ -130,7 +125,6 @@ pub fn try_migrate_to_nymnode(
        cost_params,
        info.sender.clone(),
        gateway_bond.pledge_amount,
-        previous_epoch,
    )?;

    storage::PREASSIGNED_LEGACY_IDS.remove(deps.storage, gateway_identity.clone());
@@ -22,8 +22,6 @@ pub(crate) fn save_new_nymnode(
    pledge: Coin,
 ) -> Result<NodeId, MixnetContractError> {
    let node_id = next_nymnode_id_counter(storage)?;
-    let current_epoch = interval_storage::current_interval(storage)?.current_epoch_absolute_id();
-
    save_new_nymnode_with_id(
        storage,
        node_id,
@@ -32,13 +30,11 @@ pub(crate) fn save_new_nymnode(
        cost_params,
        owner,
        pledge,
-        current_epoch,
    )?;

    Ok(node_id)
 }

-#[allow(clippy::too_many_arguments)]
 pub(crate) fn save_new_nymnode_with_id(
    storage: &mut dyn Storage,
    node_id: NodeId,
@@ -47,9 +43,10 @@ pub(crate) fn save_new_nymnode_with_id(
    cost_params: NodeCostParams,
    owner: Addr,
    pledge: Coin,
-    last_rewarding_epoch: u32,
 ) -> Result<(), MixnetContractError> {
-    let node_rewarding = NodeRewarding::initialise_new(cost_params, &pledge, last_rewarding_epoch)?;
+    let current_epoch = interval_storage::current_interval(storage)?.current_epoch_absolute_id();
+
+    let node_rewarding = NodeRewarding::initialise_new(cost_params, &pledge, current_epoch)?;
    let node_bond = NymNodeBond::new(node_id, owner, pledge, node, bonding_height);

    // save node bond data
@@ -52,8 +52,8 @@ pub(crate) fn save_assignment(

    // update metadata
    let mut metadata = ROLES_METADATA.load(storage, inactive)?;
-    let highest_id = assignment.nodes.iter().max().copied().unwrap_or_default();
-    metadata.set_highest_id(highest_id, assignment.role);
+    let last = assignment.nodes.last().copied().unwrap_or_default();
+    metadata.set_highest_id(last, assignment.role);
    metadata.set_role_count(assignment.role, assignment.nodes.len() as u32);
    if assignment.is_final_assignment() {
        metadata.fully_assigned = true
@@ -140,7 +140,6 @@ pub(crate) fn initialise_storage(storage: &mut dyn Storage) -> Result<(), Mixnet
 mod tests {
    use super::*;
    use crate::support::tests::test_helpers;
-    use crate::support::tests::test_helpers::TestSetup;

    #[test]
    fn next_id() {
@@ -150,33 +149,4 @@ mod tests {
            assert_eq!(i, next_nymnode_id_counter(deps.as_mut().storage).unwrap());
        }
    }
-
-    #[test]
-    fn assigning_role_uses_highest_id_even_if_not_sorted() {
-        let mut test = TestSetup::new();
-        let deps = test.deps_mut();
-
-        let sorted = RoleAssignment {
-            role: Role::EntryGateway,
-            nodes: vec![1, 2, 3],
-        };
-
-        let unsorted = RoleAssignment {
-            role: Role::Layer1,
-            nodes: vec![8, 5, 4],
-        };
-
-        save_assignment(deps.storage, sorted).unwrap();
-        save_assignment(deps.storage, unsorted).unwrap();
-
-        let storage = deps.as_ref().storage;
-
-        let active_bucket = ACTIVE_ROLES_BUCKET.load(storage).unwrap();
-        let inactive = active_bucket.other() as u8;
-        let metadata = ROLES_METADATA.load(storage, inactive).unwrap();
-
-        assert_eq!(metadata.entry_gateway_metadata.highest_id, 3);
-        assert_eq!(metadata.layer1_metadata.highest_id, 8);
-        assert_eq!(metadata.highest_rewarded_id(), 8)
-    }
 }
@@ -1 +0,0 @@
-todo.md
@@ -2,7 +2,6 @@

 These docs are autogenerated by the [`autodocs`](https://github.com/nymtech/nym/tree/max/new-docs-framework/documentation/autodoc) script.
 ```sh
-[2m2024-10-29T09:51:44.008469Z[0m [32m INFO[0m [2mnym-api/src/main.rs[0m[2m:[0m[2m41[0m[2m:[0m Starting nym api...
 Usage: nym-api [OPTIONS] <COMMAND>

 Commands:
@@ -13,9 +12,9 @@ Commands:

 Options:
  -c, --config-env-file <CONFIG_ENV_FILE>
-          Path pointing to an env file that configures the Nym API [env: NYMAPI_CONFIG_ENV_FILE_ARG=]
+          Path pointing to an env file that configures the Nym API
      --no-banner
-          A no-op flag included for consistency with other binaries (and compatibility with nymvisor, oops) [env: NYMAPI_NO_BANNER_ARG=]
+          A no-op flag included for consistency with other binaries (and compatibility with nymvisor, oops)
  -h, --help
          Print help
  -V, --version
@@ -24,67 +23,60 @@ Options:

 ### `init`
 ```sh
-[2m2024-10-29T09:51:44.013292Z[0m [32m INFO[0m [2mnym-api/src/main.rs[0m[2m:[0m[2m41[0m[2m:[0m Starting nym api...
 Initialise a Nym Api instance with persistent config.toml file

 Usage: nym-api init [OPTIONS]

 Options:
      --id <ID>
-          Id of the nym-api we want to initialise. if unspecified, a default value will be used. default: "default" [env: NYMAPI_ID_ARG=] [default: default]
+          Id of the nym-api we want to initialise. if unspecified, a default value will be used. default: "default" [default: default]
  -m, --enable-monitor
-          Specifies whether network monitoring is enabled on this API default: false [env: NYMAPI_ENABLE_MONITOR_ARG=]
+          Specifies whether network monitoring is enabled on this API default: false
  -r, --enable-rewarding
-          Specifies whether network rewarding is enabled on this API default: false [env: NYMAPI_ENABLE_REWARDING_ARG=]
+          Specifies whether network rewarding is enabled on this API default: false
      --nyxd-validator <NYXD_VALIDATOR>
-          Endpoint to nyxd instance used for contract information. default: http://localhost:26657 [env: NYMAPI_NYXD_VALIDATOR_ARG=]
+          Endpoint to nyxd instance used for contract information. default: http://localhost:26657
      --mnemonic <MNEMONIC>
-          Mnemonic of the network monitor used for sending rewarding and zk-nyms transactions default: None [env: NYMAPI_MNEMONIC_ARG=]
+          Mnemonic of the network monitor used for sending rewarding and zk-nyms transactions default: None
      --enable-zk-nym
-          Flag to indicate whether credential signer authority is enabled on this API default: false [env: NYMAPI_ENABLE_ZK_NYM_ARG=]
+          Flag to indicate whether credential signer authority is enabled on this API default: false
      --announce-address <ANNOUNCE_ADDRESS>
-          Announced address that is going to be put in the DKG contract where zk-nym clients will connect to obtain their credentials default: None [env: NYMAPI_ANNOUNCE_ADDRESS_NYM_ARG=]
+          Announced address that is going to be put in the DKG contract where zk-nym clients will connect to obtain their credentials default: None
      --monitor-credentials-mode
-          Set this nym api to work in a enabled credentials that would attempt to use gateway with the bandwidth credential requirement [env: NYMAPI_MONITOR_CREDENTIALS_MODE_ARG=]
-      --bind-address <BIND_ADDRESS>
-          Socket address this api will use for binding its http API. default: `127.0.0.1:8080` in `debug` builds and `0.0.0.0:8080` in `release`
+          Set this nym api to work in a enabled credentials that would attempt to use gateway with the bandwidth credential requirement
  -h, --help
          Print help
 ```

 ### `run`
 ```sh
-[2m2024-10-29T09:51:44.032688Z[0m [32m INFO[0m [2mnym-api/src/main.rs[0m[2m:[0m[2m41[0m[2m:[0m Starting nym api...
 Run the Nym Api with provided configuration optionally overriding set parameters

 Usage: nym-api run [OPTIONS]

 Options:
      --id <ID>
-          Id of the nym-api we want to run.if unspecified, a default value will be used. default: "default" [env: NYMAPI_ID_ARG=] [default: default]
+          Id of the nym-api we want to run.if unspecified, a default value will be used. default: "default" [default: default]
  -m, --enable-monitor <ENABLE_MONITOR>
-          Specifies whether network monitoring is enabled on this API default: None - config value will be used instead [env: NYMAPI_ENABLE_MONITOR_ARG=] [possible values: true, false]
+          Specifies whether network monitoring is enabled on this API default: None - config value will be used instead [possible values: true, false]
  -r, --enable-rewarding <ENABLE_REWARDING>
-          Specifies whether network rewarding is enabled on this API default: None - config value will be used instead [env: NYMAPI_ENABLE_REWARDING_ARG=] [possible values: true, false]
+          Specifies whether network rewarding is enabled on this API default: None - config value will be used instead [possible values: true, false]
      --nyxd-validator <NYXD_VALIDATOR>
-          Endpoint to nyxd instance used for contract information. default: None - config value will be used instead [env: NYMAPI_NYXD_VALIDATOR_ARG=]
+          Endpoint to nyxd instance used for contract information. default: None - config value will be used instead
      --mnemonic <MNEMONIC>
-          Mnemonic of the network monitor used for sending rewarding and zk-nyms transactions default: None - config value will be used instead [env: NYMAPI_MNEMONIC_ARG=]
+          Mnemonic of the network monitor used for sending rewarding and zk-nyms transactions default: None - config value will be used instead
      --enable-zk-nym <ENABLE_ZK_NYM>
-          Flag to indicate whether coconut signer authority is enabled on this API default: None - config value will be used instead [env: NYMAPI_ENABLE_ZK_NYM_ARG=] [possible values: true, false]
+          Flag to indicate whether coconut signer authority is enabled on this API default: None - config value will be used instead [possible values: true, false]
      --announce-address <ANNOUNCE_ADDRESS>
-          Announced address that is going to be put in the DKG contract where zk-nym clients will connect to obtain their credentials default: None - config value will be used instead [env: NYMAPI_ANNOUNCE_ADDRESS_ARG=]
+          Announced address that is going to be put in the DKG contract where zk-nym clients will connect to obtain their credentials default: None - config value will be used instead
      --monitor-credentials-mode <MONITOR_CREDENTIALS_MODE>
-          Set this nym api to work in a enabled credentials that would attempt to use gateway with the bandwidth credential requirement default: None - config value will be used instead [env: NYMAPI_MONITOR_CREDENTIALS_MODE_ARG=] [possible values: true, false]
-      --bind-address <BIND_ADDRESS>
-          Socket address this api will use for binding its http API. default: `127.0.0.1:8080` in `debug` builds and `0.0.0.0:8080` in `release`
+          Set this nym api to work in a enabled credentials that would attempt to use gateway with the bandwidth credential requirement default: None - config value will be used instead [possible values: true, false]
  -h, --help
          Print help
 ```

 ### `build-info`
 ```sh
-[2m2024-10-29T09:51:44.037915Z[0m [32m INFO[0m [2mnym-api/src/main.rs[0m[2m:[0m[2m41[0m[2m:[0m Starting nym api...
 Show build information of this binary

 Usage: nym-api build-info [OPTIONS]
@@ -98,8 +98,6 @@ Options:
          Specify whether detailed system crypto hardware information should be exposed. default: true [env: NYMNODE_HTTP_EXPOSE_CRYPTO_HARDWARE=] [possible values: true, false]
      --mixnet-bind-address <MIXNET_BIND_ADDRESS>
          Address this node will bind to for listening for mixnet packets default: `0.0.0.0:1789` [env: NYMNODE_MIXNET_BIND_ADDRESS=]
-      --mixnet-announce-port <MIXNET_ANNOUNCE_PORT>
-          If applicable, custom port announced in the self-described API that other clients and nodes will use. Useful when the node is behind a proxy [env: NYMNODE_MIXNET_ANNOUNCE_PORT=]
      --nym-api-urls <NYM_API_URLS>
          Addresses to nym APIs from which the node gets the view of the network [env: NYMNODE_NYM_APIS=]
      --nyxd-urls <NYXD_URLS>
@@ -116,8 +114,6 @@ Options:
          The prefix denoting the maximum number of the clients that can be connected via Wireguard. The maximum value for IPv4 is 32 and for IPv6 is 128 [env: NYMNODE_WG_PRIVATE_NETWORK_PREFIX=]
      --verloc-bind-address <VERLOC_BIND_ADDRESS>
          Socket address this node will use for binding its verloc API. default: `0.0.0.0:1790` [env: NYMNODE_VERLOC_BIND_ADDRESS=]
-      --verloc-announce-port <VERLOC_ANNOUNCE_PORT>
-          If applicable, custom port announced in the self-described API that other clients and nodes will use. Useful when the node is behind a proxy [env: NYMNODE_VERLOC_ANNOUNCE_PORT=]
      --entry-bind-address <ENTRY_BIND_ADDRESS>
          Socket address this node will use for binding its client websocket API. default: `0.0.0.0:9000` [env: NYMNODE_ENTRY_BIND_ADDRESS=]
      --announce-ws-port <ANNOUNCE_WS_PORT>
@@ -183,8 +179,6 @@ Options:
          Specify whether detailed system crypto hardware information should be exposed. default: true [env: NYMNODE_HTTP_EXPOSE_CRYPTO_HARDWARE=] [possible values: true, false]
      --mixnet-bind-address <MIXNET_BIND_ADDRESS>
          Address this node will bind to for listening for mixnet packets default: `0.0.0.0:1789` [env: NYMNODE_MIXNET_BIND_ADDRESS=]
-      --mixnet-announce-port <MIXNET_ANNOUNCE_PORT>
-          If applicable, custom port announced in the self-described API that other clients and nodes will use. Useful when the node is behind a proxy [env: NYMNODE_MIXNET_ANNOUNCE_PORT=]
      --nym-api-urls <NYM_API_URLS>
          Addresses to nym APIs from which the node gets the view of the network [env: NYMNODE_NYM_APIS=]
      --nyxd-urls <NYXD_URLS>
@@ -201,8 +195,6 @@ Options:
          The prefix denoting the maximum number of the clients that can be connected via Wireguard. The maximum value for IPv4 is 32 and for IPv6 is 128 [env: NYMNODE_WG_PRIVATE_NETWORK_PREFIX=]
      --verloc-bind-address <VERLOC_BIND_ADDRESS>
          Socket address this node will use for binding its verloc API. default: `0.0.0.0:1790` [env: NYMNODE_VERLOC_BIND_ADDRESS=]
-      --verloc-announce-port <VERLOC_ANNOUNCE_PORT>
-          If applicable, custom port announced in the self-described API that other clients and nodes will use. Useful when the node is behind a proxy [env: NYMNODE_VERLOC_ANNOUNCE_PORT=]
      --entry-bind-address <ENTRY_BIND_ADDRESS>
          Socket address this node will use for binding its client websocket API. default: `0.0.0.0:9000` [env: NYMNODE_ENTRY_BIND_ADDRESS=]
      --announce-ws-port <ANNOUNCE_WS_PORT>
@@ -235,3 +227,5 @@ Options:
  -o, --output <OUTPUT>              [default: text] [possible values: text, json]
  -h, --help                         Print help
 ```
+
+### ``
@@ -79,7 +79,7 @@ Run the associated daemon with the preconfigured settings
 Usage: nymvisor run [DAEMON_ARGS]...

 Arguments:
-  [DAEMON_ARGS]...  
+  [DAEMON_ARGS]...

 Options:
  -h, --help  Print help
@@ -99,10 +99,10 @@ Example output:
 ```sh

 Binary Name:        nymvisor
-Build Timestamp:    2024-10-29T09:48:31.988049207Z
-Build Version:      0.1.8
-Commit SHA:         299552881810511273af13eb135297a4cf7a38de
-Commit Date:        2024-10-29T10:48:07.000000000+01:00
+Build Timestamp:    2024-10-23T14:56:21.738216843Z
+Build Version:      0.1.5
+Commit SHA:         7bfd7efe844be83cf5637cad11cf7cd44411026a
+Commit Date:        2024-10-23T16:53:29.000000000+02:00
 Commit Branch:      max/new-docs-framework
 rustc Version:      1.80.0
 rustc Channel:      stable
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
@@ -34,18 +34,18 @@ Open `http://localhost:3000`.
 pnpm run build
 ```

+The static output will be in `./out`;
+
 ## Contribution
 * If you wish to add to the documentation please create a PR against this repo, with a `patch` against `develop`.

 ## Scripts
-* `generate:commands`: generates command output files for clients and binaries. This script runs the `autodoc` rust binary, moves the files to their required places, and then if there is an update, commits them to git. We commit the files as our remote deployments pull from a git repo. **Only run this script on branches where you want to push e.g. the build info of a binary to production docs**; it will build the monorepo binaries and use their command output for the produced markdown files.
-* `generate:tables`: generates various information tables containing some repo-wide variables and information about ISPs.
+* There are several autogenerated command files for clients and binaries. These are generated with `generate:commands`, which runs the `autodoc` rust binary, moves the files to their required places, and then if there is an update, commits them to git. This is for remote deployments.
+* Python scripts TODO

 ### Autodoc
 `autodoc` is a script that generates markdown files containing commands and their output (both command and `--help` output). For the moment the binaries and their commands are manually configured in the script.

-> **Only run this script on branches where you want to push e.g. the build info of a binary to production docs**; it will build the monorepo binaries and use their command output for the produced markdown files.
-
 ## CI/CD
 TODO

@@ -58,7 +58,7 @@ export const LandingPage = () => {
  };

  return (
-    <Box margin={"0 auto"}>
+    <Box maxWidth={1200} margin={"0 auto"}>
      <Typography variant="h2" mb={6}>
        Nym Docs
      </Typography>
@@ -82,7 +82,7 @@ export const LandingPage = () => {
            sx={{
              borderBottom: {
                xs: index < 3 ? "1px solid #262626" : "none",
-                lg: index === 0 || index === 1 ? "1px solid #262626" : "none",
+                md: index === 0 || index === 1 ? "1px solid #262626" : "none",
              },
              borderRight: {
                md: index === 0 || index === 2 ? "1px solid #262626" : "none",
@@ -90,43 +90,27 @@ export const LandingPage = () => {
            }}
          >
            <Link href={square.href} target="_blank" rel="noopener noreferrer">
-              <Box
-                display={"flex"}
-                gap={{ xs: 3, xl: 4 }}
-                height={"100%"}
-                flexDirection={{ xs: "column", sm: "row" }}
-                alignItems={{ xs: "center" }}
-              >
+              <Box display={"flex"} gap={{ xs: 3, xl: 4 }} height={"100%"}>
                <Image
                  src={square.icon}
                  alt={square.text}
-                  width={isDesktop ? 180 : isTablet ? 140 : 180}
-                  height={isDesktop ? 134 : isTablet ? 90 : 134}
+                  width={180}
+                  height={134}
                />
                <Box
                  display={"flex"}
                  flexDirection={"column"}
                  justifyContent={"space-between"}
-                  alignItems={{ xs: "center", sm: "flex-start" }}
                  flexGrow={1}
                  height={"100%"}
                >
                  <Typography variant="h5" sx={{ fontWeight: 600 }}>
                    {square.text}
                  </Typography>
-
-                  <Typography
-                    variant="body1"
-                    textAlign={{ xs: "center", sm: "left" }}
-                    sx={{
-                      color: "#909195",
-                      display: {
-                        lg: "none",
-                        xl: "block",
-                      },
-                    }}
-                  >
-                    {square.description}
+                  <Typography variant="body1" sx={{ color: "#909195" }}>
+                    {isTablet && !isDesktop
+                      ? shortenDescription(square.description)
+                      : square.description}
                  </Typography>

                  <Typography sx={{ color: "#ff6600", fontWeight: 600 }}>
@@ -1,20 +0,0 @@
-import {Accordion, AccordionItem} from "@nextui-org/react";
-
-export const App = () => {
-  const defaultContent =
-    "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.";
-
-  return (
-    <Accordion variant="shadow">
-      <AccordionItem key="1" aria-label="Accordion 1" title="Accordion 1">
-        {defaultContent}
-      </AccordionItem>
-      <AccordionItem key="2" aria-label="Accordion 2" title="Accordion 2">
-        {defaultContent}
-      </AccordionItem>
-      <AccordionItem key="3" aria-label="Accordion 3" title="Accordion 3">
-        {defaultContent}
-      </AccordionItem>
-    </Accordion>
-  );
-}
@@ -1,21 +0,0 @@
-import { Tabs } from "nextra/components";
-import Mixnodes from "components/operators/snippets/mixnode-migrate-tab-snippet.mdx";
-import Gateways from "components/operators/snippets/gateway-migrate-tab-snippet.mdx";
-
-export const MigrateTabs = () => {
-  return (
-    <div>
-      <Tabs
-        items={[<code>nym-mixnode</code>, <code>nym-gateway</code>]}
-        defaultIndex={1}
-      >
-        <Tabs.Tab>
-          <Mixnodes />
-        </Tabs.Tab>
-        <Tabs.Tab>
-          <Gateways />
-        </Tabs.Tab>
-      </Tabs>
-    </div>
-  );
-};
@@ -1,21 +0,0 @@
-import { Tabs } from 'nextra/components';
-import Mixnodes from 'components/operators/snippets/mixnode-run-tab-snippet.mdx';
-import EntryGateway from 'components/operators/snippets/entry-gateway-run-tab-snippet.mdx';
-import ExitGateway from 'components/operators/snippets/exit-gateway-run-tab-snippet.mdx';
-
-export const RunTabs = () => {
-
-  return (
-    <div>
-      <Tabs items={[
-        <code>mixnode</code>,
-        <code>exit-gateway</code>,
-        <code>entry-gateway</code>
-      ]} defaultIndex={1}>
-        <Tabs.Tab><Mixnodes /></Tabs.Tab>
-        <Tabs.Tab><ExitGateway /></Tabs.Tab>
-        <Tabs.Tab><EntryGateway /></Tabs.Tab>
-      </Tabs>
-    </div>
-  )
-}
@@ -1,34 +0,0 @@
-<>
-If you run a `nym-node` for the first time, you will need to specify a few parameters, please read the section [Essential Parameters & Variables](#essential-paramteters--varibles) before you start and make sure that your `nym-node` is up to date with the [latest version](https://github.com/nymtech/nym/releases/).
-
-**Initialise and run:**
-
-To initialise and test run with yur node with all needed options, use this command:
-```sh
-./nym-node run --id <ID> --mode entry-gateway --public-ips "$(curl -4 https://ifconfig.me)" --hostname "<HOSTNAME>" --http-bind-address 0.0.0.0:8080 --mixnet-bind-address 0.0.0.0:1789 --location <LOCATION> --accept-operator-terms-and-conditions --wireguard-enabled true
-```
-If you prefer to have a generic local identifier set to `default-nym-node`, skip `--id` option.
-
-We highly recommend to setup [reverse proxy and WSS](proxy-configuration.md) for `nym-node`. If you haven't configured any of that, skip `--hostname` flag.
-
-In any case `--public-ips` is a necessity for your node to bond to API and communicate with the internet.
-
-**Initialise only** without running the node with `--init-only` command :
-
-Adding `--init-only` option results in `nym-node` initialising a configuration file `config.toml` without running - a good option for an initial node setup. Remember that if you using this flag on a node which already has a config file, this will not over-write the values, unless used with a specified flag `--write-changes` (`-w`) - a good option for introducing changes to your `config.toml` file.
-
-```sh
-./nym-node run --id <ID> --init-only --mode entry-gateway --public-ips "$(curl -4 https://ifconfig.me)" --hostname "<HOSTNAME>" --http-bind-address 0.0.0.0:8080 --mixnet-bind-address 0.0.0.0:1789 --location <LOCATION> --wireguard-enabled true
-```
-
-In the example above we dropped `--accept-operator-terms-and-conditions` as the flag must be added to a running command explicitly and it is not stored in the config, `--init-only` will not run the node.
-
-**Deny init**
-
-`--deny-init` was introduced as an additional safety for migration from legacy binaries to `nym-node` to prevent operators initialise over existing nodes. For most of the operators, this flag is not needed.
-
-In this example we run the node with custom `--id` without initialising, using `--deny-init` command:
-```sh
-./nym-node run --id <ID> --deny-init --mode entry-gateway --accept-operator-terms-and-conditions
-```
-</>
@@ -1,35 +0,0 @@
-<>
-If you run a `nym-node` for the first time, you will need to specify a few parameters, please read the section [Essential Parameters & Variables](#essential-paramteters--varibles) before you start and make sure that your `nym-node` is up to date with the [latest version](https://github.com/nymtech/nym/releases/).
-
-**Initialise and Run**
-
-To initialise and test run your node, use this command:
-```sh
-./nym-node run --id <ID> --mode exit-gateway --public-ips "$(curl -4 https://ifconfig.me)" --hostname "<HOSTNAME>" --http-bind-address 0.0.0.0:8080 --mixnet-bind-address 0.0.0.0:1789 --location <LOCATION> --accept-operator-terms-and-conditions --wireguard-enabled true
-```
-If you prefer to have a generic local identifier set to `default-nym-node`, skip `--id` option.
-
-We highly recommend to setup [reverse proxy and WSS](proxy-configuration.md) for `nym-node`. If you haven't configured any of that, skip `--hostname` flag.
-
-In any case `--public-ips` is a necessity for your node to bond to API and communicate with the internet.
-
-
-**Initialise only** without running the node with `--init-only` command:
-
-Adding `--init-only` option results in `nym-node` initialising a configuration file `config.toml` without running - a good option for an initial node setup. Remember that if you using this flag on a node which already has a config file, this will not over-write the values, unless used with a specified flag `--write-changes` (`-w`) - a good option for introducing changes to your `config.toml` file.
-
-```sh
-./nym-node run --id <ID> --init-only --mode exit-gateway --public-ips "$(curl -4 https://ifconfig.me)" --hostname "<HOSTNAME>" --http-bind-address 0.0.0.0:8080 --mixnet-bind-address 0.0.0.0:1789 --location <LOCATION> --wireguard-enabled true
-```
-
-In the example above we dropped `--accept-operator-terms-and-conditions` as the flag must be added to a running command explicitly and it is not stored in the config, `--init-only` will not run the node.
-
-**Deny init**
-
-`--deny-init` was introduced as an additional safety for migration from legacy binaries to `nym-node` to prevent operators initialise over existing nodes. For most of the operators, this flag is not needed.
-
-In this example we run the node with custom `--id` without initialising, using `--deny-init` command:
-```sh
-./nym-node run --id <ID> --deny-init --mode exit-gateway --accept-operator-terms-and-conditions
-```
-</>
@@ -1,23 +0,0 @@
-import { Steps } from 'nextra/components';
-
-<>
-Migrate your `nym-gateway` to `nym-node --mode entry-gateway` or `--mode exit-gateway` using these commands:
-<Steps>
-###### 1. Move relevant info from `config.toml`
-```sh
-./nym-node migrate --config-file ~/.nym/gateways/<GATEWAY_ID>/config/config.toml gateway
-```
-
-###### 2. Initialise with new `nym-node` config chosing one of the options below:
-
- as `entry-gateway`:
-```sh
-./nym-node run --id <ID> --mode entry-gateway --public-ips "$(curl -4 https://ifconfig.me)" --hostname <HOSTNAME> --http-bind-address 0.0.0.0:8080 --mixnet-bind-address 0.0.0.0:1789 --location <LOCATION> --accept-operator-terms-and-conditions --wireguard-enabled true
-```
-
- or as `exit-gateway`:
-```sh
-./nym-node run --id <ID> --mode exit-gateway --public-ips "$(curl -4 https://ifconfig.me)" --hostname <HOSTNAME> --http-bind-address 0.0.0.0:8080 --mixnet-bind-address 0.0.0.0:1789 --location <LOCATION> --accept-operator-terms-and-conditions --wireguard-enabled true
-```
-</Steps>
-</>
@@ -1,16 +0,0 @@
-import { Steps } from 'nextra/components';
-
-<>
-Migrate your `nym-mixnode` to `nym-node --mode mixnode` using these commands:
-<Steps>
-###### 1. Move relevant info from `config.toml`
-```sh
-./nym-node migrate --config-file ~/.nym/mixnodes/<ID>/config/config.toml mixnode
-```
-
-###### 2. Initialise with new `nym-node` config
-```sh
-./nym-node run --mode mixnode --id <ID> --location <LOCATION> --mixnet-bind-address 0.0.0.0:1789 --http-bind-address 0.0.0.0:8080 --accept-operator-terms-and-conditions
-```
-</Steps>
-</>
@@ -1,31 +0,0 @@
-<>
-If you run a `nym-node` for the first time, you will need to specify a few parameters, please read the section [Essential Parameters & Variables](#essential-paramteters--varibles) before you start and make sure that your `nym-node` is up to date with the [latest version](https://github.com/nymtech/nym/releases/).
-
-**Initialise and Run:**
-
-To initialise and run your node, use this command:
-
-```sh
-./nym-node run --mode mixnode --mixnet-bind-address 0.0.0.0:1789 --verloc-bind-address 0.0.0.0:1790 --http-bind-address 0.0.0.0:8080 --public-ips "$(curl -4 https://ifconfig.me)" --accept-operator-terms-and-conditions
-```
-
-**Init only**
-
-Adding `--init-only` option results in `nym-node` initialising a configuration file `config.toml` without running - a good option for an initial node setup. Remember that if you using this flag on a node which already has a config file, this will not over-write the values, unless used with a specified flag `--write-changes` (`-w`) - a good option for introducing changes to your `config.toml` file.
-
-Initialise only with a custom `--id` and `--init-only` command:
-```sh
-./nym-node run --mode mixnode --id <ID> --init-only --mixnet-bind-address 0.0.0.0:1789 --verloc-bind-address 0.0.0.0:1790 --http-bind-address 0.0.0.0:8080 --public-ips "$(curl -4 https://ifconfig.me)" --accept-operator-terms-and-conditions
-```
-
-If you prefer to have a generic local identifier set to `default-nym-node`, skip `--id` option.
-
-**Deny init**
-
-`--deny-init` was introduced as an additional safety for migration from legacy binaries to `nym-node` to prevent operators initialise over existing nodes. For most of the operators, this flag is not needed.
-
-In this example we run the node with custom `--id` without initialising, using `--deny-init` command:
-```sh
-./nym-node run --mode mixnode --id <ID> --deny-init --accept-operator-terms-and-conditions
-```
-</>
@@ -1,13 +0,0 @@
-Open the needed ports for `nym-node` by running these commands:
-
-```sh
-ufw allow 22/tcp    # SSH - you're in control of these ports
-ufw allow 80/tcp    # HTTP
-ufw allow 443/tcp   # HTTPS
-ufw allow 1789/tcp  # Nym specific
-ufw allow 1790/tcp  # Nym specific
-ufw allow 8080/tcp  # Nym specific - nym-node-api
-ufw allow 9000/tcp  # Nym Specific - clients port
-ufw allow 9001/tcp  # Nym specific - wss port
-ufw allow 51822/udp # WireGuard
-```
@@ -1,10 +0,0 @@
-Open the needed ports for `validator` by running these commands:
-
-```sh
-ufw allow 1317		# REST API server endpoint
-ufw allow 26656		# Listen for incoming peer connections
-ufw allow 26660		# Listen for Prometheus connections
-ufw allow 22		# SSH port
-ufw allow 80		# http port
-ufw allow 443/tcp	# https port
-```
@@ -1,7 +0,0 @@
-import { Callout } from 'nextra/components';
-
-If you want to bond or upgrade your `nym-node` via the CLI, then check out the [relevant section in the Nym CLI](https://nymtech.net/docs/tools/nym-cli.html#upgrade-a-mix-node) docs.
-
-<Callout>
-If you run in mode `--entry-gateway` or `--exit-gateway`, visit [Nym Harbour Master](https://harbourmaster.nymtech.net/) to get all the probe info about your node directly from API.
-</Callout>
@@ -1,9 +0,0 @@
- Open your Desktop wallet
-
- Navigate to the `Bonding` page and click the `Node Settings` link in the top right corner
-
-![](/images/operators/wallet-screenshots/bonding.png)
-
- Update the fields in the `Node Settings` page (usually the field `Version` is the only one to change) and click `Submit changes to the blockchain`.
-
-![](/images/operators/wallet-screenshots/node_settings.png)
@@ -1 +1 @@
-Tuesday, October 29th 2024, 09:51:52 UTC
+Monday, October 28th 2024, 13:47:55 UTC
@@ -1,5 +1,4 @@
 ```sh
-[2m2024-10-29T09:51:44.050179Z[0m [32m INFO[0m [2mnym-api/src/main.rs[0m[2m:[0m[2m41[0m[2m:[0m Starting nym api...
 Show build information of this binary

 Usage: nym-api build-info [OPTIONS]
@@ -1,11 +1,10 @@
 ```sh
-[2m2024-10-29T09:51:44.043480Z[0m [32m INFO[0m [2mnym-api/src/main.rs[0m[2m:[0m[2m41[0m[2m:[0m Starting nym api...

 Binary Name:        nym-api
-Build Timestamp:    2024-10-29T09:48:31.988049207Z
-Build Version:      1.1.45
-Commit SHA:         299552881810511273af13eb135297a4cf7a38de
-Commit Date:        2024-10-29T10:48:07.000000000+01:00
+Build Timestamp:    2024-10-23T14:56:21.738216843Z
+Build Version:      1.1.42
+Commit SHA:         7bfd7efe844be83cf5637cad11cf7cd44411026a
+Commit Date:        2024-10-23T16:53:29.000000000+02:00
 Commit Branch:      max/new-docs-framework
 rustc Version:      1.80.0
 rustc Channel:      stable
@@ -1,5 +1,5 @@
 ```sh
-[2m2024-10-29T09:51:53.363364Z[0m [32m INFO[0m [2mnym-api/src/main.rs[0m[2m:[0m[2m41[0m[2m:[0m Starting nym api...
+[2m2024-10-28T13:47:56.315512Z[0m [32m INFO[0m [2mnym-api/src/main.rs[0m[2m:[0m[2m41[0m[2m:[0m Starting nym api...
 Usage: nym-api [OPTIONS] <COMMAND>

 Commands:
@@ -1,28 +1,25 @@
 ```sh
-[2m2024-10-29T09:51:44.027197Z[0m [32m INFO[0m [2mnym-api/src/main.rs[0m[2m:[0m[2m41[0m[2m:[0m Starting nym api...
 Initialise a Nym Api instance with persistent config.toml file

 Usage: nym-api init [OPTIONS]

 Options:
      --id <ID>
-          Id of the nym-api we want to initialise. if unspecified, a default value will be used. default: "default" [env: NYMAPI_ID_ARG=] [default: default]
+          Id of the nym-api we want to initialise. if unspecified, a default value will be used. default: "default" [default: default]
  -m, --enable-monitor
-          Specifies whether network monitoring is enabled on this API default: false [env: NYMAPI_ENABLE_MONITOR_ARG=]
+          Specifies whether network monitoring is enabled on this API default: false
  -r, --enable-rewarding
-          Specifies whether network rewarding is enabled on this API default: false [env: NYMAPI_ENABLE_REWARDING_ARG=]
+          Specifies whether network rewarding is enabled on this API default: false
      --nyxd-validator <NYXD_VALIDATOR>
-          Endpoint to nyxd instance used for contract information. default: http://localhost:26657 [env: NYMAPI_NYXD_VALIDATOR_ARG=]
+          Endpoint to nyxd instance used for contract information. default: http://localhost:26657
      --mnemonic <MNEMONIC>
-          Mnemonic of the network monitor used for sending rewarding and zk-nyms transactions default: None [env: NYMAPI_MNEMONIC_ARG=]
+          Mnemonic of the network monitor used for sending rewarding and zk-nyms transactions default: None
      --enable-zk-nym
-          Flag to indicate whether credential signer authority is enabled on this API default: false [env: NYMAPI_ENABLE_ZK_NYM_ARG=]
+          Flag to indicate whether credential signer authority is enabled on this API default: false
      --announce-address <ANNOUNCE_ADDRESS>
-          Announced address that is going to be put in the DKG contract where zk-nym clients will connect to obtain their credentials default: None [env: NYMAPI_ANNOUNCE_ADDRESS_NYM_ARG=]
+          Announced address that is going to be put in the DKG contract where zk-nym clients will connect to obtain their credentials default: None
      --monitor-credentials-mode
-          Set this nym api to work in a enabled credentials that would attempt to use gateway with the bandwidth credential requirement [env: NYMAPI_MONITOR_CREDENTIALS_MODE_ARG=]
-      --bind-address <BIND_ADDRESS>
-          Socket address this api will use for binding its http API. default: `127.0.0.1:8080` in `debug` builds and `0.0.0.0:8080` in `release`
+          Set this nym api to work in a enabled credentials that would attempt to use gateway with the bandwidth credential requirement
  -h, --help
          Print help
 ```
@@ -1,3 +0,0 @@
-```sh
-[2m2024-10-29T09:51:44.019255Z[0m [32m INFO[0m [2mnym-api/src/main.rs[0m[2m:[0m[2m41[0m[2m:[0m Starting nym api...
-```
@@ -1,10 +1,10 @@
 ```sh

 Binary Name:        nym-client
-Build Timestamp:    2024-10-29T09:48:31.988049207Z
-Build Version:      1.1.42
-Commit SHA:         299552881810511273af13eb135297a4cf7a38de
-Commit Date:        2024-10-29T10:48:07.000000000+01:00
+Build Timestamp:    2024-10-23T14:56:21.738216843Z
+Build Version:      1.1.39
+Commit SHA:         7bfd7efe844be83cf5637cad11cf7cd44411026a
+Commit Date:        2024-10-23T16:53:29.000000000+02:00
 Commit Branch:      max/new-docs-framework
 rustc Version:      1.80.0
 rustc Channel:      stable
@@ -247,290 +247,45 @@ const completion: Fig.Spec = {
      ],
    },
    {
-      name: "ecash",
-      description: "Ecash-related functionalities",
-      subcommands: [
-        {
-          name: "show-ticket-books",
-          description: "Display information associated with the imported ticketbooks,",
-          options: [
-            {
-              name: "--id",
-              description: "Id of client that is going to display the ticketbook information",
-              isRepeatable: true,
-              args: {
-                name: "id",
-              },
-            },
-            {
-              name: ["-o", "--output"],
-              isRepeatable: true,
-              args: {
-                name: "output",
-                isOptional: true,
-                suggestions: [
-                  "text",
-                  "json",
-                ],
-              },
-            },
-            {
-              name: ["-h", "--help"],
-              description: "Print help",
-            },
-          ],
-        },
-        {
-          name: "import-ticket-book",
-          description: "Import a pre-generated ticketbook",
-          options: [
-            {
-              name: "--id",
-              description: "Id of client that is going to import the credential",
-              isRepeatable: true,
-              args: {
-                name: "id",
-              },
-            },
-            {
-              name: "--credential-data",
-              description: "Explicitly provide the encoded credential data (as base58)",
-              isRepeatable: true,
-              args: {
-                name: "credential_data",
-                isOptional: true,
-              },
-            },
-            {
-              name: "--credential-path",
-              description: "Specifies the path to file containing binary credential data",
-              isRepeatable: true,
-              args: {
-                name: "credential_path",
-                isOptional: true,
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--version",
-              hidden: true,
-              isRepeatable: true,
-              args: {
-                name: "version",
-                isOptional: true,
-              },
-            },
-            {
-              name: "--standalone",
-              description: "Specifies whether we're attempting to import a standalone ticketbook (i.e. serialised `IssuedTicketBook`)",
-            },
-            {
-              name: "--full",
-              description: "Specifies whether we're attempting to import full ticketboot (i.e. one that **might** contain required global signatures; that is serialised `ImportableTicketBook`)",
-            },
-            {
-              name: ["-h", "--help"],
-              description: "Print help",
-            },
-          ],
-        },
-        {
-          name: "import-coin-index-signatures",
-          description: "Import coin index signatures needed for ticketbooks",
-          options: [
-            {
-              name: "--id",
-              description: "Id of client that is going to import the signatures",
-              isRepeatable: true,
-              args: {
-                name: "id",
-              },
-            },
-            {
-              name: "--client-config",
-              description: "Config file of the client that is supposed to use the signatures",
-              isRepeatable: true,
-              args: {
-                name: "client_config",
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--signatures-data",
-              description: "Explicitly provide the encoded signatures data (as base58)",
-              isRepeatable: true,
-              args: {
-                name: "signatures_data",
-                isOptional: true,
-              },
-            },
-            {
-              name: "--signatures-path",
-              description: "Specifies the path to file containing binary signatures data",
-              isRepeatable: true,
-              args: {
-                name: "signatures_path",
-                isOptional: true,
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--version",
-              hidden: true,
-              isRepeatable: true,
-              args: {
-                name: "version",
-                isOptional: true,
-              },
-            },
-            {
-              name: ["-h", "--help"],
-              description: "Print help",
-            },
-          ],
-        },
-        {
-          name: "import-expiration-date-signatures",
-          description: "Import expiration date signatures needed for ticketbooks",
-          options: [
-            {
-              name: "--id",
-              description: "Id of client that is going to import the signatures",
-              isRepeatable: true,
-              args: {
-                name: "id",
-              },
-            },
-            {
-              name: "--client-config",
-              description: "Config file of the client that is supposed to use the signatures",
-              isRepeatable: true,
-              args: {
-                name: "client_config",
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--signatures-data",
-              description: "Explicitly provide the encoded signatures data (as base58)",
-              isRepeatable: true,
-              args: {
-                name: "signatures_data",
-                isOptional: true,
-              },
-            },
-            {
-              name: "--signatures-path",
-              description: "Specifies the path to file containing binary signatures data",
-              isRepeatable: true,
-              args: {
-                name: "signatures_path",
-                isOptional: true,
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--version",
-              hidden: true,
-              isRepeatable: true,
-              args: {
-                name: "version",
-                isOptional: true,
-              },
-            },
-            {
-              name: ["-h", "--help"],
-              description: "Print help",
-            },
-          ],
-        },
-        {
-          name: "import-master-verification-key",
-          description: "Import master verification key needed for ticketbooks",
-          options: [
-            {
-              name: "--id",
-              description: "Id of client that is going to import the key",
-              isRepeatable: true,
-              args: {
-                name: "id",
-              },
-            },
-            {
-              name: "--client-config",
-              description: "Config file of the client that is supposed to use the key",
-              isRepeatable: true,
-              args: {
-                name: "client_config",
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--key-data",
-              description: "Explicitly provide the encoded key data (as base58)",
-              isRepeatable: true,
-              args: {
-                name: "key_data",
-                isOptional: true,
-              },
-            },
-            {
-              name: "--key-path",
-              description: "Specifies the path to file containing binary key data",
-              isRepeatable: true,
-              args: {
-                name: "key_path",
-                isOptional: true,
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--version",
-              hidden: true,
-              isRepeatable: true,
-              args: {
-                name: "version",
-                isOptional: true,
-              },
-            },
-            {
-              name: ["-h", "--help"],
-              description: "Print help",
-            },
-          ],
-        },
-        {
-          name: "help",
-          description: "Print this message or the help of the given subcommand(s)",
-          subcommands: [
-            {
-              name: "show-ticket-books",
-              description: "Display information associated with the imported ticketbooks,",
-            },
-            {
-              name: "import-ticket-book",
-              description: "Import a pre-generated ticketbook",
-            },
-            {
-              name: "import-coin-index-signatures",
-              description: "Import coin index signatures needed for ticketbooks",
-            },
-            {
-              name: "import-expiration-date-signatures",
-              description: "Import expiration date signatures needed for ticketbooks",
-            },
-            {
-              name: "import-master-verification-key",
-              description: "Import master verification key needed for ticketbooks",
-            },
-            {
-              name: "help",
-              description: "Print this message or the help of the given subcommand(s)",
-            },
-          ],
-        },
-      ],
+      name: "import-credential",
+      description: "Import a pre-generated credential",
      options: [
+        {
+          name: "--id",
+          description: "Id of client that is going to import the credential",
+          isRepeatable: true,
+          args: {
+            name: "id",
+          },
+        },
+        {
+          name: "--credential-data",
+          description: "Explicitly provide the encoded credential data (as base58)",
+          isRepeatable: true,
+          args: {
+            name: "credential_data",
+            isOptional: true,
+          },
+        },
+        {
+          name: "--credential-path",
+          description: "Specifies the path to file containing binary credential data",
+          isRepeatable: true,
+          args: {
+            name: "credential_path",
+            isOptional: true,
+            template: "filepaths",
+          },
+        },
+        {
+          name: "--version",
+          hidden: true,
+          isRepeatable: true,
+          args: {
+            name: "version",
+            isOptional: true,
+          },
+        },
        {
          name: ["-h", "--help"],
          description: "Print help",
@@ -667,6 +422,36 @@ const completion: Fig.Spec = {
        },
      ],
    },
+    {
+      name: "show-ticketbooks",
+      description: "Display information associated with the imported ticketbooks,",
+      options: [
+        {
+          name: "--id",
+          description: "Id of client that is going to display the ticketbook information",
+          isRepeatable: true,
+          args: {
+            name: "id",
+          },
+        },
+        {
+          name: ["-o", "--output"],
+          isRepeatable: true,
+          args: {
+            name: "output",
+            isOptional: true,
+            suggestions: [
+              "text",
+              "json",
+            ],
+          },
+        },
+        {
+          name: ["-h", "--help"],
+          description: "Print help",
+        },
+      ],
+    },
    {
      name: "build-info",
      description: "Show build information of this binary",
@@ -732,30 +517,8 @@ const completion: Fig.Spec = {
          description: "Run the Nym client with provided configuration client optionally overriding set parameters",
        },
        {
-          name: "ecash",
-          description: "Ecash-related functionalities",
-          subcommands: [
-            {
-              name: "show-ticket-books",
-              description: "Display information associated with the imported ticketbooks,",
-            },
-            {
-              name: "import-ticket-book",
-              description: "Import a pre-generated ticketbook",
-            },
-            {
-              name: "import-coin-index-signatures",
-              description: "Import coin index signatures needed for ticketbooks",
-            },
-            {
-              name: "import-expiration-date-signatures",
-              description: "Import expiration date signatures needed for ticketbooks",
-            },
-            {
-              name: "import-master-verification-key",
-              description: "Import master verification key needed for ticketbooks",
-            },
-          ],
+          name: "import-credential",
+          description: "Import a pre-generated credential",
        },
        {
          name: "list-gateways",
@@ -769,6 +532,10 @@ const completion: Fig.Spec = {
          name: "switch-gateway",
          description: "Change the currently active gateway. Note that you must have already registered with the new gateway!",
        },
+        {
+          name: "show-ticketbooks",
+          description: "Display information associated with the imported ticketbooks,",
+        },
        {
          name: "build-info",
          description: "Show build information of this binary",
@@ -1,2 +1,15 @@
 ```sh
+Import a pre-generated credential
+
+Usage: nym-client import-credential --id <ID> <--credential-data <CREDENTIAL_DATA>|--credential-path <CREDENTIAL_PATH>>
+
+Options:
+      --id <ID>
+          Id of client that is going to import the credential
+      --credential-data <CREDENTIAL_DATA>
+          Explicitly provide the encoded credential data (as base58)
+      --credential-path <CREDENTIAL_PATH>
+          Specifies the path to file containing binary credential data
+  -h, --help
+          Print help
 ```
@@ -1,3 +1,3 @@
 ```sh
-[2m2024-10-29T09:51:44.440498Z[0m [31mERROR[0m [2mnym-node/src/config/upgrade_helpers.rs[0m[2m:[0m[2m16[0m[2m:[0m Failed to finish upgrade - failed to load config file using path '/home/m/.nym/nym-nodes/default-nym-node/config/config.toml'. detailed message: No such file or directory (os error 2)
+[2m2024-10-23T14:58:44.317540Z[0m [31mERROR[0m [2mnym-node/src/config/upgrade_helpers.rs[0m[2m:[0m[2m16[0m[2m:[0m Failed to finish upgrade - failed to load config file using path '/home/m/.nym/nym-nodes/default-nym-node/config/config.toml'. detailed message: No such file or directory (os error 2)
 ```
@@ -1,10 +1,10 @@
 ```sh

 Binary Name:        nym-node
-Build Timestamp:    2024-10-29T09:48:31.988049207Z
-Build Version:      1.1.9
-Commit SHA:         299552881810511273af13eb135297a4cf7a38de
-Commit Date:        2024-10-29T10:48:07.000000000+01:00
+Build Timestamp:    2024-10-23T14:56:21.738216843Z
+Build Version:      1.1.6
+Commit SHA:         7bfd7efe844be83cf5637cad11cf7cd44411026a
+Commit Date:        2024-10-23T16:53:29.000000000+02:00
 Commit Branch:      max/new-docs-framework
 rustc Version:      1.80.0
 rustc Channel:      stable
@@ -33,8 +33,6 @@ Options:
          Specify whether detailed system crypto hardware information should be exposed. default: true [env: NYMNODE_HTTP_EXPOSE_CRYPTO_HARDWARE=] [possible values: true, false]
      --mixnet-bind-address <MIXNET_BIND_ADDRESS>
          Address this node will bind to for listening for mixnet packets default: `0.0.0.0:1789` [env: NYMNODE_MIXNET_BIND_ADDRESS=]
-      --mixnet-announce-port <MIXNET_ANNOUNCE_PORT>
-          If applicable, custom port announced in the self-described API that other clients and nodes will use. Useful when the node is behind a proxy [env: NYMNODE_MIXNET_ANNOUNCE_PORT=]
      --nym-api-urls <NYM_API_URLS>
          Addresses to nym APIs from which the node gets the view of the network [env: NYMNODE_NYM_APIS=]
      --nyxd-urls <NYXD_URLS>
@@ -51,8 +49,6 @@ Options:
          The prefix denoting the maximum number of the clients that can be connected via Wireguard. The maximum value for IPv4 is 32 and for IPv6 is 128 [env: NYMNODE_WG_PRIVATE_NETWORK_PREFIX=]
      --verloc-bind-address <VERLOC_BIND_ADDRESS>
          Socket address this node will use for binding its verloc API. default: `0.0.0.0:1790` [env: NYMNODE_VERLOC_BIND_ADDRESS=]
-      --verloc-announce-port <VERLOC_ANNOUNCE_PORT>
-          If applicable, custom port announced in the self-described API that other clients and nodes will use. Useful when the node is behind a proxy [env: NYMNODE_VERLOC_ANNOUNCE_PORT=]
      --entry-bind-address <ENTRY_BIND_ADDRESS>
          Socket address this node will use for binding its client websocket API. default: `0.0.0.0:9000` [env: NYMNODE_ENTRY_BIND_ADDRESS=]
      --announce-ws-port <ANNOUNCE_WS_PORT>
@@ -1,3 +1,3 @@
 ```sh
-[2m2024-10-29T09:51:44.459681Z[0m [31mERROR[0m [2mnym-node/src/config/upgrade_helpers.rs[0m[2m:[0m[2m16[0m[2m:[0m Failed to finish upgrade - failed to load config file using path '/home/m/.nym/nym-nodes/default-nym-node/config/config.toml'. detailed message: No such file or directory (os error 2)
+[2m2024-10-23T14:58:44.342897Z[0m [31mERROR[0m [2mnym-node/src/config/upgrade_helpers.rs[0m[2m:[0m[2m16[0m[2m:[0m Failed to finish upgrade - failed to load config file using path '/home/m/.nym/nym-nodes/default-nym-node/config/config.toml'. detailed message: No such file or directory (os error 2)
 ```
@@ -1,10 +1,10 @@
 ```sh

 Binary Name:        nym-socks5-client
-Build Timestamp:    2024-10-29T09:48:31.988049207Z
-Build Version:      1.1.42
-Commit SHA:         299552881810511273af13eb135297a4cf7a38de
-Commit Date:        2024-10-29T10:48:07.000000000+01:00
+Build Timestamp:    2024-10-23T14:56:21.738216843Z
+Build Version:      1.1.39
+Commit SHA:         7bfd7efe844be83cf5637cad11cf7cd44411026a
+Commit Date:        2024-10-23T16:53:29.000000000+02:00
 Commit Branch:      max/new-docs-framework
 rustc Version:      1.80.0
 rustc Channel:      stable
@@ -281,290 +281,45 @@ const completion: Fig.Spec = {
      ],
    },
    {
-      name: "ecash",
-      description: "Ecash-related functionalities",
-      subcommands: [
-        {
-          name: "show-ticket-books",
-          description: "Display information associated with the imported ticketbooks,",
-          options: [
-            {
-              name: "--id",
-              description: "Id of client that is going to display the ticketbook information",
-              isRepeatable: true,
-              args: {
-                name: "id",
-              },
-            },
-            {
-              name: ["-o", "--output"],
-              isRepeatable: true,
-              args: {
-                name: "output",
-                isOptional: true,
-                suggestions: [
-                  "text",
-                  "json",
-                ],
-              },
-            },
-            {
-              name: ["-h", "--help"],
-              description: "Print help",
-            },
-          ],
-        },
-        {
-          name: "import-ticket-book",
-          description: "Import a pre-generated ticketbook",
-          options: [
-            {
-              name: "--id",
-              description: "Id of client that is going to import the credential",
-              isRepeatable: true,
-              args: {
-                name: "id",
-              },
-            },
-            {
-              name: "--credential-data",
-              description: "Explicitly provide the encoded credential data (as base58)",
-              isRepeatable: true,
-              args: {
-                name: "credential_data",
-                isOptional: true,
-              },
-            },
-            {
-              name: "--credential-path",
-              description: "Specifies the path to file containing binary credential data",
-              isRepeatable: true,
-              args: {
-                name: "credential_path",
-                isOptional: true,
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--version",
-              hidden: true,
-              isRepeatable: true,
-              args: {
-                name: "version",
-                isOptional: true,
-              },
-            },
-            {
-              name: "--standalone",
-              description: "Specifies whether we're attempting to import a standalone ticketbook (i.e. serialised `IssuedTicketBook`)",
-            },
-            {
-              name: "--full",
-              description: "Specifies whether we're attempting to import full ticketboot (i.e. one that **might** contain required global signatures; that is serialised `ImportableTicketBook`)",
-            },
-            {
-              name: ["-h", "--help"],
-              description: "Print help",
-            },
-          ],
-        },
-        {
-          name: "import-coin-index-signatures",
-          description: "Import coin index signatures needed for ticketbooks",
-          options: [
-            {
-              name: "--id",
-              description: "Id of client that is going to import the signatures",
-              isRepeatable: true,
-              args: {
-                name: "id",
-              },
-            },
-            {
-              name: "--client-config",
-              description: "Config file of the client that is supposed to use the signatures",
-              isRepeatable: true,
-              args: {
-                name: "client_config",
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--signatures-data",
-              description: "Explicitly provide the encoded signatures data (as base58)",
-              isRepeatable: true,
-              args: {
-                name: "signatures_data",
-                isOptional: true,
-              },
-            },
-            {
-              name: "--signatures-path",
-              description: "Specifies the path to file containing binary signatures data",
-              isRepeatable: true,
-              args: {
-                name: "signatures_path",
-                isOptional: true,
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--version",
-              hidden: true,
-              isRepeatable: true,
-              args: {
-                name: "version",
-                isOptional: true,
-              },
-            },
-            {
-              name: ["-h", "--help"],
-              description: "Print help",
-            },
-          ],
-        },
-        {
-          name: "import-expiration-date-signatures",
-          description: "Import expiration date signatures needed for ticketbooks",
-          options: [
-            {
-              name: "--id",
-              description: "Id of client that is going to import the signatures",
-              isRepeatable: true,
-              args: {
-                name: "id",
-              },
-            },
-            {
-              name: "--client-config",
-              description: "Config file of the client that is supposed to use the signatures",
-              isRepeatable: true,
-              args: {
-                name: "client_config",
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--signatures-data",
-              description: "Explicitly provide the encoded signatures data (as base58)",
-              isRepeatable: true,
-              args: {
-                name: "signatures_data",
-                isOptional: true,
-              },
-            },
-            {
-              name: "--signatures-path",
-              description: "Specifies the path to file containing binary signatures data",
-              isRepeatable: true,
-              args: {
-                name: "signatures_path",
-                isOptional: true,
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--version",
-              hidden: true,
-              isRepeatable: true,
-              args: {
-                name: "version",
-                isOptional: true,
-              },
-            },
-            {
-              name: ["-h", "--help"],
-              description: "Print help",
-            },
-          ],
-        },
-        {
-          name: "import-master-verification-key",
-          description: "Import master verification key needed for ticketbooks",
-          options: [
-            {
-              name: "--id",
-              description: "Id of client that is going to import the key",
-              isRepeatable: true,
-              args: {
-                name: "id",
-              },
-            },
-            {
-              name: "--client-config",
-              description: "Config file of the client that is supposed to use the key",
-              isRepeatable: true,
-              args: {
-                name: "client_config",
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--key-data",
-              description: "Explicitly provide the encoded key data (as base58)",
-              isRepeatable: true,
-              args: {
-                name: "key_data",
-                isOptional: true,
-              },
-            },
-            {
-              name: "--key-path",
-              description: "Specifies the path to file containing binary key data",
-              isRepeatable: true,
-              args: {
-                name: "key_path",
-                isOptional: true,
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--version",
-              hidden: true,
-              isRepeatable: true,
-              args: {
-                name: "version",
-                isOptional: true,
-              },
-            },
-            {
-              name: ["-h", "--help"],
-              description: "Print help",
-            },
-          ],
-        },
-        {
-          name: "help",
-          description: "Print this message or the help of the given subcommand(s)",
-          subcommands: [
-            {
-              name: "show-ticket-books",
-              description: "Display information associated with the imported ticketbooks,",
-            },
-            {
-              name: "import-ticket-book",
-              description: "Import a pre-generated ticketbook",
-            },
-            {
-              name: "import-coin-index-signatures",
-              description: "Import coin index signatures needed for ticketbooks",
-            },
-            {
-              name: "import-expiration-date-signatures",
-              description: "Import expiration date signatures needed for ticketbooks",
-            },
-            {
-              name: "import-master-verification-key",
-              description: "Import master verification key needed for ticketbooks",
-            },
-            {
-              name: "help",
-              description: "Print this message or the help of the given subcommand(s)",
-            },
-          ],
-        },
-      ],
+      name: "import-credential",
+      description: "Import a pre-generated credential",
      options: [
+        {
+          name: "--id",
+          description: "Id of client that is going to import the credential",
+          isRepeatable: true,
+          args: {
+            name: "id",
+          },
+        },
+        {
+          name: "--credential-data",
+          description: "Explicitly provide the encoded credential data (as base58)",
+          isRepeatable: true,
+          args: {
+            name: "credential_data",
+            isOptional: true,
+          },
+        },
+        {
+          name: "--credential-path",
+          description: "Specifies the path to file containing binary credential data",
+          isRepeatable: true,
+          args: {
+            name: "credential_path",
+            isOptional: true,
+            template: "filepaths",
+          },
+        },
+        {
+          name: "--version",
+          hidden: true,
+          isRepeatable: true,
+          args: {
+            name: "version",
+            isOptional: true,
+          },
+        },
        {
          name: ["-h", "--help"],
          description: "Print help",
@@ -701,6 +456,36 @@ const completion: Fig.Spec = {
        },
      ],
    },
+    {
+      name: "show-ticketbooks",
+      description: "Display information associated with the imported ticketbooks,",
+      options: [
+        {
+          name: "--id",
+          description: "Id of client that is going to display the ticketbook information",
+          isRepeatable: true,
+          args: {
+            name: "id",
+          },
+        },
+        {
+          name: ["-o", "--output"],
+          isRepeatable: true,
+          args: {
+            name: "output",
+            isOptional: true,
+            suggestions: [
+              "text",
+              "json",
+            ],
+          },
+        },
+        {
+          name: ["-h", "--help"],
+          description: "Print help",
+        },
+      ],
+    },
    {
      name: "build-info",
      description: "Show build information of this binary",
@@ -766,30 +551,8 @@ const completion: Fig.Spec = {
          description: "Run the Nym client with provided configuration client optionally overriding set parameters",
        },
        {
-          name: "ecash",
-          description: "Ecash-related functionalities",
-          subcommands: [
-            {
-              name: "show-ticket-books",
-              description: "Display information associated with the imported ticketbooks,",
-            },
-            {
-              name: "import-ticket-book",
-              description: "Import a pre-generated ticketbook",
-            },
-            {
-              name: "import-coin-index-signatures",
-              description: "Import coin index signatures needed for ticketbooks",
-            },
-            {
-              name: "import-expiration-date-signatures",
-              description: "Import expiration date signatures needed for ticketbooks",
-            },
-            {
-              name: "import-master-verification-key",
-              description: "Import master verification key needed for ticketbooks",
-            },
-          ],
+          name: "import-credential",
+          description: "Import a pre-generated credential",
        },
        {
          name: "list-gateways",
@@ -803,6 +566,10 @@ const completion: Fig.Spec = {
          name: "switch-gateway",
          description: "Change the currently active gateway. Note that you must have already registered with the new gateway!",
        },
+        {
+          name: "show-ticketbooks",
+          description: "Display information associated with the imported ticketbooks,",
+        },
        {
          name: "build-info",
          description: "Show build information of this binary",
@@ -1,2 +1,15 @@
 ```sh
+Import a pre-generated credential
+
+Usage: nym-socks5-client import-credential --id <ID> <--credential-data <CREDENTIAL_DATA>|--credential-path <CREDENTIAL_PATH>>
+
+Options:
+      --id <ID>
+          Id of client that is going to import the credential
+      --credential-data <CREDENTIAL_DATA>
+          Explicitly provide the encoded credential data (as base58)
+      --credential-path <CREDENTIAL_PATH>
+          Specifies the path to file containing binary credential data
+  -h, --help
+          Print help
 ```
@@ -1,10 +1,10 @@
 ```sh

 Binary Name:        nymvisor
-Build Timestamp:    2024-10-29T09:48:31.988049207Z
-Build Version:      0.1.8
-Commit SHA:         299552881810511273af13eb135297a4cf7a38de
-Commit Date:        2024-10-29T10:48:07.000000000+01:00
+Build Timestamp:    2024-10-23T14:56:21.738216843Z
+Build Version:      0.1.5
+Commit SHA:         7bfd7efe844be83cf5637cad11cf7cd44411026a
+Commit Date:        2024-10-23T16:53:29.000000000+02:00
 Commit Branch:      max/new-docs-framework
 rustc Version:      1.80.0
 rustc Channel:      stable
@@ -1,9 +0,0 @@
-
-import TimeNow from 'components/outputs/api-scraping-outputs/time-now.md';
-import { Callout } from 'nextra/components';
-
-<Callout type="info" emoji="ℹ️">
-<strong>
-The data on this page were last time updated on <span style={{display: 'inline-block'}}><TimeNow /></span>.
-</strong>
-</Callout>
@@ -1,6 +0,0 @@
-import { Callout } from 'nextra/components'
-
-<Callout type="info" emoji="ℹ️">
-Our documentation often refer to syntax annotated in `<>` brackets. We use this expression for variables that are unique to each user (like path, local moniker, versions etcetra).
-Any syntax in `<>` brackets needs to be substituted with your correct name or version, without the `<>` brackets. If you are unsure, please check our table of essential [parameters and variables](https://nymtech.net/docs/operators/variables.html).
-</Callout>
@@ -1,12 +0,0 @@
-
-import { Callout } from 'nextra/components';
-import TimeOutput from 'components/snippets-general/time-now.mdx';
-
-export const TimeNow = () => {
-
-return (
-<div>
-  <TimeOutput />
-</div>
-  )
-}
@@ -1,10 +0,0 @@
-import VariableInfo from './snippets-general/varible-info-snippet.mdx';
-
-export const VarInfo = () => {
-
-return (
-<div>
-  <VariableInfo/ >
-</div>
-  )
-}
@@ -39,14 +39,14 @@ nextra.webpack = (config, options) => {

 const config = {
  ...nextra,
-  basePath: "/docs",
+  // output: 'export', // static HTML files, has problems with Vercel
+  // rewrites: undefined,
  async redirects() {
    return [
      // network docs
      {
-        source: "/",
-        destination: "/docs",
-        basePath: false,
+        source: "/docs",
+        destination: "/",
        permanent: true,
      },
      {
@@ -481,7 +481,6 @@ const config = {
        destination: "/:path*",
        permanent: false,
      },
-
      // TODO these need to go in the config of the existing deployed ts sdk docs to redirect from there
      //      these assume source basePath = sdk.nymtech.net
      // {
@@ -1,13 +1,13 @@
 {
  "name": "Nym Docs",
-  "version": "2.0",
-  "description": "Nym documentation for developers and node operators",
+  "version": "1.5-rc.0",
+  "description": "Nym Docs",
  "license": "Apache-2.0",
  "author": "Nym Technologies SA",
  "scripts": {
    "generate:commands": "../scripts/next-scripts/autodoc.sh",
    "generate:tables": "../scripts/next-scripts/python-prebuild.sh",
-    "predev": "../scripts/next-scripts/python-prebuild.sh",
+    "predev": "../scripts/prebuild.sh",
    "build": "next build",
    "dev": " next dev",
    "lint": "next lint",
@@ -39,7 +39,6 @@
    "@nymproject/contract-clients": ">=1.2.4-rc.2 || ^1",
    "@nymproject/mix-fetch-full-fat": ">=1.2.4-rc.2 || ^1",
    "@nymproject/sdk-full-fat": ">=1.2.4-rc.2 || ^1",
-    "@types/mdx": "^2.0.13",
    "chain-registry": "^1.19.0",
    "cosmjs-types": "^0.9.0",
    "lucide-react": "^0.438.0",
@@ -9,10 +9,11 @@ Usage: nym-socks5-client [OPTIONS] <COMMAND>
 Commands:
  init               Initialise a Nym client. Do this first!
  run                Run the Nym client with provided configuration client optionally overriding set parameters
-  ecash              Ecash-related functionalities
+  import-credential  Import a pre-generated credential
  list-gateways      List all registered with gateways
  add-gateway        Add new gateway to this client
  switch-gateway     Change the currently active gateway. Note that you must have already registered with the new gateway!
+  show-ticketbooks   Display information associated with the imported ticketbooks,
  build-info         Show build information of this binary
  completions        Generate shell completions
  generate-fig-spec  Generate Fig specification
@@ -108,6 +109,21 @@ Options:
 ```

 ### `import-credential`
+```sh
+Import a pre-generated credential
+
+Usage: nym-socks5-client import-credential --id <ID> <--credential-data <CREDENTIAL_DATA>|--credential-path <CREDENTIAL_PATH>>
+
+Options:
+      --id <ID>
+          Id of client that is going to import the credential
+      --credential-data <CREDENTIAL_DATA>
+          Explicitly provide the encoded credential data (as base58)
+      --credential-path <CREDENTIAL_PATH>
+          Specifies the path to file containing binary credential data
+  -h, --help
+          Print help
+```

 ### `list-gateways`
 ```sh
@@ -152,10 +168,10 @@ Example output:
 ```sh

 Binary Name:        nym-socks5-client
-Build Timestamp:    2024-10-29T09:48:31.988049207Z
-Build Version:      1.1.42
-Commit SHA:         299552881810511273af13eb135297a4cf7a38de
-Commit Date:        2024-10-29T10:48:07.000000000+01:00
+Build Timestamp:    2024-10-23T14:56:21.738216843Z
+Build Version:      1.1.39
+Commit SHA:         7bfd7efe844be83cf5637cad11cf7cd44411026a
+Commit Date:        2024-10-23T16:53:29.000000000+02:00
 Commit Branch:      max/new-docs-framework
 rustc Version:      1.80.0
 rustc Channel:      stable
@@ -469,290 +485,45 @@ const completion: Fig.Spec = {
      ],
    },
    {
-      name: "ecash",
-      description: "Ecash-related functionalities",
-      subcommands: [
-        {
-          name: "show-ticket-books",
-          description: "Display information associated with the imported ticketbooks,",
-          options: [
-            {
-              name: "--id",
-              description: "Id of client that is going to display the ticketbook information",
-              isRepeatable: true,
-              args: {
-                name: "id",
-              },
-            },
-            {
-              name: ["-o", "--output"],
-              isRepeatable: true,
-              args: {
-                name: "output",
-                isOptional: true,
-                suggestions: [
-                  "text",
-                  "json",
-                ],
-              },
-            },
-            {
-              name: ["-h", "--help"],
-              description: "Print help",
-            },
-          ],
-        },
-        {
-          name: "import-ticket-book",
-          description: "Import a pre-generated ticketbook",
-          options: [
-            {
-              name: "--id",
-              description: "Id of client that is going to import the credential",
-              isRepeatable: true,
-              args: {
-                name: "id",
-              },
-            },
-            {
-              name: "--credential-data",
-              description: "Explicitly provide the encoded credential data (as base58)",
-              isRepeatable: true,
-              args: {
-                name: "credential_data",
-                isOptional: true,
-              },
-            },
-            {
-              name: "--credential-path",
-              description: "Specifies the path to file containing binary credential data",
-              isRepeatable: true,
-              args: {
-                name: "credential_path",
-                isOptional: true,
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--version",
-              hidden: true,
-              isRepeatable: true,
-              args: {
-                name: "version",
-                isOptional: true,
-              },
-            },
-            {
-              name: "--standalone",
-              description: "Specifies whether we're attempting to import a standalone ticketbook (i.e. serialised `IssuedTicketBook`)",
-            },
-            {
-              name: "--full",
-              description: "Specifies whether we're attempting to import full ticketboot (i.e. one that **might** contain required global signatures; that is serialised `ImportableTicketBook`)",
-            },
-            {
-              name: ["-h", "--help"],
-              description: "Print help",
-            },
-          ],
-        },
-        {
-          name: "import-coin-index-signatures",
-          description: "Import coin index signatures needed for ticketbooks",
-          options: [
-            {
-              name: "--id",
-              description: "Id of client that is going to import the signatures",
-              isRepeatable: true,
-              args: {
-                name: "id",
-              },
-            },
-            {
-              name: "--client-config",
-              description: "Config file of the client that is supposed to use the signatures",
-              isRepeatable: true,
-              args: {
-                name: "client_config",
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--signatures-data",
-              description: "Explicitly provide the encoded signatures data (as base58)",
-              isRepeatable: true,
-              args: {
-                name: "signatures_data",
-                isOptional: true,
-              },
-            },
-            {
-              name: "--signatures-path",
-              description: "Specifies the path to file containing binary signatures data",
-              isRepeatable: true,
-              args: {
-                name: "signatures_path",
-                isOptional: true,
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--version",
-              hidden: true,
-              isRepeatable: true,
-              args: {
-                name: "version",
-                isOptional: true,
-              },
-            },
-            {
-              name: ["-h", "--help"],
-              description: "Print help",
-            },
-          ],
-        },
-        {
-          name: "import-expiration-date-signatures",
-          description: "Import expiration date signatures needed for ticketbooks",
-          options: [
-            {
-              name: "--id",
-              description: "Id of client that is going to import the signatures",
-              isRepeatable: true,
-              args: {
-                name: "id",
-              },
-            },
-            {
-              name: "--client-config",
-              description: "Config file of the client that is supposed to use the signatures",
-              isRepeatable: true,
-              args: {
-                name: "client_config",
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--signatures-data",
-              description: "Explicitly provide the encoded signatures data (as base58)",
-              isRepeatable: true,
-              args: {
-                name: "signatures_data",
-                isOptional: true,
-              },
-            },
-            {
-              name: "--signatures-path",
-              description: "Specifies the path to file containing binary signatures data",
-              isRepeatable: true,
-              args: {
-                name: "signatures_path",
-                isOptional: true,
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--version",
-              hidden: true,
-              isRepeatable: true,
-              args: {
-                name: "version",
-                isOptional: true,
-              },
-            },
-            {
-              name: ["-h", "--help"],
-              description: "Print help",
-            },
-          ],
-        },
-        {
-          name: "import-master-verification-key",
-          description: "Import master verification key needed for ticketbooks",
-          options: [
-            {
-              name: "--id",
-              description: "Id of client that is going to import the key",
-              isRepeatable: true,
-              args: {
-                name: "id",
-              },
-            },
-            {
-              name: "--client-config",
-              description: "Config file of the client that is supposed to use the key",
-              isRepeatable: true,
-              args: {
-                name: "client_config",
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--key-data",
-              description: "Explicitly provide the encoded key data (as base58)",
-              isRepeatable: true,
-              args: {
-                name: "key_data",
-                isOptional: true,
-              },
-            },
-            {
-              name: "--key-path",
-              description: "Specifies the path to file containing binary key data",
-              isRepeatable: true,
-              args: {
-                name: "key_path",
-                isOptional: true,
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--version",
-              hidden: true,
-              isRepeatable: true,
-              args: {
-                name: "version",
-                isOptional: true,
-              },
-            },
-            {
-              name: ["-h", "--help"],
-              description: "Print help",
-            },
-          ],
-        },
-        {
-          name: "help",
-          description: "Print this message or the help of the given subcommand(s)",
-          subcommands: [
-            {
-              name: "show-ticket-books",
-              description: "Display information associated with the imported ticketbooks,",
-            },
-            {
-              name: "import-ticket-book",
-              description: "Import a pre-generated ticketbook",
-            },
-            {
-              name: "import-coin-index-signatures",
-              description: "Import coin index signatures needed for ticketbooks",
-            },
-            {
-              name: "import-expiration-date-signatures",
-              description: "Import expiration date signatures needed for ticketbooks",
-            },
-            {
-              name: "import-master-verification-key",
-              description: "Import master verification key needed for ticketbooks",
-            },
-            {
-              name: "help",
-              description: "Print this message or the help of the given subcommand(s)",
-            },
-          ],
-        },
-      ],
+      name: "import-credential",
+      description: "Import a pre-generated credential",
      options: [
+        {
+          name: "--id",
+          description: "Id of client that is going to import the credential",
+          isRepeatable: true,
+          args: {
+            name: "id",
+          },
+        },
+        {
+          name: "--credential-data",
+          description: "Explicitly provide the encoded credential data (as base58)",
+          isRepeatable: true,
+          args: {
+            name: "credential_data",
+            isOptional: true,
+          },
+        },
+        {
+          name: "--credential-path",
+          description: "Specifies the path to file containing binary credential data",
+          isRepeatable: true,
+          args: {
+            name: "credential_path",
+            isOptional: true,
+            template: "filepaths",
+          },
+        },
+        {
+          name: "--version",
+          hidden: true,
+          isRepeatable: true,
+          args: {
+            name: "version",
+            isOptional: true,
+          },
+        },
        {
          name: ["-h", "--help"],
          description: "Print help",
@@ -889,6 +660,36 @@ const completion: Fig.Spec = {
        },
      ],
    },
+    {
+      name: "show-ticketbooks",
+      description: "Display information associated with the imported ticketbooks,",
+      options: [
+        {
+          name: "--id",
+          description: "Id of client that is going to display the ticketbook information",
+          isRepeatable: true,
+          args: {
+            name: "id",
+          },
+        },
+        {
+          name: ["-o", "--output"],
+          isRepeatable: true,
+          args: {
+            name: "output",
+            isOptional: true,
+            suggestions: [
+              "text",
+              "json",
+            ],
+          },
+        },
+        {
+          name: ["-h", "--help"],
+          description: "Print help",
+        },
+      ],
+    },
    {
      name: "build-info",
      description: "Show build information of this binary",
@@ -954,30 +755,8 @@ const completion: Fig.Spec = {
          description: "Run the Nym client with provided configuration client optionally overriding set parameters",
        },
        {
-          name: "ecash",
-          description: "Ecash-related functionalities",
-          subcommands: [
-            {
-              name: "show-ticket-books",
-              description: "Display information associated with the imported ticketbooks,",
-            },
-            {
-              name: "import-ticket-book",
-              description: "Import a pre-generated ticketbook",
-            },
-            {
-              name: "import-coin-index-signatures",
-              description: "Import coin index signatures needed for ticketbooks",
-            },
-            {
-              name: "import-expiration-date-signatures",
-              description: "Import expiration date signatures needed for ticketbooks",
-            },
-            {
-              name: "import-master-verification-key",
-              description: "Import master verification key needed for ticketbooks",
-            },
-          ],
+          name: "import-credential",
+          description: "Import a pre-generated credential",
        },
        {
          name: "list-gateways",
@@ -991,6 +770,10 @@ const completion: Fig.Spec = {
          name: "switch-gateway",
          description: "Change the currently active gateway. Note that you must have already registered with the new gateway!",
        },
+        {
+          name: "show-ticketbooks",
+          description: "Display information associated with the imported ticketbooks,",
+        },
        {
          name: "build-info",
          description: "Show build information of this binary",
@@ -9,10 +9,11 @@ Usage: nym-client [OPTIONS] <COMMAND>
 Commands:
  init               Initialise a Nym client. Do this first!
  run                Run the Nym client with provided configuration client optionally overriding set parameters
-  ecash              Ecash-related functionalities
+  import-credential  Import a pre-generated credential
  list-gateways      List all registered with gateways
  add-gateway        Add new gateway to this client
  switch-gateway     Change the currently active gateway. Note that you must have already registered with the new gateway!
+  show-ticketbooks   Display information associated with the imported ticketbooks,
  build-info         Show build information of this binary
  completions        Generate shell completions
  generate-fig-spec  Generate Fig specification
@@ -78,6 +79,21 @@ Options:
 ```

 ### `import-credential`
+```sh
+Import a pre-generated credential
+
+Usage: nym-client import-credential --id <ID> <--credential-data <CREDENTIAL_DATA>|--credential-path <CREDENTIAL_PATH>>
+
+Options:
+      --id <ID>
+          Id of client that is going to import the credential
+      --credential-data <CREDENTIAL_DATA>
+          Explicitly provide the encoded credential data (as base58)
+      --credential-path <CREDENTIAL_PATH>
+          Specifies the path to file containing binary credential data
+  -h, --help
+          Print help
+```

 ### `list-gateways`
 ```sh
@@ -117,10 +133,10 @@ Example output:
 ```sh

 Binary Name:        nym-client
-Build Timestamp:    2024-10-29T09:48:31.988049207Z
-Build Version:      1.1.42
-Commit SHA:         299552881810511273af13eb135297a4cf7a38de
-Commit Date:        2024-10-29T10:48:07.000000000+01:00
+Build Timestamp:    2024-10-23T14:56:21.738216843Z
+Build Version:      1.1.39
+Commit SHA:         7bfd7efe844be83cf5637cad11cf7cd44411026a
+Commit Date:        2024-10-23T16:53:29.000000000+02:00
 Commit Branch:      max/new-docs-framework
 rustc Version:      1.80.0
 rustc Channel:      stable
@@ -400,290 +416,45 @@ const completion: Fig.Spec = {
      ],
    },
    {
-      name: "ecash",
-      description: "Ecash-related functionalities",
-      subcommands: [
-        {
-          name: "show-ticket-books",
-          description: "Display information associated with the imported ticketbooks,",
-          options: [
-            {
-              name: "--id",
-              description: "Id of client that is going to display the ticketbook information",
-              isRepeatable: true,
-              args: {
-                name: "id",
-              },
-            },
-            {
-              name: ["-o", "--output"],
-              isRepeatable: true,
-              args: {
-                name: "output",
-                isOptional: true,
-                suggestions: [
-                  "text",
-                  "json",
-                ],
-              },
-            },
-            {
-              name: ["-h", "--help"],
-              description: "Print help",
-            },
-          ],
-        },
-        {
-          name: "import-ticket-book",
-          description: "Import a pre-generated ticketbook",
-          options: [
-            {
-              name: "--id",
-              description: "Id of client that is going to import the credential",
-              isRepeatable: true,
-              args: {
-                name: "id",
-              },
-            },
-            {
-              name: "--credential-data",
-              description: "Explicitly provide the encoded credential data (as base58)",
-              isRepeatable: true,
-              args: {
-                name: "credential_data",
-                isOptional: true,
-              },
-            },
-            {
-              name: "--credential-path",
-              description: "Specifies the path to file containing binary credential data",
-              isRepeatable: true,
-              args: {
-                name: "credential_path",
-                isOptional: true,
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--version",
-              hidden: true,
-              isRepeatable: true,
-              args: {
-                name: "version",
-                isOptional: true,
-              },
-            },
-            {
-              name: "--standalone",
-              description: "Specifies whether we're attempting to import a standalone ticketbook (i.e. serialised `IssuedTicketBook`)",
-            },
-            {
-              name: "--full",
-              description: "Specifies whether we're attempting to import full ticketboot (i.e. one that **might** contain required global signatures; that is serialised `ImportableTicketBook`)",
-            },
-            {
-              name: ["-h", "--help"],
-              description: "Print help",
-            },
-          ],
-        },
-        {
-          name: "import-coin-index-signatures",
-          description: "Import coin index signatures needed for ticketbooks",
-          options: [
-            {
-              name: "--id",
-              description: "Id of client that is going to import the signatures",
-              isRepeatable: true,
-              args: {
-                name: "id",
-              },
-            },
-            {
-              name: "--client-config",
-              description: "Config file of the client that is supposed to use the signatures",
-              isRepeatable: true,
-              args: {
-                name: "client_config",
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--signatures-data",
-              description: "Explicitly provide the encoded signatures data (as base58)",
-              isRepeatable: true,
-              args: {
-                name: "signatures_data",
-                isOptional: true,
-              },
-            },
-            {
-              name: "--signatures-path",
-              description: "Specifies the path to file containing binary signatures data",
-              isRepeatable: true,
-              args: {
-                name: "signatures_path",
-                isOptional: true,
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--version",
-              hidden: true,
-              isRepeatable: true,
-              args: {
-                name: "version",
-                isOptional: true,
-              },
-            },
-            {
-              name: ["-h", "--help"],
-              description: "Print help",
-            },
-          ],
-        },
-        {
-          name: "import-expiration-date-signatures",
-          description: "Import expiration date signatures needed for ticketbooks",
-          options: [
-            {
-              name: "--id",
-              description: "Id of client that is going to import the signatures",
-              isRepeatable: true,
-              args: {
-                name: "id",
-              },
-            },
-            {
-              name: "--client-config",
-              description: "Config file of the client that is supposed to use the signatures",
-              isRepeatable: true,
-              args: {
-                name: "client_config",
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--signatures-data",
-              description: "Explicitly provide the encoded signatures data (as base58)",
-              isRepeatable: true,
-              args: {
-                name: "signatures_data",
-                isOptional: true,
-              },
-            },
-            {
-              name: "--signatures-path",
-              description: "Specifies the path to file containing binary signatures data",
-              isRepeatable: true,
-              args: {
-                name: "signatures_path",
-                isOptional: true,
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--version",
-              hidden: true,
-              isRepeatable: true,
-              args: {
-                name: "version",
-                isOptional: true,
-              },
-            },
-            {
-              name: ["-h", "--help"],
-              description: "Print help",
-            },
-          ],
-        },
-        {
-          name: "import-master-verification-key",
-          description: "Import master verification key needed for ticketbooks",
-          options: [
-            {
-              name: "--id",
-              description: "Id of client that is going to import the key",
-              isRepeatable: true,
-              args: {
-                name: "id",
-              },
-            },
-            {
-              name: "--client-config",
-              description: "Config file of the client that is supposed to use the key",
-              isRepeatable: true,
-              args: {
-                name: "client_config",
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--key-data",
-              description: "Explicitly provide the encoded key data (as base58)",
-              isRepeatable: true,
-              args: {
-                name: "key_data",
-                isOptional: true,
-              },
-            },
-            {
-              name: "--key-path",
-              description: "Specifies the path to file containing binary key data",
-              isRepeatable: true,
-              args: {
-                name: "key_path",
-                isOptional: true,
-                template: "filepaths",
-              },
-            },
-            {
-              name: "--version",
-              hidden: true,
-              isRepeatable: true,
-              args: {
-                name: "version",
-                isOptional: true,
-              },
-            },
-            {
-              name: ["-h", "--help"],
-              description: "Print help",
-            },
-          ],
-        },
-        {
-          name: "help",
-          description: "Print this message or the help of the given subcommand(s)",
-          subcommands: [
-            {
-              name: "show-ticket-books",
-              description: "Display information associated with the imported ticketbooks,",
-            },
-            {
-              name: "import-ticket-book",
-              description: "Import a pre-generated ticketbook",
-            },
-            {
-              name: "import-coin-index-signatures",
-              description: "Import coin index signatures needed for ticketbooks",
-            },
-            {
-              name: "import-expiration-date-signatures",
-              description: "Import expiration date signatures needed for ticketbooks",
-            },
-            {
-              name: "import-master-verification-key",
-              description: "Import master verification key needed for ticketbooks",
-            },
-            {
-              name: "help",
-              description: "Print this message or the help of the given subcommand(s)",
-            },
-          ],
-        },
-      ],
+      name: "import-credential",
+      description: "Import a pre-generated credential",
      options: [
+        {
+          name: "--id",
+          description: "Id of client that is going to import the credential",
+          isRepeatable: true,
+          args: {
+            name: "id",
+          },
+        },
+        {
+          name: "--credential-data",
+          description: "Explicitly provide the encoded credential data (as base58)",
+          isRepeatable: true,
+          args: {
+            name: "credential_data",
+            isOptional: true,
+          },
+        },
+        {
+          name: "--credential-path",
+          description: "Specifies the path to file containing binary credential data",
+          isRepeatable: true,
+          args: {
+            name: "credential_path",
+            isOptional: true,
+            template: "filepaths",
+          },
+        },
+        {
+          name: "--version",
+          hidden: true,
+          isRepeatable: true,
+          args: {
+            name: "version",
+            isOptional: true,
+          },
+        },
        {
          name: ["-h", "--help"],
          description: "Print help",
@@ -820,6 +591,36 @@ const completion: Fig.Spec = {
        },
      ],
    },
+    {
+      name: "show-ticketbooks",
+      description: "Display information associated with the imported ticketbooks,",
+      options: [
+        {
+          name: "--id",
+          description: "Id of client that is going to display the ticketbook information",
+          isRepeatable: true,
+          args: {
+            name: "id",
+          },
+        },
+        {
+          name: ["-o", "--output"],
+          isRepeatable: true,
+          args: {
+            name: "output",
+            isOptional: true,
+            suggestions: [
+              "text",
+              "json",
+            ],
+          },
+        },
+        {
+          name: ["-h", "--help"],
+          description: "Print help",
+        },
+      ],
+    },
    {
      name: "build-info",
      description: "Show build information of this binary",
@@ -885,30 +686,8 @@ const completion: Fig.Spec = {
          description: "Run the Nym client with provided configuration client optionally overriding set parameters",
        },
        {
-          name: "ecash",
-          description: "Ecash-related functionalities",
-          subcommands: [
-            {
-              name: "show-ticket-books",
-              description: "Display information associated with the imported ticketbooks,",
-            },
-            {
-              name: "import-ticket-book",
-              description: "Import a pre-generated ticketbook",
-            },
-            {
-              name: "import-coin-index-signatures",
-              description: "Import coin index signatures needed for ticketbooks",
-            },
-            {
-              name: "import-expiration-date-signatures",
-              description: "Import expiration date signatures needed for ticketbooks",
-            },
-            {
-              name: "import-master-verification-key",
-              description: "Import master verification key needed for ticketbooks",
-            },
-          ],
+          name: "import-credential",
+          description: "Import a pre-generated credential",
        },
        {
          name: "list-gateways",
@@ -922,6 +701,10 @@ const completion: Fig.Spec = {
          name: "switch-gateway",
          description: "Change the currently active gateway. Note that you must have already registered with the new gateway!",
        },
+        {
+          name: "show-ticketbooks",
+          description: "Display information associated with the imported ticketbooks,",
+        },
        {
          name: "build-info",
          description: "Show build information of this binary",
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
mfahampshire	b89c3f4281	moved prebuild to its own script	2024-10-28 14:54:52 +01:00
mfahampshire	5f97baa936	destructive commit to test something on ci	2024-10-28 14:52:16 +01:00