Switch to new arc runner Ubuntu 20.04

[DOCs:/dev-portal]: Add NymVPN hyper-link (#4842 )
Use ecash credential type for bandwidth value (#4840 )
2024-09-06 12:33:14 +02:00 · 2024-09-06 10:03:54 +00:00 · 2024-09-05 13:19:19 +02:00 · 2024-09-03 21:48:17 +02:00 · 2024-09-03 21:33:42 +02:00 · 2024-09-03 12:34:31 +02:00
179 changed files with 5630 additions and 1779 deletions
@@ -14,3 +14,20 @@ updates:
        prefix: build
        prefix-development: chore
        include: scope
+  # Update the root workspace (only). For now we don't include
+  # the contracts workspcae.
+  - package-ecosystem: cargo
+    directory: /
+    schedule:
+      interval: weekly
+      time: "09:00"
+    ignore:
+      - dependency-name: "cosmwasm-*"
+      - dependency-name: "cw*"
+    groups:
+      patch-updates:
+        patterns:
+          - "*"
+        update-types:
+          - "patch"
+    open-pull-requests-limit: 10
@@ -0,0 +1,9 @@
+name: build-deb-meta
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    steps:
+      run: "echo hello"
@@ -7,7 +7,7 @@ jobs:
  build:
    runs-on: ubuntu-20.04-16-core
    steps:
-      - uses: actions/checkout@v3
+      - 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
@@ -17,7 +17,7 @@ jobs:
      - name: Install rsync
        run: sudo apt-get install rsync
      - uses: rlespinasse/github-slug-action@v3.x
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
        with:
          node-version: 18
      - name: Install Rust stable
@@ -35,7 +35,7 @@ jobs:

    runs-on: ${{ matrix.platform }}
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Install Dependencies (Linux)
        run: sudo apt-get update && sudo apt-get -y install jq vim libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools
@@ -10,12 +10,12 @@ jobs:
  build:
    runs-on: ubuntu-20.04-16-core
    steps:
-    - uses: actions/checkout@v2
+    - 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@v3
+    - uses: actions/setup-node@v4
      with:
        node-version: 18
    - name: Setup yarn
@@ -43,7 +43,7 @@ jobs:
    env:
      CARGO_TERM_COLOR: always
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Prepare build output directory
        shell: bash
@@ -91,7 +91,7 @@ jobs:

      - name: Upload Artifact
        if: github.event_name == 'workflow_dispatch'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: nym-binaries-artifacts
          path: |
@@ -42,7 +42,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [custom-linux, custom-runner-mac-m1]
+        os: [arc-ubuntu-20.04, custom-runner-mac-m1]
    runs-on: ${{ matrix.os }}
    env:
      CARGO_TERM_COLOR: always
@@ -50,10 +50,10 @@ jobs:
      - name: Install Dependencies (Linux)
        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools protobuf-compiler
        continue-on-error: true
-        if: matrix.os == 'custom-linux'
+        if: matrix.os == 'arc-ubuntu-20.04'

      - name: Check out repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4

      - name: Install rust toolchain
        uses: actions-rs/toolchain@v1
@@ -76,29 +76,37 @@ jobs:
          # Enable wireguard by default on linux only
          args: --workspace --features wireguard

+      # while disabled by default, this build ensures nothing is broken within
+      # `axum` feature
+      - name: Build with `axum` feature
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --features axum
+
      - name: Build all examples
-        if: matrix.os == 'custom-linux'
+        if: matrix.os == 'arc-ubuntu-20.04'
        uses: actions-rs/cargo@v1
        with:
          command: build
          args: --workspace --examples --features wireguard

      - name: Run all tests
-        if: matrix.os == 'custom-linux'
+        if: matrix.os == 'arc-ubuntu-20.04'
        uses: actions-rs/cargo@v1
        with:
          command: test
          args: --workspace --features wireguard

      - name: Run expensive tests
-        if: (github.ref == 'refs/heads/develop' || github.event.pull_request.base.ref == 'develop' || github.event.pull_request.base.ref == 'master') && matrix.os == 'custom-linux'
+        if: (github.ref == 'refs/heads/develop' || github.event.pull_request.base.ref == 'develop' || github.event.pull_request.base.ref == 'master') && matrix.os == 'arc-ubuntu-20.04'
        uses: actions-rs/cargo@v1
        with:
          command: test
          args: --workspace --features wireguard -- --ignored

      - name: Annotate with clippy checks
-        if: matrix.os == 'custom-linux'
+        if: matrix.os == 'arc-ubuntu-20.04'
        uses: actions-rs/clippy-check@v1
        continue-on-error: true
        with:
@@ -109,4 +117,4 @@ jobs:
        uses: actions-rs/cargo@v1
        with:
          command: clippy
-          args: --workspace --all-targets --features wireguard -- -D warnings
+          args: --workspace --all-targets --features wireguard,axum -- -D warnings
@@ -13,7 +13,7 @@ jobs:
          - licenses bans sources

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - uses: EmbarkStudios/cargo-deny-action@v1
      with:
        log-level: warn
@@ -15,7 +15,7 @@ jobs:
      CARGO_TERM_COLOR: always
    steps:
      - name: Check out repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4

      - name: Install Rust toolchain
        uses: actions-rs/toolchain@v1
@@ -21,7 +21,7 @@ jobs:
    env:
      CARGO_TERM_COLOR: always
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Prepare build output directory
        shell: bash
@@ -17,7 +17,7 @@ jobs:
      matrix: ${{ steps.set-matrix.outputs.matrix }}
    steps:
      # creates the matrix strategy from ci-contracts-matrix-includes.json
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - id: set-matrix
        uses: JoshuaTheMiller/conditional-build-matrix@main
        with:
@@ -34,7 +34,7 @@ jobs:
      fail-fast: false
      matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}}
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4

      - name: Setup rust
        uses: actions-rs/toolchain@v1
@@ -11,7 +11,7 @@ jobs:
  build:
    runs-on: ubuntu-20.04-16-core
    steps:
-      - uses: actions/checkout@v3
+      - 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
@@ -21,7 +21,7 @@ jobs:
      - name: Install rsync
        run: sudo apt-get install rsync
      - uses: rlespinasse/github-slug-action@v3.x
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
        with:
          node-version: 18
      - name: Install Rust stable
@@ -15,10 +15,10 @@ jobs:
  build:
    runs-on: ubuntu-20.04-16-core
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - uses: rlespinasse/github-slug-action@v3.x

-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
        with:
          node-version: 18
      - name: Setup yarn
@@ -38,7 +38,7 @@ jobs:
          version: '116'

      - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
        with:
          go-version: '1.20'

@@ -15,7 +15,7 @@ jobs:
    name: nym-api tests
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4

      - name: install yarn in root
        run: cd ../.. && yarn install
@@ -24,7 +24,7 @@ jobs:
        run: npm install

      - name: Node v18
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: 18.1.0

@@ -14,12 +14,12 @@ jobs:
  build:
    runs-on: custom-linux
    steps:
-    - uses: actions/checkout@v2
+    - 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@v3
+    - uses: actions/setup-node@v4
      with:
        node-version: 18
    - name: Setup yarn
@@ -25,7 +25,7 @@ jobs:
        continue-on-error: true

      - name: Check out repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4

      - name: Install rust toolchain
        uses: actions-rs/toolchain@v1
@@ -9,7 +9,7 @@ jobs:
  build:
    runs-on: custom-linux
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4

    - name: Install rsync
      run: sudo apt-get install rsync
@@ -17,7 +17,7 @@ jobs:

    - uses: rlespinasse/github-slug-action@v3.x

-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
      with:
        node-version: 18

@@ -10,12 +10,12 @@ jobs:
  build:
    runs-on: custom-linux
    steps:
-      - uses: actions/checkout@v2
+      - 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@v3
+      - uses: actions/setup-node@v4
        with:
          node-version: 18.17
      - name: Install Rust stable
@@ -26,7 +26,7 @@ jobs:
        run: npm install -g yarn

      - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
        with:
          go-version: '1.20'

@@ -13,9 +13,9 @@ jobs:
    env:
      CARGO_TERM_COLOR: always
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4

-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
        with:
          node-version: 18

@@ -28,7 +28,7 @@ jobs:
          components: rustfmt, clippy

      - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
        with:
          go-version: '1.20'

@@ -30,14 +30,14 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: Setup Pages
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v5
      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v2
+        uses: actions/upload-pages-artifact@v3
        with:
          # Upload entire repository
          path: './ppa'
      - name: Deploy to GitHub Pages
        id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4
@@ -18,7 +18,7 @@ jobs:
    continue-on-error: true
    steps:
      - name: Check out repository code
-        uses: actions/checkout@v3
+        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
@@ -33,7 +33,7 @@ jobs:
          components: rustfmt, clippy

      - name: Install Protoc
-        uses: arduino/setup-protoc@v2
+        uses: arduino/setup-protoc@v3
        if: matrix.os == 'macos-latest' || matrix.os == 'windows-latest'
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -98,11 +98,11 @@ jobs:
    runs-on: custom-linux
    steps:
      - name: Collect jobs status
-        uses: technote-space/workflow-conclusion-action@v2
+        uses: technote-space/workflow-conclusion-action@v3
      - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: install npm
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        if: env.WORKFLOW_CONCLUSION == 'failure'
        with:
          node-version: 18
@@ -15,7 +15,7 @@ jobs:
      output1: ${{ steps.step2.outputs.latest_release }}
    steps:
      - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Set output variable to latest release branch
@@ -28,7 +28,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Setup git user
@@ -47,7 +47,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Setup git user
@@ -18,7 +18,7 @@ jobs:
    continue-on-error: true
    steps:
      - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Install Dependencies (Linux)
        run: sudo apt-get update && sudo apt-get install -y libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools
@@ -61,11 +61,11 @@ jobs:
    runs-on: custom-linux
    steps:
      - name: Collect jobs status
-        uses: technote-space/workflow-conclusion-action@v2
+        uses: technote-space/workflow-conclusion-action@v3
      - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: install npm
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        if: env.WORKFLOW_CONCLUSION == 'failure'
        with:
          node-version: 18
@@ -8,7 +8,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - name: Checkout repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
      - name: Install rust toolchain
        uses: actions-rs/toolchain@v1
        with:
@@ -20,7 +20,7 @@ jobs:
          find . -name Cargo.toml -exec cargo deny --manifest-path {} check \
            advisories -A advisory-not-detected  --hide-inclusion-graph \; &> \
            >(uniq  &> .github/workflows/support-files/notifications/deny.message )
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        with:
          name: report
          path: .github/workflows/support-files/notifications/deny.message
@@ -29,14 +29,14 @@ jobs:
    runs-on: custom-linux
    steps:
      - name: Check out repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
      - name: Download report from previous job
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
        with:
          name: report
          path: .github/workflows/support-files/notifications
      - name: install npm
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: 18
      - name: Matrix - Node Install
@@ -40,7 +40,7 @@ jobs:
      cli_version: ${{ steps.binary-versions.outputs.cli_version }}

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Install Dependencies (Linux)
        run: sudo apt-get update && sudo apt-get -y install ripgrep libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools
@@ -67,7 +67,7 @@ jobs:
          args: --workspace --release ${{ env.CARGO_FEATURES }}
  
      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: my-artifact
          path: |
@@ -83,7 +83,7 @@ jobs:

      - id: create-release
        name: Upload to release based on tag name
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
        if: github.event_name == 'release'
        with:
          files: |
@@ -9,7 +9,7 @@ jobs:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-contracts-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
    runs-on: [self-hosted, custom-ubuntu-20.04]
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4

      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
@@ -26,21 +26,21 @@ jobs:
        run: make contracts

      - name: Upload Mixnet Contract Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: mixnet_contract.wasm
          path: contracts/target/wasm32-unknown-unknown/release/mixnet_contract.wasm
          retention-days: 5

      - name: Upload Vesting Contract Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: vesting_contract.wasm
          path: contracts/target/wasm32-unknown-unknown/release/vesting_contract.wasm
          retention-days: 5

      - name: Upload to release based on tag name
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
        if: github.event_name == 'release'
        with:
          files: |
@@ -25,10 +25,10 @@ jobs:
      file_hash: ${{ steps.release-info.outputs.file_hash }}

    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4

      - name: Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: 18
      - name: Install Rust stable
@@ -83,7 +83,7 @@ jobs:
        run: yarn && yarn build

      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: nym-wallet.app.tar.gz
          path: nym-wallet/target/release/bundle/macos/nym-wallet.app.tar.gz
@@ -95,7 +95,7 @@ jobs:
          security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
      - id: create-release
        name: Upload to release based on tag name
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
        if: github.event_name == 'release'
        with:
          files: |
@@ -25,7 +25,7 @@ jobs:
      file_hash: ${{ steps.release-info.outputs.file_hash }}

    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4

      - name: Tauri dependencies
        run: >
@@ -34,7 +34,7 @@ jobs:
        continue-on-error: true

      - name: Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: 18

@@ -62,7 +62,7 @@ jobs:
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}

      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: nym-wallet_1.0.0_amd64.AppImage.tar.gz
          path: nym-wallet/target/release/bundle/appimage/nym-wallet*.AppImage.tar.gz
@@ -70,7 +70,7 @@ jobs:

      - id: create-release
        name: Upload to release based on tag name
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
        if: github.event_name == 'release'
        with:
          files: |
@@ -33,7 +33,7 @@ jobs:
          del /s /q /A:H nym
          rmdir /s /q nym

-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Import signing certificate
        env:
@@ -47,7 +47,7 @@ jobs:
          Import-PfxCertificate -FilePath certificate/certificate.pfx -CertStoreLocation Cert:\CurrentUser\My -Password (ConvertTo-SecureString -String $env:WINDOWS_CERTIFICATE_PASSWORD -Force -AsPlainText)

      - name: Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: 18

@@ -82,7 +82,7 @@ jobs:
        run: yarn build

      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: nym-wallet_1.0.0_x64_en-US.msi
          path: nym-wallet/target/release/bundle/msi/nym-wallet_1.*.msi
@@ -90,7 +90,7 @@ jobs:

      - id: create-release
        name: Upload to release based on tag name
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
        if: github.event_name == 'release'
        with:
          files: |
@@ -22,10 +22,10 @@ jobs:

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

      - name: Install Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
        with:
          distribution: "temurin"
          java-version: "17"
@@ -49,7 +49,7 @@ jobs:
            "build-tools;$SDK_BUILDTOOLS_VERSION"

      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@1.70.0
+        uses: dtolnay/rust-toolchain@1.90.0

      - name: Install rust android targets
        run: |
@@ -84,7 +84,7 @@ jobs:
            apk/nyms5-arch64-release.apk

      - name: Upload APKs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: nyms5-apk-arch64
          path: |
@@ -97,14 +97,14 @@ jobs:
    runs-on: custom-linux
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: Download binary artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
        with:
          name: nyms5-apk-arch64
          path: apk
      - name: Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
        with:
          files: |
            apk/nyms5-arch64-debug.apk
@@ -6,10 +6,10 @@ jobs:
  publish:
    runs-on: ubuntu-20.04-16-core
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4

      - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: 18
          registry-url: "https://registry.npmjs.org"
@@ -29,12 +29,12 @@ jobs:
        run: cargo install wasm-opt

      - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
        with:
          go-version: "1.20"

      - name: Install TinyGo
-        uses: acifani/setup-tinygo@v1
+        uses: acifani/setup-tinygo@v2
        with:
          tinygo-version: "0.27.0"

@@ -20,8 +20,8 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out repository code
-        uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+        uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
        with:
          node-version: 18
      - uses: nymtech/nym/.github/actions/nym-hash-releases@develop
@@ -30,7 +30,7 @@ jobs:
        with:
          release-tag-or-name-or-id: ${{ inputs.release_tag }}

-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
        with:
          name: Asset Hashes
          path: hashes.json
@@ -160,6 +160,7 @@ documentation = "https://nymtech.net"
 edition = "2021"
 license = "Apache-2.0"
 rust-version = "1.80"
+readme = "README.md"

 [workspace.dependencies]
 addr = "0.15.6"
@@ -167,10 +168,10 @@ aes = "0.8.1"
 aes-gcm = "0.10.1"
 anyhow = "1.0.71"
 argon2 = "0.5.0"
-async-trait = "0.1.68"
+async-trait = "0.1.81"
 axum = "0.7.5"
 axum-extra = "0.9.3"
-base64 = "0.21.4"
+base64 = "0.22.1"
 bincode = "1.3.3"
 bip39 = { version = "2.0.0", features = ["zeroize"] }

@@ -178,11 +179,11 @@ bip39 = { version = "2.0.0", features = ["zeroize"] }
 bit-vec = "0.7.0"
 bitvec = "1.0.0"

-blake3 = "1.3.1"
+blake3 = "1.5.4"
 bloomfilter = "1.0.14"
 bs58 = "0.5.1"
 bytecodec = "0.4.15"
-bytes = "1.5.0"
+bytes = "1.7.1"
 cargo_metadata = "0.18.1"
 celes = "2.4.0"
 cfg-if = "1.0.0"
@@ -190,11 +191,12 @@ chacha20 = "0.9.0"
 chacha20poly1305 = "0.10.1"
 chrono = "0.4.31"
 cipher = "0.4.3"
-clap = "4.4.7"
-clap_complete = "4.0"
-clap_complete_fig = "4.0"
+clap = "4.5.16"
+clap_complete = "4.5"
+clap_complete_fig = "4.5"
 colored = "2.0"
 comfy-table = "6.0.0"
+console = "0.15.8"
 console-subscriber = "0.1.1"
 console_error_panic_hook = "0.1"
 const-str = "0.5.6"
@@ -214,8 +216,8 @@ ecdsa = "0.16"
 ed25519-dalek = "2.1"
 etherparse = "0.13.0"
 eyre = "0.6.9"
-fastrand = "2.1.0"
-flate2 = "1.0.28"
+fastrand = "2.1.1"
+flate2 = "1.0.33"
 futures = "0.3.28"
 generic-array = "0.14.7"
 getrandom = "0.2.10"
@@ -231,9 +233,10 @@ httpcodec = "0.2.3"
 humantime = "2.1.0"
 humantime-serde = "1.1.1"
 hyper = "1.3.1"
+indicatif = "0.17.8"
 inquire = "0.6.2"
 ip_network = "0.4.1"
-ipnetwork = "0.16"
+ipnetwork = "0.20"
 isocountry = "0.3.2"
 itertools = "0.13.0"
 k256 = "0.13"
@@ -251,6 +254,7 @@ opentelemetry = "0.19.0"
 opentelemetry-jaeger = "0.18.0"
 parking_lot = "0.12.1"
 pem = "0.8"
+petgraph = "0.6.5"
 pin-project = "1.0"
 pretty_env_logger = "0.4.0"
 publicsuffix = "2.2.3"
@@ -264,23 +268,23 @@ rand_distr = "0.4"
 rand_pcg = "0.3.1"
 rand_seeder = "0.2.3"
 rayon = "1.5.1"
-regex = "1.8.4"
+regex = "1.10.6"
 reqwest = { version = "0.12.4", default-features = false }
 rocket = "0.5.0"
 rocket_cors = "0.6.0"
 rocket_okapi = "0.8.0"
-safer-ffi = "0.1.4"
+safer-ffi = "0.1.12"
 schemars = "0.8.1"
 semver = "1.0.23"
-serde = "1.0.152"
-serde_bytes = "0.11.6"
+serde = "1.0.209"
+serde_bytes = "0.11.15"
 serde_derive = "1.0"
-serde_json = "1.0.91"
+serde_json = "1.0.127"
 serde_repr = "0.1"
-serde_with = "3.4.0"
+serde_with = "3.9.0"
 serde_yaml = "0.9.25"
 sha2 = "0.10.8"
-si-scale = "0.2.2"
+si-scale = "0.2.3"
 sphinx-packet = "0.1.1"
 sqlx = "0.6.3"
 strum = "0.25"
@@ -290,7 +294,7 @@ sysinfo = "0.30.12"
 tap = "1.0.1"
 tar = "0.4.40"
 tempfile = "3.5.0"
-thiserror = "1.0.48"
+thiserror = "1.0.63"
 time = "0.3.30"
 tokio = "1.39"
 tokio-stream = "0.1.15"
@@ -306,9 +310,12 @@ tracing-subscriber = "0.3.16"
 tracing-tree = "0.2.2"
 ts-rs = "7.0.0"
 tungstenite = { version = "0.20.1", default-features = false }
-url = "2.4"
-utoipa = "4.2.0"
-utoipa-swagger-ui = "6.0.0"
+url = "2.5"
+utoipa = "4.2"
+utoipa-rapidoc = "4.0"
+utoipa-swagger-ui = "7.1"
+utoipauto = "0.1"
+uuid = "*"
 vergen = { version = "=8.3.1", default-features = false }
 walkdir = "2"
 wasm-bindgen-test = "0.3.36"
@@ -342,7 +349,7 @@ cw4 = { version = "=1.1.2" }
 cw-controllers = { version = "=1.1.0" }

 # cosmrs-related
-bip32 = { version = "0.5.1", default-features = false }
+bip32 = { version = "0.5.2", default-features = false }

 # temporarily using a fork again (yay.) because we need staking and slashing support (which are already on main but not released)
 # plus response message parsing (which is, as of the time of writing this message, waiting to get merged)
@@ -360,13 +367,13 @@ gloo-net = "0.5.0"
 # this is blocked until the upstream removes outdates `wasm_bindgen` feature usage
 # indexed_db_futures = "0.4.1"
 indexed_db_futures = { git = "https://github.com/TiemenSch/rust-indexed-db", branch = "update-uuid" }
-js-sys = "0.3.69"
+js-sys = "0.3.70"
 serde-wasm-bindgen = "0.6.5"
 tsify = "0.4.5"
-wasm-bindgen = "0.2.92"
-wasm-bindgen-futures = "0.4.39"
+wasm-bindgen = "0.2.93"
+wasm-bindgen-futures = "0.4.43"
 wasmtimer = "0.2.0"
-web-sys = "0.3.69"
+web-sys = "0.3.70"


 # Profile settings for individual crates
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+CREATE TABLE remote_gateway_details_temp
+(
+    gateway_id_bs58                          TEXT NOT NULL UNIQUE PRIMARY KEY REFERENCES registered_gateway (gateway_id_bs58),
+    derived_aes128_ctr_blake3_hmac_keys_bs58 TEXT NOT NULL,
+    gateway_owner_address                    TEXT,
+    gateway_listener                         TEXT NOT NULL
+);
+
+INSERT INTO remote_gateway_details_temp SELECT gateway_id_bs58, derived_aes128_ctr_blake3_hmac_keys_bs58, gateway_owner_address, gateway_listener FROM remote_gateway_details;
+
+DROP TABLE remote_gateway_details;
+ALTER TABLE remote_gateway_details_temp RENAME TO remote_gateway_details;
@@ -155,14 +155,13 @@ impl StorageManager {
    ) -> Result<(), sqlx::Error> {
        sqlx::query!(
            r#"
-                INSERT INTO remote_gateway_details(gateway_id_bs58, derived_aes128_ctr_blake3_hmac_keys_bs58, gateway_owner_address, gateway_listener, wg_tun_address) 
-                VALUES (?, ?, ?, ?, ?)
+                INSERT INTO remote_gateway_details(gateway_id_bs58, derived_aes128_ctr_blake3_hmac_keys_bs58, gateway_owner_address, gateway_listener) 
+                VALUES (?, ?, ?, ?)
            "#,
            remote.gateway_id_bs58,
            remote.derived_aes128_ctr_blake3_hmac_keys_bs58,
            remote.gateway_owner_address,
            remote.gateway_listener,
-            remote.wg_tun_address,
        )
            .execute(&self.connection_pool)
            .await?;
@@ -67,14 +67,12 @@ impl GatewayDetails {
        derived_aes128_ctr_blake3_hmac_keys: Arc<SharedKeys>,
        gateway_owner_address: Option<AccountId>,
        gateway_listener: Url,
-        wg_tun_address: Option<Url>,
    ) -> Self {
        GatewayDetails::Remote(RemoteGatewayDetails {
            gateway_id,
            derived_aes128_ctr_blake3_hmac_keys,
            gateway_owner_address,
            gateway_listener,
-            wg_tun_address,
        })
    }

@@ -172,7 +170,6 @@ pub struct RawRemoteGatewayDetails {
    pub derived_aes128_ctr_blake3_hmac_keys_bs58: String,
    pub gateway_owner_address: Option<String>,
    pub gateway_listener: String,
-    pub wg_tun_address: Option<String>,
 }

 impl TryFrom<RawRemoteGatewayDetails> for RemoteGatewayDetails {
@@ -217,24 +214,11 @@ impl TryFrom<RawRemoteGatewayDetails> for RemoteGatewayDetails {
            }
        })?;

-        let wg_tun_address = value
-            .wg_tun_address
-            .as_ref()
-            .map(|addr| {
-                Url::parse(addr).map_err(|source| BadGateway::MalformedListener {
-                    gateway_id: value.gateway_id_bs58.clone(),
-                    raw_listener: addr.clone(),
-                    source,
-                })
-            })
-            .transpose()?;
-
        Ok(RemoteGatewayDetails {
            gateway_id,
            derived_aes128_ctr_blake3_hmac_keys,
            gateway_owner_address,
            gateway_listener,
-            wg_tun_address,
        })
    }
 }
@@ -248,7 +232,6 @@ impl<'a> From<&'a RemoteGatewayDetails> for RawRemoteGatewayDetails {
                .to_base58_string(),
            gateway_owner_address: value.gateway_owner_address.as_ref().map(|o| o.to_string()),
            gateway_listener: value.gateway_listener.to_string(),
-            wg_tun_address: value.wg_tun_address.as_ref().map(|addr| addr.to_string()),
        }
    }
 }
@@ -264,8 +247,6 @@ pub struct RemoteGatewayDetails {
    pub gateway_owner_address: Option<AccountId>,

    pub gateway_listener: Url,
-
-    pub wg_tun_address: Option<Url>,
 }

 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -133,7 +133,6 @@ where
    let gateway_setup = GatewaySetup::New {
        specification: selection_spec,
        available_gateways,
-        wg_tun_address: None,
    };

    let init_details =
@@ -162,6 +161,5 @@ where
        active: common_args.set_active,
        typ: gateway_registration.details.typ().to_string(),
        endpoint: Some(gateway_details.gateway_listener.clone()),
-        wg_tun_address: gateway_details.wg_tun_address.clone(),
    })
 }
@@ -172,7 +172,6 @@ where
    let gateway_setup = GatewaySetup::New {
        specification: selection_spec,
        available_gateways,
-        wg_tun_address: None,
    };

    let init_details =
@@ -57,7 +57,6 @@ where
                active: active_gateway == Some(remote_details.gateway_id),
                typ: GatewayType::Remote.to_string(),
                endpoint: Some(remote_details.gateway_listener),
-                wg_tun_address: remote_details.wg_tun_address,
            }),
            GatewayDetails::Custom(_) => info.push(GatewayInfo {
                registration: gateway.registration_timestamp,
@@ -65,7 +64,6 @@ where
                active: active_gateway == Some(gateway.details.gateway_id()),
                typ: gateway.details.typ().to_string(),
                endpoint: None,
-                wg_tun_address: None,
            }),
        };
    }
@@ -15,7 +15,6 @@ pub struct GatewayInfo {

    pub typ: String,
    pub endpoint: Option<Url>,
-    pub wg_tun_address: Option<Url>,
 }

 impl Display for GatewayInfo {
@@ -31,10 +30,6 @@ impl Display for GatewayInfo {
        if let Some(endpoint) = &self.endpoint {
            write!(f, " endpoint: {endpoint}")?;
        }
-
-        if let Some(wg_tun_address) = &self.wg_tun_address {
-            write!(f, " wg tun address: {wg_tun_address}")?;
-        }
        Ok(())
    }
 }
@@ -35,7 +35,7 @@ use crate::init::{
 };
 use crate::{config, spawn_future};
 use futures::channel::mpsc;
-use log::{debug, error, info, warn};
+use log::*;
 use nym_bandwidth_controller::BandwidthController;
 use nym_client_core_gateways_storage::{GatewayDetails, GatewaysDetailsStore};
 use nym_credential_storage::storage::Storage as CredentialStorage;
@@ -44,7 +44,6 @@ use nym_gateway_client::client::config::GatewayClientConfig;
 use nym_gateway_client::{
    AcknowledgementReceiver, GatewayClient, GatewayConfig, MixnetMessageReceiver, PacketRouter,
 };
-use nym_network_defaults::{DEFAULT_CLIENT_LISTENING_PORT, WG_TUN_DEVICE_ADDRESS};
 use nym_sphinx::acknowledgements::AckKey;
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::addressing::nodes::NodeIdentity;
@@ -181,7 +180,6 @@ pub struct BaseClientBuilder<'a, C, S: MixnetClientStorage> {
    dkg_query_client: Option<C>,

    wait_for_gateway: bool,
-    wireguard_connection: bool,
    custom_topology_provider: Option<Box<dyn TopologyProvider + Send + Sync>>,
    custom_gateway_transceiver: Option<Box<dyn GatewayTransceiver + Send>>,
    shutdown: Option<TaskClient>,
@@ -205,7 +203,6 @@ where
            client_store,
            dkg_query_client,
            wait_for_gateway: false,
-            wireguard_connection: false,
            custom_topology_provider: None,
            custom_gateway_transceiver: None,
            shutdown: None,
@@ -226,12 +223,6 @@ where
        self
    }

-    #[must_use]
-    pub fn with_wireguard_connection(mut self, wireguard_connection: bool) -> Self {
-        self.wireguard_connection = wireguard_connection;
-        self
-    }
-
    #[must_use]
    pub fn with_topology_provider(
        mut self,
@@ -361,7 +352,6 @@ where

    async fn start_gateway_client(
        config: &Config,
-        wireguard_connection: bool,
        initialisation_result: InitialisationResult,
        bandwidth_controller: Option<BandwidthController<C, S::CredentialStore>>,
        packet_router: PacketRouter,
@@ -377,47 +367,33 @@ where
            return Err(ClientCoreError::UnexpectedPersistedCustomGatewayDetails);
        };

-        let mut gateway_client = if let Some(existing_client) =
-            initialisation_result.authenticated_ephemeral_client
-        {
-            existing_client.upgrade(packet_router, bandwidth_controller, shutdown)
-        } else {
-            let gateway_listener = if wireguard_connection {
-                if let Some(tun_address) = details.wg_tun_address {
-                    tun_address.to_string()
-                } else {
-                    let default =
-                        format!("ws://{WG_TUN_DEVICE_ADDRESS}:{DEFAULT_CLIENT_LISTENING_PORT}");
-                    warn!("gateway {} does not have tun device address set. defaulting to '{default}'", details.gateway_id);
-                    default
-                }
+        let mut gateway_client =
+            if let Some(existing_client) = initialisation_result.authenticated_ephemeral_client {
+                existing_client.upgrade(packet_router, bandwidth_controller, shutdown)
            } else {
-                details.gateway_listener.to_string()
+                let cfg = GatewayConfig::new(
+                    details.gateway_id,
+                    details
+                        .gateway_owner_address
+                        .as_ref()
+                        .map(|o| o.to_string()),
+                    details.gateway_listener.to_string(),
+                );
+                GatewayClient::new(
+                    GatewayClientConfig::new_default()
+                        .with_disabled_credentials_mode(config.client.disabled_credentials_mode)
+                        .with_response_timeout(
+                            config.debug.gateway_connection.gateway_response_timeout,
+                        ),
+                    cfg,
+                    managed_keys.identity_keypair(),
+                    Some(details.derived_aes128_ctr_blake3_hmac_keys),
+                    packet_router,
+                    bandwidth_controller,
+                    shutdown,
+                )
            };

-            let cfg = GatewayConfig::new(
-                details.gateway_id,
-                details
-                    .gateway_owner_address
-                    .as_ref()
-                    .map(|o| o.to_string()),
-                gateway_listener,
-            );
-            GatewayClient::new(
-                GatewayClientConfig::new_default()
-                    .with_disabled_credentials_mode(config.client.disabled_credentials_mode)
-                    .with_response_timeout(
-                        config.debug.gateway_connection.gateway_response_timeout,
-                    ),
-                cfg,
-                managed_keys.identity_keypair(),
-                Some(details.derived_aes128_ctr_blake3_hmac_keys),
-                packet_router,
-                bandwidth_controller,
-                shutdown,
-            )
-        };
-
        gateway_client
            .authenticate_and_start()
            .await
@@ -435,7 +411,6 @@ where
    async fn setup_gateway_transceiver(
        custom_gateway_transceiver: Option<Box<dyn GatewayTransceiver + Send>>,
        config: &Config,
-        wireguard_connection: bool,
        initialisation_result: InitialisationResult,
        bandwidth_controller: Option<BandwidthController<C, S::CredentialStore>>,
        packet_router: PacketRouter,
@@ -464,7 +439,6 @@ where
        // otherwise, setup normal gateway client, etc
        let gateway_client = Self::start_gateway_client(
            config,
-            wireguard_connection,
            initialisation_result,
            bandwidth_controller,
            packet_router,
@@ -729,7 +703,6 @@ where
        let gateway_transceiver = Self::setup_gateway_transceiver(
            self.custom_gateway_transceiver,
            self.config,
-            self.wireguard_connection,
            init_res,
            bandwidth_controller,
            gateway_packet_router,
@@ -102,7 +102,6 @@ pub mod v1_1_33 {
                    message: format!("the stored gateway listener address was malformed: {err}"),
                }
            })?,
-            wg_tun_address: None,
        }))
    }

@@ -23,7 +23,6 @@ use nym_topology::gateway;
 use rand::rngs::OsRng;
 use rand::{CryptoRng, RngCore};
 use serde::Serialize;
-use std::net::IpAddr;

 pub mod helpers;
 pub mod types;
@@ -52,7 +51,6 @@ async fn setup_new_gateway<K, D>(
    details_store: &D,
    selection_specification: GatewaySelectionSpecification,
    available_gateways: Vec<gateway::Node>,
-    wg_tun_ip_address: Option<IpAddr>,
 ) -> Result<InitialisationResult, ClientCoreError>
 where
    K: KeyStore,
@@ -70,19 +68,19 @@ where
    let selected_gateway = match selection_specification {
        GatewaySelectionSpecification::UniformRemote { must_use_tls } => {
            let gateway = uniformly_random_gateway(&mut rng, &available_gateways, must_use_tls)?;
-            SelectedGateway::from_topology_node(gateway, wg_tun_ip_address, must_use_tls)?
+            SelectedGateway::from_topology_node(gateway, must_use_tls)?
        }
        GatewaySelectionSpecification::RemoteByLatency { must_use_tls } => {
            let gateway =
                choose_gateway_by_latency(&mut rng, &available_gateways, must_use_tls).await?;
-            SelectedGateway::from_topology_node(gateway, wg_tun_ip_address, must_use_tls)?
+            SelectedGateway::from_topology_node(gateway, must_use_tls)?
        }
        GatewaySelectionSpecification::Specified {
            must_use_tls,
            identity,
        } => {
            let gateway = get_specified_gateway(&identity, &available_gateways, must_use_tls)?;
-            SelectedGateway::from_topology_node(gateway, wg_tun_ip_address, must_use_tls)?
+            SelectedGateway::from_topology_node(gateway, must_use_tls)?
        }
        GatewaySelectionSpecification::Custom {
            gateway_identity,
@@ -104,23 +102,19 @@ where
            gateway_id,
            gateway_owner_address,
            gateway_listener,
-            wg_tun_address,
        } => {
            // if we're using a 'normal' gateway setup, do register
            let our_identity = client_keys.identity_keypair();

-            // if wg address is set, use that one
-            let url = wg_tun_address.clone().unwrap_or(gateway_listener.clone());
-
            let registration =
-                helpers::register_with_gateway(gateway_id, url, our_identity).await?;
+                helpers::register_with_gateway(gateway_id, gateway_listener.clone(), our_identity)
+                    .await?;
            (
                GatewayDetails::new_remote(
                    gateway_id,
                    registration.shared_keys,
                    gateway_owner_address,
                    gateway_listener,
-                    wg_tun_address,
                ),
                Some(registration.authenticated_ephemeral_client),
            )
@@ -207,17 +201,9 @@ where
        GatewaySetup::New {
            specification,
            available_gateways,
-            wg_tun_address,
        } => {
            log::debug!("GatewaySetup::New with spec: {specification:?}");
-            setup_new_gateway(
-                key_store,
-                details_store,
-                specification,
-                available_gateways,
-                wg_tun_address,
-            )
-            .await
+            setup_new_gateway(key_store, details_store, specification, available_gateways).await
        }
        GatewaySetup::ReuseConnection {
            authenticated_ephemeral_client,
@@ -6,7 +6,6 @@ use crate::client::key_manager::ClientKeys;
 use crate::config::Config;
 use crate::error::ClientCoreError;
 use crate::init::{setup_gateway, use_loaded_gateway_details};
-use log::info;
 use nym_client_core_gateways_storage::{
    GatewayRegistration, GatewaysDetailsStore, RemoteGatewayDetails,
 };
@@ -19,7 +18,6 @@ use nym_validator_client::client::IdentityKey;
 use nym_validator_client::nyxd::AccountId;
 use serde::Serialize;
 use std::fmt::Display;
-use std::net::IpAddr;
 use std::str::FromStr;
 use std::sync::Arc;
 use time::OffsetDateTime;
@@ -32,8 +30,6 @@ pub enum SelectedGateway {
        gateway_owner_address: Option<AccountId>,

        gateway_listener: Url,
-
-        wg_tun_address: Option<Url>,
    },
    Custom {
        gateway_id: identity::PublicKey,
@@ -41,36 +37,9 @@ pub enum SelectedGateway {
    },
 }

-fn wg_tun_address(
-    tun_ip: Option<IpAddr>,
-    gateway: &gateway::Node,
-) -> Result<Option<Url>, ClientCoreError> {
-    let Some(tun_ip) = tun_ip else {
-        return Ok(None);
-    };
-
-    // log this so we'd remember about it if we ever decided to actually use that port
-    if gateway.clients_wss_port.is_some() {
-        info!(
-            "gateway {} exposes wss but for wireguard we're going to use ws",
-            gateway.identity_key
-        );
-    }
-
-    let raw_url = format!("ws://{tun_ip}:{}", gateway.clients_ws_port);
-    Ok(Some(raw_url.as_str().parse().map_err(|source| {
-        ClientCoreError::MalformedListener {
-            gateway_id: gateway.identity_key.to_base58_string(),
-            raw_listener: raw_url,
-            source,
-        }
-    })?))
-}
-
 impl SelectedGateway {
    pub fn from_topology_node(
        node: gateway::Node,
-        wg_tun_ip_address: Option<IpAddr>,
        must_use_tls: bool,
    ) -> Result<Self, ClientCoreError> {
        let gateway_listener = if must_use_tls {
@@ -82,8 +51,6 @@ impl SelectedGateway {
            node.clients_address()
        };

-        let wg_tun_address = wg_tun_address(wg_tun_ip_address, &node)?;
-
        let gateway_owner_address = node
            .owner
            .as_ref()
@@ -109,7 +76,6 @@ impl SelectedGateway {
            gateway_id: node.identity_key,
            gateway_owner_address,
            gateway_listener,
-            wg_tun_address,
        })
    }

@@ -250,12 +216,6 @@ pub enum GatewaySetup {

        // TODO: seems to be a bit inefficient to pass them by value
        available_gateways: Vec<gateway::Node>,
-
-        /// Implicitly specify whether the chosen gateway must use wireguard mode by setting the tun address.
-        ///
-        /// Currently this is imperfect solution as I'd imagine this address could vary from gateway to gateway
-        /// so perhaps it should be part of gateway::Node struct
-        wg_tun_address: Option<IpAddr>,
    },

    ReuseConnection {
@@ -290,7 +250,6 @@ impl GatewaySetup {
                additional_data: None,
            },
            available_gateways: vec![],
-            wg_tun_address: None,
        }
    }

@@ -9,7 +9,7 @@ license.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-base64 = "0.13"
+base64 = { workspace = true }
 colored = { workspace = true }

 nym-coconut-dkg-common = { path = "../../cosmwasm-smart-contracts/coconut-dkg" }
@@ -9,17 +9,9 @@ use nym_api_requests::ecash::models::{
    BatchRedeemTicketsBody, EcashBatchTicketRedemptionResponse, EcashTicketVerificationResponse,
    VerifyEcashTicketBody,
 };
-use nym_api_requests::nym_nodes::{CachedNodesResponse, SkimmedNode};
-use nym_http_api_client::{ApiClient, NO_PARAMS};
-use nym_mixnet_contract_common::mixnode::MixNodeDetails;
-use nym_mixnet_contract_common::{GatewayBond, IdentityKeyRef, MixId};
-use time::format_description::BorrowedFormatItem;
-use time::Date;
-
-pub mod error;
-pub mod routes;
-
 use nym_api_requests::ecash::VerificationKeyResponse;
+use nym_api_requests::models::DescribedMixNode;
+use nym_api_requests::nym_nodes::{CachedNodesResponse, SkimmedNode};
 pub use nym_api_requests::{
    ecash::{
        models::{
@@ -39,7 +31,16 @@ pub use nym_api_requests::{
    },
 };
 pub use nym_coconut_dkg_common::types::EpochId;
+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, MixId};
+use time::format_description::BorrowedFormatItem;
+use time::Date;
+
+pub mod error;
+pub mod routes;

 pub fn rfc_3339_date() -> Vec<BorrowedFormatItem<'static>> {
    time::format_description::parse("[year]-[month]-[day]").unwrap()
@@ -107,6 +108,14 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

+    async fn get_mixnodes_described(&self) -> Result<Vec<DescribedMixNode>, NymAPIError> {
+        self.get_json(
+            &[routes::API_VERSION, routes::MIXNODES, routes::DESCRIBED],
+            NO_PARAMS,
+        )
+        .await
+    }
+
    async fn get_basic_mixnodes(
        &self,
        semver_compatibility: Option<String>,
@@ -431,6 +440,22 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

+    async fn get_mixnodes_blacklisted(&self) -> Result<Vec<MixId>, NymAPIError> {
+        self.get_json(
+            &[routes::API_VERSION, routes::MIXNODES, routes::BLACKLISTED],
+            NO_PARAMS,
+        )
+        .await
+    }
+
+    async fn get_gateways_blacklisted(&self) -> Result<Vec<IdentityKey>, NymAPIError> {
+        self.get_json(
+            &[routes::API_VERSION, routes::GATEWAYS, routes::BLACKLISTED],
+            NO_PARAMS,
+        )
+        .await
+    }
+
    async fn blind_sign(
        &self,
        request_body: &BlindSignRequestBody,
@@ -7,6 +7,7 @@ pub const API_VERSION: &str = NYM_API_VERSION;
 pub const MIXNODES: &str = "mixnodes";
 pub const GATEWAYS: &str = "gateways";
 pub const DESCRIBED: &str = "described";
+pub const BLACKLISTED: &str = "blacklisted";

 pub const DETAILED: &str = "detailed";
 pub const DETAILED_UNFILTERED: &str = "detailed-unfiltered";
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::nyxd::error::NyxdError;
+use base64::Engine;
 use cosmrs::abci::TxMsgData;
 use cosmrs::cosmwasm::MsgExecuteContractResponse;
 use cosmrs::proto::cosmos::base::query::v1beta1::{PageRequest, PageResponse};
@@ -16,7 +17,7 @@ pub fn parse_msg_responses(data: Bytes) -> Vec<MsgResponse> {
    // it seems that currently, on wasmd 0.43 + tendermint-rs 0.37 + cosmrs 0.17.0-pre
    // the data is left in undecoded base64 form, but I'd imagine this might change so if the decoding fails,
    // use the bytes directly instead
-    let data = if let Ok(decoded) = base64::decode(&data) {
+    let data = if let Ok(decoded) = base64::prelude::BASE64_STANDARD.decode(&data) {
        decoded
    } else {
        error!("failed to base64-decode the 'data' field of the TxResponse - has the chain been upgraded and introduced some breaking changes?");
@@ -3,6 +3,7 @@

 use crate::rpc::TendermintRpcClient;
 use async_trait::async_trait;
+use base64::Engine;
 use cosmrs::tendermint::{block::Height, evidence::Evidence, Hash};
 use reqwest::header::HeaderMap;
 use reqwest::{header, RequestBuilder};
@@ -13,7 +14,6 @@ use tendermint_rpc::{
    query::Query,
    Error, Order, Response, SimpleRequest,
 };
-
 use url::Url;

 // copied macro from tendermint-rpc crate because that's exactly what we have to do here too
@@ -206,7 +206,7 @@ pub fn extract_authorization(url: &Url) -> Option<String> {

    let authority = url.authority();
    if let Some((userpass, _)) = authority.split_once('@') {
-        Some(base64::encode(userpass))
+        Some(base64::prelude::BASE64_STANDARD.encode(userpass))
    } else {
        None
    }
@@ -7,7 +7,7 @@ license.workspace = true

 [dependencies]
 anyhow = { workspace = true }
-base64 = "0.13.0"
+base64 = { workspace = true }
 bip39 = { workspace = true }
 bs58 = { workspace = true }
 comfy-table = { workspace = true }
@@ -21,7 +21,7 @@ humantime-serde = { workspace = true }
 inquire = { workspace = true }
 k256 = { workspace = true, features = ["ecdsa", "sha256"] }
 log = { workspace = true }
-rand = {version = "0.6", features = ["std"] }
+rand = { workspace = true, features = ["std"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
@@ -14,7 +14,7 @@ use std::path::PathBuf;
 #[derive(Debug, Parser)]
 pub struct Args {
    /// Specify which type of ticketbook should be issued
-    #[clap(long, default_value_t = TicketType::default())]
+    #[clap(long, default_value_t = TicketType::V1MixnetEntry)]
    pub(crate) ticketbook_type: TicketType,

    /// Config file of the client that is supposed to use the credential.
@@ -1,6 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

+use base64::Engine;
 use clap::Parser;

 #[derive(Debug, Parser)]
@@ -10,7 +11,9 @@ pub struct Args {
 }

 pub fn decode_mixnode_key(args: Args) {
-    let b64_decoded = base64::decode(args.key).expect("failed to decode base64 string");
+    let b64_decoded = base64::prelude::BASE64_STANDARD
+        .decode(args.key)
+        .expect("failed to decode base64 string");
    let b58_encoded = bs58::encode(&b64_decoded).into_string();

    println!("{b58_encoded}")
@@ -15,7 +15,8 @@ serde = { workspace = true, features = ["derive"] }
 toml = "0.7.4"
 url = { workspace = true }

-nym-network-defaults = { path = "../network-defaults" }
+nym-network-defaults = { path = "../network-defaults", features = ["utoipa"] }

 [features]
 default = ["dirs"]
+utoipa = [ "nym-network-defaults/utoipa" ]
@@ -11,4 +11,4 @@ cosmwasm-schema = { workspace = true }
 cw4 = { workspace = true }
 cw-controllers = { workspace = true }
 schemars = { workspace = true }
-serde = { version = "1.0.103", default-features = false, features = ["derive"] }
+serde = { version = "1.0.209", default-features = false, features = ["derive"] }
@@ -9,7 +9,7 @@ license = { workspace = true }
 repository = { workspace = true }

 [dependencies]
-bs58 = "0.4.0"
+bs58 = "0.5.1"
 cosmwasm-std = { workspace = true }
 cosmwasm-schema = { workspace = true }
 cw2 = { workspace = true, optional = true }
@@ -22,6 +22,7 @@ thiserror = { workspace = true }
 contracts-common = { path = "../contracts-common", package = "nym-contracts-common", version = "0.5.0" }
 serde-json-wasm = { workspace = true }
 humantime-serde = { workspace = true }
+utoipa = { workspace = true, optional = true }

 # TO CHECK WHETHER STILL NEEDED:
 log = { workspace = true }
@@ -35,5 +36,6 @@ time = { workspace = true, features = ["serde", "macros"] }
 [features]
 default = []
 contract-testing = []
+utoipa = [ "dep:utoipa" ]
 schema = ["cw2"]
 generate-ts = ['ts-rs']
@@ -10,6 +10,7 @@ use std::fmt::Display;
 /// Information provided by the node operator during bonding that are used to allow other entities to use the services of this node.
 #[cw_serde]
 #[derive(PartialOrd)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct Gateway {
    /// Network address of this gateway, for example 1.1.1.1 or foo.gateway.com
    pub host: String,
@@ -25,9 +26,11 @@ pub struct Gateway {
    pub location: String,

    /// Base58-encoded x25519 public key used for sphinx key derivation.
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub sphinx_key: SphinxKey,

    /// Base58 encoded ed25519 EdDSA public key of the gateway used to derive shared keys with clients
+    #[cfg_attr(feature = "utoipa", schema(value_type = String))]
    pub identity_key: IdentityKey,

    /// The self-reported semver version of this gateway.
@@ -36,6 +39,7 @@ pub struct Gateway {

 /// Basic gateway information provided by the node operator.
 #[cw_serde]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct GatewayBond {
    /// Original amount pledged by the operator of this node.
    pub pledge_amount: Coin,
@@ -209,8 +209,10 @@ impl Display for EpochState {
    ts(export_to = "ts-packages/types/src/types/rust/Interval.ts")
 )]
 #[derive(Clone, Copy, Debug, Deserialize, PartialEq, Eq, Serialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct Interval {
    /// Monotonously increasing id of this interval.
+    #[cfg_attr(feature = "utoipa", schema(value_type = u32))]
    id: IntervalId,

    /// Number of epochs in this interval.
@@ -226,6 +228,7 @@ pub struct Interval {
    current_epoch_start: OffsetDateTime,

    /// Monotonously increasing id of the current epoch in this interval.
+    #[cfg_attr(feature = "utoipa", schema(value_type = u32))]
    current_epoch_id: EpochId,

    /// The duration of all epochs in this interval.
@@ -233,6 +236,7 @@ pub struct Interval {
    epoch_length: Duration,

    /// The total amount of elapsed epochs since the first epoch of the first interval.
+    #[cfg_attr(feature = "utoipa", schema(value_type = u32))]
    total_elapsed_epochs: EpochId,
 }

@@ -14,5 +14,5 @@ cw-storage-plus = { workspace = true }
 cosmwasm-schema = { workspace = true }
 cosmwasm-std = { workspace = true }
 schemars = { workspace = true }
-serde = { version = "1.0.103", default-features = false, features = ["derive"] }
+serde = { version = "1.0.209", default-features = false, features = ["derive"] }
 thiserror = { workspace = true }
@@ -221,20 +221,11 @@ impl From<PayInfo> for NymPayInfo {
 }

 #[derive(
-    Default,
-    Copy,
-    Clone,
-    Debug,
-    PartialEq,
-    Serialize,
-    Deserialize,
-    strum::Display,
-    strum::EnumString,
+    Copy, Clone, Debug, PartialEq, Serialize, Deserialize, strum::Display, strum::EnumString,
 )]
 #[serde(rename_all = "kebab-case")]
 #[strum(serialize_all = "kebab-case")]
 pub enum TicketType {
-    #[default]
    V1MixnetEntry,
    V1MixnetExit,
    V1WireguardEntry,
@@ -27,5 +27,5 @@ nym-ecash-contract-common = { path = "../cosmwasm-smart-contracts/ecash-contract
 nym-network-defaults = { path = "../network-defaults" }

 [dev-dependencies]
-rand = "0.8.5"
+rand = { workspace = true }

@@ -20,8 +20,8 @@ cipher = { workspace = true, optional = true }
 x25519-dalek = { workspace = true, features = ["static_secrets"], optional = true }
 ed25519-dalek = { workspace = true, features = ["rand_core"], optional = true }
 rand = { workspace = true, optional = true }
-serde_bytes = { version = "0.11.6", optional = true }
-serde_crate = { version = "1.0", optional = true, default-features = false, features = ["derive"], package = "serde" }
+serde_bytes = { workspace = true, optional = true }
+serde = { version = "1.0", optional = true, default-features = false, features = ["derive"] }
 subtle-encoding = { workspace = true, features = ["bech32-preview"] }
 thiserror = { workspace = true }
 zeroize = { workspace = true, optional = true, features = ["zeroize_derive"] }
@@ -35,7 +35,7 @@ rand_chacha = { workspace = true }

 [features]
 default = ["sphinx"]
-serde = ["serde_crate", "serde_bytes", "ed25519-dalek/serde", "x25519-dalek/serde"]
+serde = ["dep:serde", "serde_bytes", "ed25519-dalek/serde", "x25519-dalek/serde"]
 asymmetric = ["x25519-dalek", "ed25519-dalek", "zeroize"]
 hashing = ["blake3", "digest", "hkdf", "hmac", "generic-array"]
 symmetric = ["aes", "ctr", "cipher", "generic-array"]
@@ -44,7 +44,6 @@ pub enum KeyRecoveryError {

 #[derive(Zeroize, ZeroizeOnDrop)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "serde", serde(crate = "serde_crate"))]
 pub struct KeyPair {
    pub(crate) private_key: PrivateKey,

@@ -55,7 +55,6 @@ pub enum Ed25519RecoveryError {
 /// Keypair for usage in ed25519 EdDSA.
 #[derive(Debug, Zeroize, ZeroizeOnDrop)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "serde", serde(crate = "serde_crate"))]
 pub struct KeyPair {
    private_key: PrivateKey,

@@ -5,7 +5,7 @@ use super::PublicKey;

 pub mod bs58_pubkey {
    use super::*;
-    use serde_crate::{Deserialize, Deserializer, Serializer};
+    use serde::{Deserialize, Deserializer, Serializer};

    pub fn serialize<S: Serializer>(key: &PublicKey, serializer: S) -> Result<S::Ok, S::Error> {
        serializer.serialize_str(&key.to_base58_string())
@@ -28,6 +28,3 @@ pub use aes;
 pub use blake3;
 #[cfg(feature = "symmetric")]
 pub use ctr;
-
-#[cfg(feature = "serde")]
-extern crate serde_crate as serde;
@@ -18,7 +18,7 @@ bs58 = { workspace = true }


 lazy_static = { workspace = true }
-rand = { version = "0.8.5", default-features = false}
+rand = { workspace = true }
 rand_chacha = { workspace = true }
 rand_core = { workspace = true }
 sha2 = "0.9"
@@ -13,8 +13,13 @@ license.workspace = true
 [dependencies]
 axum.workspace = true
 bytes = { workspace = true }
+colored.workspace = true
 mime = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
 serde_yaml = { workspace = true }
-utoipa = { workspace = true }
+tracing.workspace = true
+utoipa = { workspace = true, optional = true }
+
+[features]
+utoipa = ["dep:utoipa"]
@@ -6,9 +6,11 @@ use axum::response::{IntoResponse, Response};
 use axum::Json;
 use bytes::{BufMut, BytesMut};
 use serde::{Deserialize, Serialize};
-use utoipa::{IntoParams, ToSchema};

-#[derive(Debug, Clone, ToSchema)]
+pub mod logging;
+
+#[derive(Debug, Clone)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub enum FormattedResponse<T> {
    Json(Json<T>),
    Yaml(Yaml<T>),
@@ -26,7 +28,8 @@ where
    }
 }

-#[derive(Default, Debug, Serialize, Deserialize, Copy, Clone, ToSchema)]
+#[derive(Default, Debug, Serialize, Deserialize, Copy, Clone)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 #[serde(rename_all = "lowercase")]
 pub enum Output {
    #[default]
@@ -34,7 +37,8 @@ pub enum Output {
    Yaml,
 }

-#[derive(Default, Debug, Serialize, Deserialize, Copy, Clone, IntoParams, ToSchema)]
+#[derive(Default, Debug, Serialize, Deserialize, Copy, Clone)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::IntoParams, utoipa::ToSchema))]
 #[serde(default)]
 pub struct OutputParams {
    pub output: Option<Output>,
@@ -0,0 +1,63 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+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 colored::Colorize;
+use std::net::SocketAddr;
+use std::time::Instant;
+use tracing::info;
+
+pub async fn logger(
+    ConnectInfo(addr): ConnectInfo<SocketAddr>,
+    request: Request,
+    next: Next,
+) -> impl IntoResponse {
+    // TODO dz use `OriginalUri` extractor to get full URI even for nested
+    // routers if routes aren't logged correctly in handlers
+    fn header_map(header: Option<&HeaderValue>, msg: String) -> String {
+        header
+            .map(|x| x.to_str().unwrap_or(&msg).to_string())
+            .unwrap_or(msg)
+    }
+
+    let method = request.method().to_string().green();
+    let uri = request.uri().to_string().blue();
+    let agent = header_map(
+        request.headers().get(USER_AGENT),
+        "Unknown User Agent".to_string(),
+    );
+
+    let host = header_map(request.headers().get(HOST), "Unknown Host".to_string());
+
+    let start = Instant::now();
+    // run request through all middleware, incl. extractors
+    let res = next.run(request).await;
+    let time_taken = start.elapsed();
+    let status = res.status();
+    let print_status = if status.is_client_error() || status.is_server_error() {
+        status.to_string().red()
+    } else if status.is_success() {
+        status.to_string().green()
+    } else {
+        status.to_string().yellow()
+    };
+
+    let taken = "time taken".bold();
+
+    let time_taken = match time_taken.as_millis() {
+        ms if ms > 500 => format!("{taken}: {}", format!("{ms}ms").red()),
+        ms if ms > 200 => format!("{taken}: {}", format!("{ms}ms").yellow()),
+        ms if ms > 50 => format!("{taken}: {}", format!("{ms}ms").bright_yellow()),
+        ms => format!("{taken}: {ms}ms"),
+    };
+
+    let agent_str = "agent".bold();
+
+    info!("[{addr} -> {host}] {method} '{uri}': {print_status} {time_taken} {agent_str}: {agent}");
+
+    res
+}
@@ -12,7 +12,7 @@ bytes = { workspace = true }
 futures = { workspace = true }
 humantime-serde = { workspace = true }
 log = { workspace = true }
-rand = "0.8"
+rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 tokio = { workspace = true, features = [
    "time",
@@ -13,6 +13,7 @@ log = { workspace = true, optional = true }
 schemars = { workspace = true, features = ["preserve_order"], optional = true }
 serde = { workspace = true, features = ["derive"], optional = true }
 url = { workspace = true, optional = true }
+utoipa = { workspace = true, optional = true }

 # please be extremely careful when adding new dependencies because this crate is imported by the ecash contract,
 # so if anything new is added, consider feature-locking it and then just adding it to default feature
@@ -20,4 +21,5 @@ url = { workspace = true, optional = true }
 [features]
 default = ["env", "network"]
 env = ["dotenvy", "log"]
-network = ["schemars", "serde", "url"]
+network = ["schemars", "serde", "url"]
+utoipa = [ "dep:utoipa" ]
@@ -9,10 +9,9 @@ pub const TICKETBOOK_SIZE: u64 = 50;

 /// This type is defined mostly for the purposes of having constants (like sizes) associated with given variants
 /// It's not meant to be serialised or have any fancy traits defined on it (in this crate)
-#[derive(Default, Copy, Clone, Debug, PartialEq)]
+#[derive(Copy, Clone, Debug, PartialEq)]
 #[repr(u8)]
 pub enum TicketTypeRepr {
-    #[default]
    V1MixnetEntry = 0,
    V1MixnetExit = 1,
    V1WireguardEntry = 2,
@@ -20,12 +19,10 @@ pub enum TicketTypeRepr {
 }

 impl TicketTypeRepr {
-    pub const WIREGUARD_ENTRY_TICKET_SIZE: u64 = 500 * 1024 * 1024; // 500 MB
-
-    // TBD:
-    pub const WIREGUARD_EXIT_TICKET_SIZE: u64 = Self::WIREGUARD_ENTRY_TICKET_SIZE;
-    pub const MIXNET_ENTRY_TICKET_SIZE: u64 = Self::WIREGUARD_ENTRY_TICKET_SIZE;
-    pub const MIXNET_EXIT_TICKET_SIZE: u64 = Self::WIREGUARD_ENTRY_TICKET_SIZE;
+    pub const WIREGUARD_ENTRY_TICKET_SIZE: u64 = 512 * 1024 * 1024; // 512 MB
+    pub const WIREGUARD_EXIT_TICKET_SIZE: u64 = 512 * 1024 * 1024; // 512 MB
+    pub const MIXNET_ENTRY_TICKET_SIZE: u64 = 128 * 1024 * 1024; // 128 MB
+    pub const MIXNET_EXIT_TICKET_SIZE: u64 = 128 * 1024 * 1024; // 128 MB

    /// How much bandwidth (in bytes) one ticket can grant
    pub const fn bandwidth_value(&self) -> u64 {
@@ -8,6 +8,7 @@ use std::ops::Not;
 use url::Url;

 #[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize, JsonSchema)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct ChainDetails {
    pub bech32_account_prefix: String,
    pub mix_denom: DenomDetailsOwned,
@@ -15,6 +16,7 @@ pub struct ChainDetails {
 }

 #[derive(Clone, Debug, Default, Deserialize, Eq, Hash, PartialEq, Serialize, JsonSchema)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct NymContracts {
    pub mixnet_contract_address: Option<String>,
    pub vesting_contract_address: Option<String>,
@@ -27,6 +29,7 @@ pub struct NymContracts {
 // I wanted to use the simpler `NetworkDetails` name, but there's a clash
 // with `NetworkDetails` defined in all.rs...
 #[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize, JsonSchema)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct NymNetworkDetails {
    pub network_name: String,
    pub chain_details: ChainDetails,
@@ -293,6 +296,7 @@ impl DenomDetails {
 }

 #[derive(Debug, Serialize, Deserialize, Hash, Clone, PartialEq, Eq, JsonSchema)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct DenomDetailsOwned {
    pub base: String,
    pub display: String,
@@ -321,6 +325,7 @@ impl DenomDetailsOwned {
 }

 #[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize, JsonSchema)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 pub struct ValidatorDetails {
    // it is assumed those values are always valid since they're being provided in our defaults file
    pub nyxd_url: String,
@@ -21,7 +21,7 @@ thiserror = { workspace = true }
 sha2 = "0.9"
 bs58 = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
-rayon = { version = "1.5.0", optional = true }
+rayon = { workspace = true, optional = true }
 zeroize = { workspace = true, features = ["zeroize_derive"] }
 ff = { workspace = true }
 group = { workspace = true }
@@ -32,7 +32,7 @@ fn bench_compact_ecash(c: &mut Criterion) {

    let spend_date = 1701907200; // Dec 07 2023 00:00:00
    let expiration_date = 1702166400; // Dec 10 2023 00:00:00
-    let encoded_ticket_type = TicketTypeRepr::default() as u8;
+    let encoded_ticket_type = TicketTypeRepr::V1MixnetEntry as u8;

    let case = BenchCase {
        num_authorities: 100,
@@ -11,7 +11,7 @@ license.workspace = true
 bls12_381 = { workspace = true, default-features = false, features = ["pairings", "alloc", "experimental"] }
 itertools = { workspace = true }
 digest = "0.9"
-rand = "0.8"
+rand = { workspace = true }
 thiserror = { workspace = true }
 serde = { workspace = true }
 serde_derive = { workspace = true }
@@ -42,7 +42,7 @@ nym-crypto = { path = "../crypto", version = "0.4.0", features = [
 path = "framing"

 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio]
-version = "1.24.1"
+version = "1.39.3"
 features = ["sync"]

 [features]
@@ -9,7 +9,7 @@ repository = { workspace = true }

 [dependencies]
 rand = { workspace = true }
-serde_crate = { version = "1.0", optional = true, default-features = false, features = ["derive"], package = "serde" }
+serde = { version = "1.0", optional = true, default-features = false, features = ["derive"] }
 generic-array = { workspace = true, optional = true, features = ["serde"] }
 thiserror = { workspace = true }
 zeroize = { workspace = true }
@@ -23,4 +23,4 @@ nym-sphinx-types = { path = "../types", features = ["sphinx"] }
 nym-topology = { path = "../../topology" }

 [features]
-serde = ["serde_crate", "generic-array"]
+serde = ["dep:serde", "generic-array"]
@@ -9,10 +9,9 @@ use std::fmt::{self, Display, Formatter};
 use zeroize::{Zeroize, ZeroizeOnDrop};

 #[cfg(feature = "serde")]
-use serde_crate::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};

 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "serde", serde(crate = "serde_crate"))]
 #[derive(Zeroize, ZeroizeOnDrop)]
 pub struct AckKey(CipherKey<AckEncryptionAlgorithm>);

@@ -14,5 +14,5 @@ serde = { workspace = true } # implementing serialization/deserialization for so
 thiserror = { workspace = true }

 [dev-dependencies]
-rand = "0.8.5"
+rand = { workspace = true }
 nym-crypto = { path = "../../crypto", features = ["rand"] }
@@ -21,7 +21,7 @@ nym-sphinx-types = { path = "../types" }
 nym-topology = { path = "../../topology" }

 [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen]
-version = "0.2.83"
+version = "0.2.93"

 [dev-dependencies]
 rand_chacha = { workspace = true }
@@ -10,7 +10,7 @@ license.workspace = true
 aes-gcm = { workspace = true }
 argon2 = { workspace = true }
 generic-array = { workspace = true, features = ["zeroize"] }
-rand = "0.8.5"
+rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, optional = true }
 thiserror = { workspace = true }
@@ -73,10 +73,7 @@ pub struct MonitorMessage {

 impl MonitorMessage {
    fn message_to_sign(results: &[NodeResult], timestamp: i64) -> Vec<u8> {
-        let mut msg = match serde_json::to_vec(results) {
-            Ok(msg) => msg,
-            Err(_) => Vec::new(),
-        };
+        let mut msg = serde_json::to_vec(results).unwrap_or_default();
        msg.extend_from_slice(&timestamp.to_le_bytes());
        msg
    }
@@ -106,7 +106,6 @@ pub async fn setup_gateway_wasm(
        GatewaySetup::New {
            specification: selection_spec,
            available_gateways: gateways.to_vec(),
-            wg_tun_address: None,
        }
    };

@@ -32,7 +32,6 @@ impl TryFrom<WasmRawRegisteredGateway> for GatewayRegistration {
                .derived_aes128_ctr_blake3_hmac_keys_bs58,
            gateway_owner_address: value.gateway_owner_address,
            gateway_listener: value.gateway_listener,
-            wg_tun_address: None,
        };
        let remote: RemoteGatewayDetails = raw_remote.try_into()?;

@@ -33,7 +33,7 @@ serde_json = { workspace = true, optional = true }
 x25519-dalek = { workspace = true, features = ["static_secrets"] }

 [dev-dependencies]
-rand = "0.8.5"
+rand = { workspace = true }
 nym-crypto = { path = "../crypto", features = ["rand"] }


@@ -26,4 +26,4 @@ serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { workspace = true }

 [features]
-schema-gen = ["nym-coconut-bandwidth-contract-common/schema", "cosmwasm-schema"]
+schema-gen = ["nym-coconut-bandwidth-contract-common/schema", "cosmwasm-schema"]
@@ -52,7 +52,7 @@
 - [Integrations](faq/integrations-faq.md)

 # User Manuals
- [NymVPN alpha](nymvpn/intro.md)
+- [NymVPN beta](nymvpn/intro.md)
    - [CLI](nymvpn/cli.md)
 ---

@@ -2,12 +2,16 @@

 > The Nym Socks5 Client was built in the [building nym](../binaries/building-nym.md) section. If you haven't yet built Nym and want to run the code on this page, go there first.

+**To install and operate `nym-socks5-client`, visit [Setup & Run](socks5/setup.md) and [Using Your Client](socks5/usage.md) pages.**
+
 ## Current version
+
 ```
 <!-- cmdrun ../../../../target/release/nym-socks5-client --version | grep "Build Version" | cut -b 21-26  -->
 ```

 ## What is this client for?
+
 Many existing applications are able to use either the SOCKS4, SOCKS4A, or SOCKS5 proxy protocols. If you want to send such an application's traffic through the mixnet, you can use the `nym-socks5-client` to bounce network traffic through the Nym network, like this:

 ```
@@ -64,147 +68,4 @@ The `nym-socks5-client` allows you to do the following from your local machine:

 The `nym-network-requester` then reassembles the original TCP stream using the packets' sequence numbers, and make the intended request. It will then chop up the response into Sphinx packets and send them back through the mixnet to your  `nym-socks5-client`. The application will then receive its data, without even noticing that it wasn't talking to a "normal" SOCKS5 proxy!

-## Client setup
-### Viewing command help
-
-You can check that your binaries are properly compiled with:
-
-```
-./nym-socks5-client --help
-```
-
-~~~admonish example collapsible=true title="Console output"
-```
-<!-- cmdrun ../../../../target/release/nym-socks5-client --help -->
-```
-~~~
-
-You can check the necessary parameters for the available commands by running:
-
-```
-./nym-client <COMMAND> --help
-```
-
-### Initialising a new client instance
-Before you can use the client, you need to initalise a new instance of it, which can be done with the following command:
-
-```
-./nym-socks5-client init --id docs-example --use-reply-surbs true --provider Entztfv6Uaz2hpYHQJ6JKoaCTpDL5dja18SuQWVJAmmx.Cvhn9rBJw5Ay9wgHcbgCnVg89MPSV5s2muPV2YF1BXYu@Fo4f4SQLdoyoGkFae5TpVhRVoXCF8UiypLVGtGjujVPf
-```
-
-~~~admonish example collapsible=true title="Console output"
-```
-<!-- cmdrun ../../../../target/release/nym-socks5-client init --id docs-example --provider Entztfv6Uaz2hpYHQJ6JKoaCTpDL5dja18SuQWVJAmmx.Cvhn9rBJw5Ay9wgHcbgCnVg89MPSV5s2muPV2YF1BXYu@Fo4f4SQLdoyoGkFae5TpVhRVoXCF8UiypLVGtGjujVPf -->
-```
-~~~
-
-The `--id` in the example above is a local identifier so that you can name your clients and keep track of them on your local system; it is **never** transmitted over the network.
-
-The `--use-reply-surbs` field denotes whether you wish to send [SURBs](https://nymtech.net/docs/architecture/traffic-flow.md#private-replies-using-surbs) along with your request. It defaults to `false`, we are explicitly setting it as `true`. It defaults to `false` for compatibility with older versions of the [Network Requester](https://nymtech.net/nodes/network-requester.md).
-
-The `--provider` field needs to be filled with the Nym address of a Network Requester that can make network requests on your behalf. If you don't want to [run your own](https://nymtech.net/operators/nodes/network-requester.md) you can select one from the [mixnet explorer](https://explorer.nymtech.net/network-components/service-providers) by copying its `Client ID` and using this as the value of the `--provider` flag. Alternatively, you could use [this list](https://harbourmaster.nymtech.net/).
-
-#### Choosing a Gateway
-By default - as in the example above - your client will choose a random gateway to connect to.
-
-However, there are several options for choosing a gateway, if you do not want one that is randomly assigned to your client:
-* If you wish to connect to a specific gateway, you can specify this with the `--gateway` flag when running `init`.
-* You can also choose a gateway based on its location relative to your client. This can be done by appending the `--latency-based-selection` flag to your `init` command. This command means that to select a gateway, your client will:
-	* fetch a list of all availiable gateways
-	* send few ping messages to all of them, and measure response times.
-	* create a weighted distribution to randomly choose one, favouring ones with lower latency.
-
-> Note this doesn't mean that your client will pick the closest gateway to you, but it will be far more likely to connect to gateway with a 20ms ping rather than 200ms
-
-### Configuring your client
-When you initalise a client instance, a configuration directory will be generated and stored in `$HOME_DIR/.nym/socks5-clients/<client-name>/`.
-
-```
-tree $HOME/<user>/.nym/socks5-clients/docs-example
-├── config
-│   └── config.toml
-└── data
-    ├── ack_key.pem
-    ├── credentials_database.db
-    ├── gateway_shared.pem
-    ├── persistent_reply_store.sqlite
-    ├── private_encryption.pem
-    ├── private_identity.pem
-    ├── public_encryption.pem
-    └── public_identity.pem
-
-```
-
-The `config.toml` file contains client configuration options, while the two `pem` files contain client key information.
-
-The generated files contain the client name, public/private keypairs, and gateway address. The name `<client_id>` in the example above is just a local identifier so that you can name your clients.
-
-#### Configuring your client for Docker
-By default, the native client listens to host `127.0.0.1`. However this can be an issue if you wish to run a client in a Dockerized environment, where it can be convenenient to listen on a different host such as `0.0.0.0`.
-
-You can set this via the `--host` flag during either the `init` or `run` commands.
-
-Alternatively, a custom host can be set in the `config.toml` file under the `socket` section. If you do this, remember to restart your client process.
-
-### Running the socks5 client
-
-You can run the initialised client by doing this:
-
-```
-./nym-socks5-client run --id docs-example
-```
-
-## Automating your socks5 client with systemd
-
-Create a service file for the socks5 client at `/etc/systemd/system/nym-socks5-client.service`:
-
-```ini
-[Unit]
-Description=Nym Socks5 Client
-StartLimitInterval=350
-StartLimitBurst=10
-
-[Service]
-User=nym # replace this with whatever user you wish
-LimitNOFILE=65536
-ExecStart=/home/nym/nym-socks5-client run --id <your_id>
-KillSignal=SIGINT
-Restart=on-failure
-RestartSec=30
-
-[Install]
-WantedBy=multi-user.target
-```
-
-Now enable and start your socks5 client:
-
-```
-systemctl enable nym-socks5-client.service
-systemctl start nym-socks5-client.service
-# you can always check your socks5 client has succesfully started with:
-systemctl status nym-socks5-client.service
-```
-
-## Using your Socks5 Client
-
-After completing the steps above, your local Socks5 Client will be listening on `localhost:1080` ready to proxy traffic to the Network Requester set as the `--provider` when initialising.
-
-When trying to connect your app, generally the proxy settings are found in `settings->advanced` or `settings->connection`.
-
-Here is an example of setting the proxy connecting in Blockstream Green:
-
-![Blockstream Green settings](../images/wallet-proxy-settings/blockstream-green.gif)
-
-Most wallets and other applications will work basically the same way: find the network proxy settings, enter the proxy url (host: **localhost**, port: **1080**).
-
-In some other applications, this might be written as **localhost:1080** if there's only one proxy entry field.
-
-## Useful Commands
-
-**no-banner**
-
-Adding `--no-banner` startup flag will prevent Nym banner being printed even if run in tty environment.
-
-**build-info**
-
-A `build-info` command prints the build information like commit hash, rust version, binary version just like what command `--version` does. However, you can also specify an `--output=json` flag that will format the whole output as a json, making it an order of magnitude easier to parse.
+Since the introduction of `nym-node` binary, `nym-network-requester` is incorporated in every node running in `exit-gateway` mode. The narrow whitelist was exchanged for a less restrictive Nym [exit policy](https://nymtech.net/.wellknown/network-requester/exit-policy.txt), where except the IPs and ports all internet access is permitted. `nym-socks5-client` users can find a full list of Network Requester addresses on [Nym Harbourmaster](https://harbourmaster.nymtech.net/) under tab called *SOCKS5 NETWORK REQUESTERS*.
@@ -1,4 +1,4 @@
-# Setup
+# Setup & Run Nym Socks5 Client

 > `nym-socks5-client` now also supports SOCKS4 and SOCKS4A protocols as well as SOCKS5.

@@ -9,7 +9,7 @@ Since the beginning of 2024 NymConnect is no longer maintained. Nym is developin
 If users want to route their traffic through socks5 we advice to use this client. If you want to run deprecated NymConnect, visit [NymConnect archive page](../../archive/nym-connect.md) with setup and application examples.
 ```

-## Setup and Run
+## Setup

 ### Download or compile socks5 client

@@ -17,11 +17,11 @@ If you are using OSX or a Debian-based operating system, you can download the `n

 If you are using a different operating system, head over to the [Building from Source](https://nymtech.net/docs/binaries/building-nym.html) page for instructions on how to build the repository from source.

-### Initialise your socks5 client
+### Initialise Socks5 Client

-To initialise your `nym-socks5-client` you need to have an address of a Network Requester (NR). Nowadays NR is part of every Exit Gateway (`nym-node --mode exit-gateway`). The easiest way to get a NR address is to visit [harbourmaster.nymtech.net](https://harbourmaster.nymtech.net/) and scroll down to *SOCKS5 Network Requesters* table. There you can filter the NR by Gateways identity address, and other options.
+To initialise your `nym-socks5-client` you need to have an address of a Network Requester (NR). Nowadays NR is part of every Exit Gateway (`nym-node --mode exit-gateway`). The easiest way to get a NR address is to visit [harbourmaster.nymtech.net](https://harbourmaster.nymtech.net/) and open the tab called *SOCKS5 NETWORK REQUESTERS*. There you can filter the NR by Gateways identity address, and other options.

-Use the following command to initialise `nym-socs5-client` where `<ID>` can be anything you want (it's only for local config file storage) and `<PROVIDER>` is suplemented with a NR address:
+Use the following command to initialise `nym-socs5-client` where `<ID>` can be anything you want (it's only for local config file storage identification and never shared on the network) and `<PROVIDER>` is suplemented with a NR address:

 ```
 ./nym-socks5-client init --id <ID> --provider <PROVIDER>
@@ -37,9 +37,123 @@ Another option to find a NR address associated with a Gateway is to query nodes
 ```
 ~~~

-### Start your socks5 client
+## Run
+
 Now your client is initialised, start it with the following:

 ```
 ./nym-socks5-client run --id <ID>
 ```
+
+## Useful commands
+
+### Viewing Command `--help`
+
+You can check that your binaries are properly compiled with:
+
+```
+./nym-socks5-client --help
+```
+
+~~~admonish example collapsible=true title="Console output"
+```
+<!-- cmdrun ../../../../../target/release/nym-socks5-client --help -->
+```
+~~~
+
+You can check the necessary parameters for the available commands by running:
+
+```
+./nym-socks5-client <COMMAND> --help
+```
+For example `./nym-socks5-client run --help` will return all options associated with `run` command.
+
+~~~admonish example collapsible=true title="Console output"
+```
+<!-- cmdrun ../../../../../target/release/nym-socks5-client run --help -->
+```
+~~~
+
+### `build-info`
+
+A `build-info` command prints the build information like commit hash, rust version, binary version just like what command `--version` does. However, you can also specify an `--output=json` flag that will format the whole output as a json, making it an order of magnitude easier to parse.
+
+### Flags & Arguments
+
+* `--id`: A local identifier so that you can name your clients and keep track of them on your local system; it is **never** transmitted over the network.
+
+* `--use-reply-surbs`: This field denotes whether you wish to send [SURBs](https://nymtech.net/docs/architecture/traffic-flow.md#private-replies-using-surbs) along with your request. It defaults to `false` and must be explicitly set to `true` to activate.
+
+* `--use-anonymous-replies `: Specifies whether this client is going to use an anonymous sender tag for communication with the service provider. While this is going to hide its actual address information, it will make the actual communication slower and consume nearly double the bandwidth as it will require sending reply SURBs.
+
+* `--gateway`: By default your client will choose a random gateway to connect to. However, there are several options for choosing a gateway, if you do not want one that is randomly assigned to your client:
+
+* `--latency-based-selection`: This flag will choose a gateway based on its location relative to your client. This argument means that to select a gateway, your client will:
+	* fetch a list of all availiable gateways
+	* send few ping messages to all of them, and measure response times.
+	* create a weighted distribution to randomly choose one, favouring ones with lower latency.
+
+> Note this doesn't mean that your client will pick the closest gateway to you, but it will be far more likely to connect to gateway with a 20ms ping rather than 200ms
+
+## Configuring `nym-socks5-client`
+
+When you initalise a client instance, a configuration directory will be generated and stored in `$HOME_DIR/.nym/socks5-clients/<YOUR_CLIENT_ID>/`.
+
+```
+tree $HOME/.nym/socks5-clients/<YOUR_CLIENT_ID>
+├── config
+│   └── config.toml
+└── data
+    ├── ack_key.pem
+    ├── credentials_database.db
+    ├── gateways_registrations.sqlite
+    ├── persistent_reply_store.sqlite
+    ├── private_encryption.pem
+    ├── private_identity.pem
+    ├── public_encryption.pem
+    └── public_identity.pem
+```
+
+The `config.toml` file contains client configuration options, while the two `pem` files contain client key information.
+
+The generated files contain the client name, public/private keypairs, and gateway address. The name `<YOUR_CLIENT_ID>` in the example above is just a local identifier so that you can name your clients.
+
+### Configuring your client for Docker
+
+By default, the native client listens to host `127.0.0.1`. However this can be an issue if you wish to run a client in a Dockerized environment, where it can be convenenient to listen on a different host such as `0.0.0.0`.
+
+You can set this via the `--host` flag during either the `init` or `run` commands.
+
+Alternatively, a custom host can be set in the `config.toml` file under the `socket` section. If you do this, remember to restart your client process.
+
+### Automating your socks5 client with systemd
+
+Create a service file for the socks5 client at `/etc/systemd/system/nym-socks5-client.service`:
+
+```ini
+[Unit]
+Description=Nym Socks5 Client
+StartLimitInterval=350
+StartLimitBurst=10
+
+[Service]
+User=nym # replace this with whatever user you wish
+LimitNOFILE=65536
+ExecStart=/home/nym/nym-socks5-client run --id <your_id>
+KillSignal=SIGINT
+Restart=on-failure
+RestartSec=30
+
+[Install]
+WantedBy=multi-user.target
+```
+
+Now enable and start your socks5 client:
+
+```
+systemctl enable nym-socks5-client.service
+systemctl start nym-socks5-client.service
+
+# you can always check your socks5 client has succesfully started with:
+systemctl status nym-socks5-client.service
+```
@@ -1,7 +1,7 @@
 # NymVPN CLI Guide

-```admonish tip title="web3summit testing"
-**If you testing NymVPN CLI on Web3 Summit Berlin, visit our event page with all info tailored for the event: [nym-vpn-cli.sandbox.nymtech.net](https://nym-vpn-cli.sandbox.nymtech.net/).**
+```admonish tip title="NymVPN CLI Testnet"
+If you testing NymVPN CLI and want to try our Sandbox testnet environment, you can visit an explicit guide at [nym-vpn-cli.sandbox.nymtech.net](https://nym-vpn-cli.sandbox.nymtech.net/). This page alco contains an auto generating access token button.
 ```

 ```admonish info
@@ -225,7 +225,7 @@ Options:

 ## Testnet environment

-If you want to run NymVPN CLI in Nym Sandbox environment, there are a few adjustments to be done:
+If you want to run NymVPN CLI in Nym Sandbox environment, there are a few adjustments to be done. You can follow the steps below or follow more explicit guide on [nym-vpn-cli.sandbox.nymtech.net](https://nym-vpn-cli.sandbox.nymtech.net), including the access token auto generation button.

 1. Create Sandbox environment config file by saving [this](https://raw.githubusercontent.com/nymtech/nym/develop/envs/sandbox.env) as `sandbox.env` in the same directory as your NymVPN binaries:
 ```sh
@@ -56,7 +56,7 @@ Project Smoosh is a code name for a process in which different components of Nym

 ## Exit Gateway

-Part of the the transition under code name [Project Smoosh](#project-smoosh) is a creation of [Nym Exit Gateway](https://nymtech.net/operators/legal/exit-gateway.html) functionality. The operators running Gateways would have to “open” their nodes to a wider range of online services, in a similar fashion to Tor exit relays. The main change will be to expand the original short [allowed.list](https://nymtech.net/.wellknown/network-requester/standard-allowed-list.txt) to a more permissive setup. An [exit policy](https://nymtech.net/.wellknown/network-requester/exit-policy.txt) will constrain the hosts that the users of the Nym VPN and Mixnet can connect to. This will be done in an effort to protect the operators, as Gateways will act both as SOCKS5 Network Requesters, and exit nodes for IP traffic from Nym VPN and Mixnet clients.
+Part of the transition under code name [Project Smoosh](#project-smoosh) is a creation of [Nym Exit Gateway](https://nymtech.net/operators/legal/exit-gateway.html) functionality. The operators running Gateways would have to “open” their nodes to a wider range of online services, in a similar fashion to Tor exit relays. The main change will be to expand the original short [allowed.list](https://nymtech.net/.wellknown/network-requester/standard-allowed-list.txt) to a more permissive setup. An [exit policy](https://nymtech.net/.wellknown/network-requester/exit-policy.txt) will constrain the hosts that the users of the Nym VPN and Mixnet can connect to. This will be done in an effort to protect the operators, as Gateways will act both as SOCKS5 Network Requesters, and exit nodes for IP traffic from Nym VPN and Mixnet clients.

 * Read more how the exit policy gets implemented [here](https://nymtech.net/operators/faq/smoosh-faq.html#how-will-the-exit-policy-be-implemented)
 * Check out [Nym Operators Legal Forum](https://nymtech.net/operators/legal/exit-gateway.html)
@@ -1,19 +1,13 @@
-# NymVPN alpha
+# NymVPN beta

-<div style="padding:56.25% 0 0 0;position:relative;"><iframe src="https://player.vimeo.com/video/897010658?h=1f55870fe6&amp;badge=0&amp;autopause=0&amp;player_id=0&amp;app_id=58479" frameborder="0" allow="autoplay; fullscreen; picture-in-picture" style="position:absolute;top:0;left:0;width:100%;height:100%;" title="NYMVPN alpha demo 37C3"></iframe></div><script src="https://player.vimeo.com/api/player.js"></script>
-
-```admonish tip title="web3summit testing"
-**If you testing NymVPN CLI on Web3 Summit Berlin, visit our event page with all info tailored for the event: [nym-vpn-cli.sandbox.nymtech.net](https://nym-vpn-cli.sandbox.nymtech.net/).**
-```
-
-**NymVPN alpha** is a client that uses [Nym Mixnet](https://nymtech.net) to anonymise all of a user's internet traffic through either a 5-hop mixnet (for a full network privacy) or the faster 2-hop decentralised VPN (with some extra features).
+[**NymVPN**](https://nymvpn.com/en) is a client that uses [Nym Mixnet](https://nymtech.net) to anonymise all of a user's internet traffic through either a 5-hop mixnet for a *full network privacy* or the *faster* 2-hop decentralised VPN (with some extra features).


-**You are invited to take part in the alpha testing** of this new application. Register for private testing round at [nymvpn.com](https://nymvpn.com/en), that will grant you access to the [download page](https://nymvpn.com/download). Visit [NymVPN Support & FAQ](https://nymvpn.com/en/support) or join the [NymVPN matrix channel](https://matrix.to/#/#NymVPN:nymtech.chat) if you have any questions, comments or blockers.
+**You are invited to take part in the beta testing** of this new application. Register for private testing round at [nymvpn.com](https://nymvpn.com/en), that will grant you access to the [download page](https://nymvpn.com/download). Visit [NymVPN Support & FAQ](https://nymvpn.com/en/support) or join the [NymVPN matrix channel](https://matrix.to/#/#NymVPN:nymtech.chat) if you have any questions, comments or blockers.

 Checkout the [release page](https://github.com/nymtech/nym-vpn-client/releases) for available binaries.

-*NOTE: NymVPN alpha is experimental software for testing purposes only.*
+*NOTE: NymVPN beta is experimental software for testing purposes only.*


 ## NymVPN Overview
@@ -32,7 +26,4 @@ client ───► Gateway ──┘  mix  │  mix  ┌─►mix ───►
                         mix  └─►mix──┘  mix
 ```

-Users can switch to 2-hop only mode, which is a faster but less private option. In this mode traffic is only sent between the two Gateways, and is not passed between Mix Nodes. It uses Mixnet Sphinx packets with shorter, fixed routes, which improve latency, but doesn't offer the same level of protection as the 5 hop mode.
-<!-- TO BE IMPLEMENTED:
-Users can switch to 2-hop only mode, which is a faster but less private option. In this mode traffic is only sent between the two Gateways, and is not passed between Mix Nodes. The client than use two wireguard tunnels with the entry and exit gateway, the Exit Gateway one being tunnelled itself through the entry gateway tunnel. NymVPN uses Mullvad libraries for wrapping `wireguard-go` and to setup local routing rules to route all traffic to the TUN virtual network device.
-->
+Users can switch to 2-hop only mode, which is a faster but less private option. In this mode traffic is only sent between the two gateways, and is not passed through the mixnet. The client than use two wireguard tunnels with the Entry and Exit Gateway nodes, the Exit Gateway one being tunnelled itself through the Entry Gateway tunnel. NymVPN uses Mullvad libraries for wrapping `wireguard-go` and to setup local routing rules to route all traffic to the TUN virtual network device.
@@ -33,7 +33,7 @@ I therefore consider the risk for an exit node operator to become involved in a

 Nevertheless, in such a situation, exit node operators providers would have to provide the authorities with the information already available to them (Art. 22 Para. 3 SPTA), and they would have to tolerate monitoring by the authorities or by the persons commissioned by the service of the data which the monitored person transmits or stores using derived communications services (Art. 27 Para. 1 SPTA; see above, 5.1.1.2). There is no duty of data retention for providers of derived communication services, though.

-The the risk for exit node operators of being upgraded according to Art. 22 Para. 4 SPTA is low to non existent for the reasons mentioned above.
+The risk for exit node operators of being upgraded according to Art. 22 Para. 4 SPTA is low to non existent for the reasons mentioned above.

 #### Intelligence Service Law

@@ -111,11 +111,12 @@ The most common usage may be `./node_api_check.py query_stats <ID_KEY>` where `<

 **Optional arguments**

-| Flag                   | Shortcut | Description                                                 |
-| :---                   |     :---      | :---                                                        |
-| `--markdown`           |     `-m`      | returns output in markdown format                           |
-| `--no_routing_history` |     `-n`      | returns output without routing history which can be lengthy |
-| `--output`             |     `-o`      | exports output to a file, possible to add a target path     |
+| Flag                   | Shortcut | Description                                                    |
+| :---                   |   :---   | :---                                                           |
+| `--markdown`           |   `-m`   | returns output in markdown format                              |
+| `--no_routing_history` |   None   | returns output without routing history which can be lengthy    |
+| `--no_verloc_metrics`  |   None   | returns output without verloc measurement which can be lengthy |
+| `--output`             |   `-o`   | exports output to a file, possible to add a target path        |

 #### `version_count`

@@ -123,3 +124,7 @@ Another command is `version_count` where at least one `nym-node` version is requ
 ```sh
 ./node_api_check version_count 1.1.0 1.1.1 1.1.2 1.1.3 --markdown
 ```
+
+```admonish tip
+To see a quick overview of `nym-node` version distribution in numbers and graph, visit [Nym Harbourmaster](https://harbourmaster.nymtech.net).
+```
@@ -17,7 +17,7 @@ log = { workspace = true }
 maxminddb = { workspace = true }
 okapi = { workspace = true, features = ["impl_json_schema"] }
 pretty_env_logger = { workspace = true }
-rand = "0.8.5"
+rand = { workspace = true }
 rand_pcg = { workspace = true }
 rand_seeder = { workspace = true }
 reqwest = { workspace = true }
@@ -18,7 +18,7 @@ use futures::{
    FutureExt, StreamExt,
 };
 use nym_credentials::ecash::utils::{ecash_today, EcashTime};
-use nym_credentials_interface::{ClientTicket, CredentialSpendingData};
+use nym_credentials_interface::{ClientTicket, CredentialSpendingData, TicketType};
 use nym_gateway_requests::models::CredentialSpendingRequest;
 use nym_gateway_requests::{
    types::{BinaryRequest, ServerResponse},
@@ -104,6 +104,9 @@ pub enum RequestHandlingError {
        "the received payment contained more than a single ticket. that's currently not supported"
    )]
    MultipleTickets,
+
+    #[error("{0}")]
+    UnknownTicketType(#[from] nym_credentials_interface::UnknownTicketType),
 }

 impl RequestHandlingError {
@@ -414,6 +417,7 @@ where

        // check if the credential hasn't been spent before
        let serial_number = credential.data.encoded_serial_number();
+        let credential_type = TicketType::try_from_encoded(credential.data.payment.t_type)?;

        if credential.data.payment.spend_value != 1 {
            return Err(RequestHandlingError::MultipleTickets);
@@ -433,7 +437,7 @@ where
        // TODO: double storing?
        // self.store_spent_credential(serial_number_bs58).await?;

-        let bandwidth = Bandwidth::ticket_amount(Default::default());
+        let bandwidth = Bandwidth::ticket_amount(credential_type.into());

        self.increase_bandwidth(bandwidth, spend_date).await?;

@@ -12,7 +12,7 @@ use futures::channel::mpsc::UnboundedReceiver;
 use futures::{Stream, StreamExt};
 use nym_api_requests::constants::MIN_BATCH_REDEMPTION_DELAY;
 use nym_api_requests::ecash::models::{BatchRedeemTicketsBody, VerifyEcashTicketBody};
-use nym_credentials_interface::ClientTicket;
+use nym_credentials_interface::{ClientTicket, TicketType};
 use nym_gateway_storage::Storage;
 use nym_validator_client::nym_api::EpochId;
 use nym_validator_client::nyxd::contract_traits::{
@@ -362,10 +362,14 @@ where
    }

    #[instrument(skip(self))]
-    async fn revoke_ticket_bandwidth(&self, ticket_id: i64) -> Result<(), EcashTicketError> {
+    async fn revoke_ticket_bandwidth(
+        &self,
+        ticket_id: i64,
+        ticket_type: TicketType,
+    ) -> Result<(), EcashTicketError> {
        warn!("revoking bandwidth associated with ticket {ticket_id} since it failed verification");

-        let bytes_to_revoke = Bandwidth::ticket_amount(Default::default()).value() as f32
+        let bytes_to_revoke = Bandwidth::ticket_amount(ticket_type.into()).value() as f32
            * self.config.revocation_bandwidth_penalty;
        let to_revoke_bi2 = bibytes2(bytes_to_revoke as f64);

@@ -385,6 +389,8 @@ where
        api_clients: Option<RwLockReadGuard<'_, Vec<EcashApiClient>>>,
    ) -> Result<bool, EcashTicketError> {
        let ticket_id = pending.ticket.ticket_id;
+        let ticket_type =
+            TicketType::try_from_encoded(pending.ticket.spending_data.payment.t_type)?;
        let api_clients = match api_clients {
            Some(clients) => clients,
            None => {
@@ -444,7 +450,7 @@ where
                .storage
                .update_rejected_ticket(pending.ticket.ticket_id)
                .await?;
-            self.revoke_ticket_bandwidth(pending.ticket.ticket_id)
+            self.revoke_ticket_bandwidth(pending.ticket.ticket_id, ticket_type)
                .await?;
        }

@@ -28,6 +28,9 @@ pub enum EcashTicketError {
    #[error("provided payinfo's timestamp is invalid")]
    InvalidPayInfoTimestamp,

+    #[error("{0}")]
+    InvalidTicketType(#[from] nym_credentials_interface::UnknownTicketType),
+
    #[error("received payinfo is a duplicate")]
    DuplicatePayInfo,

--- a/Show More
+++ b/Show More