even more logs

possibly useful, or not, logs for topology request
make embedded NR/IPR ignore performance of the gateway
2024-06-20 16:33:54 +01:00 · 2024-06-20 16:07:11 +01:00 · 2024-06-20 14:59:13 +01:00
456 changed files with 24584 additions and 1881 deletions
@@ -41,8 +41,8 @@ jobs:
 # This is a workaround replacement which builds on the last working commit b332a6b55668f60988e36961f3f62a794ba82ddb and then on current branch
      - name: Save current branch to ~/current_branch
        run: git rev-parse --abbrev-ref HEAD > ~/current_branch
-      - name: Git pull, reset & switch to b332a6b55668f60988e36961f3f62a794ba82ddb
-        run: git pull && git reset --hard && git checkout b332a6b55668f60988e36961f3f62a794ba82ddb
+      - name: Git pull & switch to b332a6b55668f60988e36961f3f62a794ba82ddb
+        run: git pull && git checkout b332a6b55668f60988e36961f3f62a794ba82ddb
      - name: Build all projects in documentation/ & move to ~/dist/docs/ from b332a6b55668f60988e36961f3f62a794ba82ddb
        run: cd documentation && ./build_all_to_dist.sh

@@ -104,9 +104,12 @@ jobs:
          name: nym-binaries-artifacts
          path: |
            target/release/nym-client
+            target/release/nym-gateway
+            target/release/nym-mixnode
            target/release/nym-socks5-client
            target/release/nym-api
            target/release/nym-network-requester
+            target/release/nym-network-statistics
            target/release/nym-cli
            target/release/nymvisor
            target/release/nym-node
@@ -121,9 +124,12 @@ jobs:
          OUTPUT_DIR: ci-builds/${{ github.ref_name }}
        run: |
          cp target/release/nym-client $OUTPUT_DIR
+          cp target/release/nym-gateway $OUTPUT_DIR
+          cp target/release/nym-mixnode $OUTPUT_DIR
          cp target/release/nym-socks5-client $OUTPUT_DIR
          cp target/release/nym-api $OUTPUT_DIR
          cp target/release/nym-network-requester $OUTPUT_DIR
+          cp target/release/nym-network-statistics $OUTPUT_DIR
          cp target/release/nymvisor $OUTPUT_DIR
          cp target/release/nym-node $OUTPUT_DIR
          cp target/release/nym-cli $OUTPUT_DIR
@@ -46,8 +46,8 @@ jobs:
 # This is a workaround replacement which builds on the last working commit b332a6b55668f60988e36961f3f62a794ba82ddb and then on current branch
      - name: Save current branch to ~/current_branch
        run: git rev-parse --abbrev-ref HEAD > ~/current_branch
-      - name: Git pull, reset & switch to b332a6b55668f60988e36961f3f62a794ba82ddb
-        run: git pull && git reset --hard && git checkout b332a6b55668f60988e36961f3f62a794ba82ddb
+      - name: Git pull & switch to b332a6b55668f60988e36961f3f62a794ba82ddb
+        run: git pull && git checkout b332a6b55668f60988e36961f3f62a794ba82ddb
      - name: Build all projects in documentation/ & move to ~/dist/docs/ from b332a6b55668f60988e36961f3f62a794ba82ddb
        run: cd documentation && ./build_all_to_dist.sh

@@ -0,0 +1,65 @@
+name: ci-nym-connect-desktop-rust
+
+on:
+  pull_request:
+    paths:
+      - "nym-connect/desktop/src-tauri/**"
+      - "nym-connect/desktop/src-tauri/Cargo.toml"
+      - "clients/client-core/**"
+      - "clients/socks5/**"
+      - "common/**"
+      - "gateway/gateway-requests/**"
+      - "contracts/vesting/**"
+      - "nym-api/nym-api-requests/**"
+
+jobs:
+  build:
+    runs-on: [self-hosted, custom-linux]
+    env:
+      CARGO_TERM_COLOR: always
+    steps:
+      - 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 squashfs-tools libayatana-appindicator3-dev
+        continue-on-error: true
+
+      - name: Check out repository code
+        uses: actions/checkout@v2
+
+      - name: Install rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+          components: rustfmt, clippy
+
+      - name: Check formatting
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --manifest-path nym-connect/desktop/Cargo.toml --all -- --check
+
+      - name: Build all binaries
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --manifest-path nym-connect/desktop/Cargo.toml --workspace
+
+      - name: Run all tests
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --manifest-path nym-connect/desktop/Cargo.toml --workspace
+
+      - uses: actions-rs/clippy-check@v1
+        name: Clippy checks
+        continue-on-error: true
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --manifest-path nym-connect/desktop/Cargo.toml --workspace --all-features
+
+      - name: Run clippy
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: --manifest-path nym-connect/desktop/Cargo.toml --workspace --all-features -- -D warnings
@@ -0,0 +1,72 @@
+name: ci-nym-connect-desktop
+
+on:
+  pull_request:
+    paths:
+      - 'nym-connect/desktop/**'
+
+defaults:
+  run:
+    working-directory: nym-connect/desktop
+
+jobs:
+  build:
+    runs-on: custom-linux
+    steps:
+    - uses: actions/checkout@v2
+    - 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
+      with:
+        node-version: 18
+    - name: Install Yarn
+      run: npm install -g yarn
+    - name: Install Rust stable
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+    - name: Install wasm-pack
+      run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+    - name: Install project dependencies
+      run: cd ../.. && yarn --network-timeout 100000
+      
+    - name: Install app dependencies
+      run: yarn
+      continue-on-error: true
+      
+    - name: Set environment from the example
+      run: cp .env.sample .env
+    - run: yarn storybook:build
+    - name: Deploy branch to CI www
+      continue-on-error: true
+      uses: easingthemes/ssh-deploy@main
+      env:
+        SSH_PRIVATE_KEY: ${{ secrets.CI_WWW_SSH_PRIVATE_KEY }}
+        ARGS: "-rltgoDzvO --delete"
+        SOURCE: "nym-connect/desktop/storybook-static/"
+        REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
+        REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
+        TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/nym-connect-${{ env.GITHUB_REF_SLUG }}
+        EXCLUDE: "/dist/, /node_modules/"
+    - name: Matrix - Node Install
+      run: npm install
+      working-directory: .github/workflows/support-files
+    - name: Matrix - Send Notification
+      env:
+        NYM_NOTIFICATION_KIND: nym-connect
+        NYM_PROJECT_NAME: "nym-connect"
+        NYM_CI_WWW_BASE: "${{ secrets.NYM_CI_WWW_BASE }}"
+        NYM_CI_WWW_LOCATION: "nym-connect-${{ env.GITHUB_REF_SLUG }}"
+        GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
+        GIT_BRANCH: "${GITHUB_REF##*/}"
+        IS_SUCCESS: "${{ job.status == 'success' }}"
+        MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
+        MATRIX_ROOM: "${{ secrets.MATRIX_ROOM }}"
+        MATRIX_USER_ID: "${{ secrets.MATRIX_USER_ID }}"
+        MATRIX_TOKEN: "${{ secrets.MATRIX_TOKEN }}"
+        MATRIX_DEVICE_ID: "${{ secrets.MATRIX_DEVICE_ID }}"
+      uses: docker://keybaseio/client:stable-node
+      with:
+        args: .github/workflows/support-files/notifications/entry_point.sh
@@ -0,0 +1,92 @@
+name: nightly-nym-connect-desktop-build
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '14 1 * * *'
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    env:
+      CARGO_TERM_COLOR: always
+      MANIFEST_PATH: --manifest-path nym-connect/desktop/Cargo.toml
+    continue-on-error: true
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+
+      - 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
+        if: matrix.os == 'ubuntu-20.04'
+
+      - name: Install rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+          components: rustfmt, clippy
+
+      - name: Check formatting
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: ${{ env.MANIFEST_PATH }} --all -- --check
+
+      - name: Build
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: ${{ env.MANIFEST_PATH }} --release --workspace
+
+      - name: Unit tests
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: ${{ env.MANIFEST_PATH }} --workspace
+
+      - name: Clippy
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: ${{ env.MANIFEST_PATH }} --workspace --all-targets -- -D warnings
+
+  notification:
+    needs: build
+    runs-on: custom-linux
+    steps:
+      - name: Collect jobs status
+        uses: technote-space/workflow-conclusion-action@v2
+      - name: Check out repository code
+        uses: actions/checkout@v3
+      - name: install npm
+        uses: actions/setup-node@v3
+        if: env.WORKFLOW_CONCLUSION == 'failure'
+        with:
+          node-version: 18
+      - name: Matrix - Node Install
+        if: env.WORKFLOW_CONCLUSION == 'failure'
+        run: npm install
+        working-directory: .github/workflows/support-files
+      - name: Matrix - Send Notification
+        if: env.WORKFLOW_CONCLUSION == 'failure'
+        env:
+          NYM_NOTIFICATION_KIND: nightly
+          NYM_PROJECT_NAME: "nym-connect-desktop-nightly-build"
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
+          GIT_BRANCH: "${GITHUB_REF##*/}"
+          IS_SUCCESS: "${{ env.WORKFLOW_CONCLUSION == 'success' }}"
+          MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
+          MATRIX_ROOM: "${{ secrets.MATRIX_ROOM_NIGHTLY }}"
+          MATRIX_USER_ID: "${{ secrets.MATRIX_USER_ID }}"
+          MATRIX_TOKEN: "${{ secrets.MATRIX_TOKEN }}"
+          MATRIX_DEVICE_ID: "${{ secrets.MATRIX_DEVICE_ID }}"
+        uses: docker://keybaseio/client:stable-node
+        with:
+          args: .github/workflows/support-files/notifications/entry_point.sh
@@ -27,17 +27,23 @@ jobs:
      release_id: ${{ steps.create-release.outputs.id }}
      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].published_at }}
      client_hash: ${{ steps.binary-hashes.outputs.client_hash }}
+      mixnode_hash: ${{ steps.binary-hashes.outputs.mixnode_hash }}
+      gateway_hash: ${{ steps.binary-hashes.outputs.gateway_hash }}
      nymvisor_hash: ${{ steps.binary-hashes.outputs.nymvisor_hash }}
      nymnode_hash: ${{ steps.binary-hashes.outputs.nymnode_hash }}
      socks5_hash: ${{ steps.binary-hashes.outputs.socks5_hash }}
      netreq_hash: ${{ steps.binary-hashes.outputs.netreq_hash }}
      cli_hash: ${{ steps.binary-hashes.outputs.cli_hash }}
+      netstat_hash: ${{ steps.binary-hashes.outputs.netstat_hash }}
      client_version: ${{ steps.binary-versions.outputs.client_version }}
+      mixnode_version: ${{ steps.binary-versions.outputs.mixnode_version }}
+      gateway_version: ${{ steps.binary-versions.outputs.gateway_version }}
      nymvisor_version: ${{ steps.binary-versions.outputs.nymvisor_version }}
      nymnode_version: ${{ steps.binary-versions.outputs.nymnode_version }}
      socks5_version: ${{ steps.binary-versions.outputs.socks5_version }}
      netreq_version: ${{ steps.binary-versions.outputs.netreq_version }}
      cli_version: ${{ steps.binary-versions.outputs.cli_version }}
+      netstat_version: ${{ steps.binary-versions.outputs.netstat_version }}

    steps:
      - uses: actions/checkout@v3
@@ -69,9 +75,12 @@ jobs:
          path: |
            target/release/explorer-api
            target/release/nym-client
+            target/release/nym-gateway
+            target/release/nym-mixnode
            target/release/nym-socks5-client
            target/release/nym-api
            target/release/nym-network-requester
+            target/release/nym-network-statistics
            target/release/nym-cli
            target/release/nymvisor
            target/release/nym-node
@@ -85,9 +94,12 @@ jobs:
          files: |
            target/release/explorer-api
            target/release/nym-client
+            target/release/nym-gateway
+            target/release/nym-mixnode
            target/release/nym-socks5-client
            target/release/nym-api
            target/release/nym-network-requester
+            target/release/nym-network-statistics
            target/release/nym-cli
            target/release/nymvisor
            target/release/nym-node
@@ -0,0 +1,122 @@
+name: publish-nym-connect-macos
+on:
+  workflow_dispatch:
+  release:
+    types: [created]
+
+defaults:
+  run:
+    working-directory: nym-connect/desktop
+
+jobs:
+  publish-tauri:
+    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [macos-12-large]
+    runs-on: ${{ matrix.platform }}
+
+    outputs:
+      release_id: ${{ steps.create-release.outputs.id }}
+      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].created_at }}
+      version: ${{ steps.release-info.outputs.version }}
+      filename: ${{ steps.release-info.outputs.filename }}
+      file_hash: ${{ steps.release-info.outputs.file_hash }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Install Rust stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: wasm32-unknown-unknown
+
+      - name: Install wasm-pack
+        run: |
+          export WASM_PACK_VERSION="v0.12.1" 
+          curl -LO https://github.com/rustwasm/wasm-pack/releases/download/${WASM_PACK_VERSION}/wasm-pack-${WASM_PACK_VERSION}-x86_64-apple-darwin.tar.gz
+          tar xvzf wasm-pack-${WASM_PACK_VERSION}-x86_64-apple-darwin.tar.gz -C $HOME/.cargo/bin --strip-components=1
+          rm wasm-pack-${WASM_PACK_VERSION}-x86_64-apple-darwin.tar.gz
+
+      - name: Install the Apple developer certificate for code signing
+        env:
+          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+        run: |
+          # create variables
+          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+
+          # import certificate and provisioning profile from secrets
+          echo -n "$APPLE_CERTIFICATE" | base64 --decode --output $CERTIFICATE_PATH
+
+          # create temporary keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+
+          # import certificate to keychain
+          security import $CERTIFICATE_PATH -P "$APPLE_CERTIFICATE_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+          security list-keychain -d user -s $KEYCHAIN_PATH
+
+      - name: Create env file
+        uses: timheuer/base64-to-file@v1.2
+        with:
+          fileName: '.env'
+          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
+
+      - name: Install project dependencies
+        shell: bash
+        run: cd .. && yarn --network-timeout 100000
+
+      - name: Install app dependencies and build it
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_IDENTITY_ID }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          SENTRY_DSN_RUST: ${{ secrets.SENTRY_DSN_RUST }}
+          SENTRY_DSN_JS: ${{ secrets.SENTRY_DSN_JS }}
+        run: yarn && yarn build
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: nym-connect_1.0.0_x64.dmg
+          path: nym-connect/desktop/target/release/bundle/dmg/nym-connect_1*_x64.dmg
+          retention-days: 30
+
+      - name: Clean up keychain
+        if: ${{ always() }}
+        run: |
+          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
+        if: github.event_name == 'release'
+        with:
+          files: |
+            nym-connect/desktop/target/release/bundle/dmg/*.dmg
+            nym-connect/desktop/target/release/bundle/macos/*.app.tar.gz*
+
+  push-release-data:
+    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
+    uses: ./.github/workflows/release-calculate-hash.yml
+    needs: publish-tauri
+    with:
+      release_tag: ${{ github.ref_name }}
+    secrets: inherit
@@ -0,0 +1,89 @@
+name: publish-nym-connect-ubuntu
+on:
+  workflow_dispatch:
+  release:
+    types: [created]
+
+defaults:
+  run:
+    working-directory: nym-connect/desktop
+
+jobs:
+  publish-tauri:
+    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [custom-ubuntu-20.04]
+    runs-on: ${{ matrix.platform }}
+
+    outputs:
+      release_id: ${{ steps.create-release.outputs.id }}
+      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].created_at }}
+      version: ${{ steps.release-info.outputs.version }}
+      filename: ${{ steps.release-info.outputs.filename }}
+      file_hash: ${{ steps.release-info.outputs.file_hash }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Tauri dependencies
+        run: >
+          sudo apt-get update &&
+          sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
+        continue-on-error: true
+
+      - name: Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Install Rust stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+
+      - name: Install project dependencies
+        shell: bash
+        run: cd .. && yarn --network-timeout 100000
+
+      - name: Install app dependencies
+        run: yarn
+
+      - name: Create env file
+        uses: timheuer/base64-to-file@v1.2
+        with:
+          fileName: '.env'
+          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
+
+      - name: Build app
+        run: yarn build
+        env:
+          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          SENTRY_DSN_RUST: ${{ secrets.SENTRY_DSN_RUST }}
+          SENTRY_DSN_JS: ${{ secrets.SENTRY_DSN_JS }}
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: nym-connect.AppImage.tar.gz
+          path: nym-connect/desktop/target/release/bundle/appimage/nym-connect_1*_amd64.AppImage
+          retention-days: 30
+
+      - id: create-release
+        name: Upload to release based on tag name
+        uses: softprops/action-gh-release@v1
+        if: github.event_name == 'release'
+        with:
+          files: |
+            nym-connect/desktop/target/release/bundle/appimage/*.AppImage
+            nym-connect/desktop/target/release/bundle/appimage/*.AppImage.tar.gz*
+
+  push-release-data:
+    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
+    uses: ./.github/workflows/release-calculate-hash.yml
+    needs: publish-tauri
+    with:
+      release_tag: ${{ github.ref_name }}
+    secrets: inherit
@@ -0,0 +1,108 @@
+name: publish-nym-connect-win10
+on:
+  workflow_dispatch:
+  release:
+    types: [created]
+
+defaults:
+  run:
+    working-directory: nym-connect/desktop
+
+jobs:
+  publish-tauri:
+    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [windows10]
+    runs-on: ${{ matrix.platform }}
+
+    outputs:
+      release_id: ${{ steps.create-release.outputs.id }}
+      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].created_at }}
+      version: ${{ steps.release-info.outputs.version }}
+      filename: ${{ steps.release-info.outputs.filename }}
+      file_hash: ${{ steps.release-info.outputs.file_hash }}
+
+    steps:
+      - name: Clean up first
+        continue-on-error: true
+        working-directory: .
+        run: |
+          cd ..
+          del /s /q /A:H nym
+          rmdir /s /q nym
+
+      - uses: actions/checkout@v3
+
+      - name: Import signing certificate
+        env:
+          WINDOWS_CERTIFICATE: ${{ secrets.WINDOWS_CERTIFICATE }}
+          WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
+        run: |
+          New-Item -ItemType directory -Path certificate
+          Set-Content -Path certificate/tempCert.txt -Value $env:WINDOWS_CERTIFICATE
+          certutil -decode certificate/tempCert.txt certificate/certificate.pfx
+          Remove-Item -path certificate -include tempCert.txt
+          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
+        with:
+          node-version: 18
+
+      - name: Install Rust stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+
+      - name: Create env file
+        uses: timheuer/base64-to-file@v1.2
+        with:
+          fileName: '.env'
+          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
+
+      - name: Install project dependencies
+        shell: bash
+        run: cd .. && yarn --network-timeout 100000
+
+      - name: Install app dependencies
+        shell: bash
+        run: yarn --network-timeout 100000
+
+      - name: Build and sign it
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ENABLE_CODE_SIGNING: ${{ secrets.WINDOWS_CERTIFICATE }}
+          WINDOWS_CERTIFICATE: ${{ secrets.WINDOWS_CERTIFICATE }}
+          WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
+          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          SENTRY_DSN_RUST: ${{ secrets.SENTRY_DSN_RUST }}
+          SENTRY_DSN_JS: ${{ secrets.SENTRY_DSN_JS }}
+        run: yarn build
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: nym-connect_1.0.0_x64_en-US.msi
+          path: nym-connect/desktop/target/release/bundle/msi/nym-connect_1*_x64_en-US.msi
+          retention-days: 30
+
+      - id: create-release
+        name: Upload to release based on tag name
+        uses: softprops/action-gh-release@v1
+        if: github.event_name == 'release'
+        with:
+          files: |
+            nym-connect/desktop/target/release/bundle/msi/*.msi
+            nym-connect/desktop/target/release/bundle/msi/*.msi.zip*
+
+  push-release-data:
+    if: ${{ (startsWith(github.ref, 'refs/tags/nym-connect-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
+    uses: ./.github/workflows/release-calculate-hash.yml
+    needs: publish-tauri
+    with:
+      release_tag: ${{ github.ref_name }}
+    secrets: inherit
@@ -0,0 +1,29 @@
+const Handlebars = require('handlebars');
+const fs = require('fs');
+const path = require('path');
+
+async function addToContextAndValidate(context) {
+  if (!context.env.NYM_CI_WWW_LOCATION) {
+    throw new Error('Please ensure the env var NYM_CI_WWW_LOCATION is set');
+  }
+  if (!context.env.NYM_CI_WWW_BASE) {
+    throw new Error('Please ensure the env var NYM_CI_WWW_BASE is set');
+  }
+}
+
+async function getMessageBody(context) {
+  const source = fs
+    .readFileSync(
+      context.env.IS_SUCCESS === 'true'
+        ? path.resolve(__dirname, 'templates', 'success')
+        : path.resolve(__dirname, 'templates', 'failure'),
+    )
+    .toString();
+  const template = Handlebars.compile(source);
+  return template(context);
+}
+
+module.exports = {
+  addToContextAndValidate,
+  getMessageBody,
+};
@@ -0,0 +1,16 @@
+🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥
+> :rocket: {{ env.NYM_PROJECT_NAME }}
+>
+> 🔴 **FAILURE** :cry:
+>
+> `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }}
+>
+> `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }}
+>
+> `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }}
+>
+
+Commit message:
+```
+{{ env.GIT_COMMIT_MESSAGE }}
+```
@@ -0,0 +1,16 @@
+🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩
+> :rocket: {{ env.NYM_PROJECT_NAME }}  ➡️➡️➡️➡️➡️ **View storybook:** https://{{ env.NYM_CI_WWW_LOCATION }}.{{ env.NYM_CI_WWW_BASE }}/
+>
+> ✅ **SUCCESS**
+>
+> `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }}
+>
+> `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }}
+>
+> `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }}
+>
+
+Commit message by `{{ env.GITHUB_ACTOR }}` at {{ timestamp }}:
+```
+{{ env.GIT_COMMIT_MESSAGE }}
+```
@@ -4,7 +4,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://

 ## [Unreleased]

-## [2024.6-chomp] (2024-06-25)
+## [2024.6-chomp] (2024-06-14)

 - Remove additional code as part of Ephemera Purge and SP and contracts ([#4650])
 - bugfix: make sure nym-api can handle non-cw2 (or without detailed build info) compliant contracts ([#4648])
@@ -2100,7 +2100,7 @@ dependencies = [
 "dotenvy",
 "humantime-serde",
 "isocountry",
- "itertools 0.12.1",
+ "itertools 0.10.5",
 "log",
 "maxminddb",
 "nym-bin-common",
@@ -2221,7 +2221,7 @@ dependencies = [
 "atomic 0.6.0",
 "pear",
 "serde",
- "toml 0.8.14",
+ "toml 0.8.12",
 "uncased",
 "version_check",
 ]
@@ -3272,6 +3272,15 @@ dependencies = [
 "either",
 ]

+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -4273,7 +4282,7 @@ dependencies = [
 "ff",
 "getrandom 0.2.15",
 "group",
- "itertools 0.12.1",
+ "itertools 0.10.5",
 "nym-dkg",
 "nym-pemstore",
 "rand 0.8.5",
@@ -4528,6 +4537,7 @@ dependencies = [
 "nym-node-http-api",
 "nym-pemstore",
 "nym-sphinx",
+ "nym-statistics-common",
 "nym-task",
 "nym-types",
 "nym-validator-client",
@@ -4623,7 +4633,6 @@ version = "0.1.0"
 dependencies = [
 "async-trait",
 "http 1.1.0",
- "nym-bin-common",
 "reqwest 0.12.4",
 "serde",
 "serde_json",
@@ -4930,6 +4939,7 @@ dependencies = [
 "nym-socks5-proxy-helpers",
 "nym-socks5-requests",
 "nym-sphinx",
+ "nym-statistics-common",
 "nym-task",
 "nym-types",
 "pretty_env_logger",
@@ -4950,6 +4960,23 @@ dependencies = [
 "zeroize",
 ]

+[[package]]
+name = "nym-network-statistics"
+version = "1.1.34"
+dependencies = [
+ "dirs 4.0.0",
+ "log",
+ "nym-bin-common",
+ "nym-statistics-common",
+ "nym-task",
+ "pretty_env_logger",
+ "rocket",
+ "serde",
+ "sqlx",
+ "thiserror",
+ "tokio",
+]
+
 [[package]]
 name = "nym-node"
 version = "1.1.3"
@@ -4987,7 +5014,7 @@ dependencies = [
 "sysinfo 0.30.12",
 "thiserror",
 "tokio",
- "toml 0.8.14",
+ "toml 0.8.12",
 "tracing",
 "url",
 "zeroize",
@@ -5133,7 +5160,7 @@ dependencies = [
 "chacha20poly1305",
 "criterion",
 "curve25519-dalek 4.1.2",
- "fastrand 2.1.0",
+ "fastrand 1.9.0",
 "getrandom 0.2.15",
 "log",
 "rand 0.8.5",
@@ -5233,7 +5260,6 @@ dependencies = [
 "nym-socks5-client-core",
 "nym-sphinx",
 "nym-topology",
- "nym-validator-client",
 "rand 0.8.5",
 "serde",
 "serde_json",
@@ -5479,6 +5505,20 @@ dependencies = [
 "thiserror",
 ]

+[[package]]
+name = "nym-statistics-common"
+version = "1.0.1"
+dependencies = [
+ "async-trait",
+ "log",
+ "reqwest 0.12.4",
+ "serde",
+ "serde_json",
+ "sqlx",
+ "thiserror",
+ "tokio",
+]
+
 [[package]]
 name = "nym-store-cipher"
 version = "0.1.0"
@@ -5553,7 +5593,7 @@ dependencies = [
 "cosmwasm-std",
 "eyre",
 "hmac",
- "itertools 0.12.1",
+ "itertools 0.11.0",
 "log",
 "nym-config",
 "nym-crypto",
@@ -5592,7 +5632,7 @@ dependencies = [
 "eyre",
 "flate2",
 "futures",
- "itertools 0.12.1",
+ "itertools 0.10.5",
 "log",
 "nym-api-requests",
 "nym-coconut",
@@ -7554,9 +7594,9 @@ dependencies = [

 [[package]]
 name = "serde_spanned"
-version = "0.6.6"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
 dependencies = [
 "serde",
 ]
@@ -8576,21 +8616,21 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "0.8.14"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
 dependencies = [
 "serde",
 "serde_spanned",
 "toml_datetime",
- "toml_edit 0.22.14",
+ "toml_edit 0.22.12",
 ]

 [[package]]
 name = "toml_datetime"
-version = "0.6.6"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
 dependencies = [
 "serde",
 ]
@@ -8610,9 +8650,9 @@ dependencies = [

 [[package]]
 name = "toml_edit"
-version = "0.22.14"
+version = "0.22.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
+checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
 dependencies = [
 "indexmap 2.2.6",
 "serde",
@@ -76,6 +76,7 @@ members = [
    "common/socks5-client-core",
    "common/socks5/proxy-helpers",
    "common/socks5/requests",
+    "common/statistics",
    "common/store-cipher",
    "common/task",
    "common/topology",
@@ -98,6 +99,7 @@ members = [
    "service-providers/common",
    "service-providers/ip-packet-router",
    "service-providers/network-requester",
+    "service-providers/network-statistics",
    "nym-api",
    "nym-browser-extension/storage",
    "nym-api/nym-api-requests",
@@ -125,6 +127,7 @@ default-members = [
    "clients/socks5",
    "gateway",
    "service-providers/network-requester",
+    "service-providers/network-statistics",
    "mixnode",
    "nym-api",
    "tools/nymvisor",
@@ -137,6 +140,9 @@ exclude = [
    "explorer",
    "contracts",
    "nym-wallet",
+    "nym-connect/mobile/src-tauri",
+    "nym-connect/desktop",
+    "nym-vpn/ui/src-tauri",
    "cpu-cycles",
    "sdk/ffi/cpp",
 ]
@@ -189,15 +195,12 @@ cupid = "0.6.1"
 curve25519-dalek = "4.1"
 dashmap = "5.5.3"
 defguard_wireguard_rs = "0.4.2"
-digest = "0.10.7"
-dirs = "4.0"
 doc-comment = "0.3"
 dotenvy = "0.15.6"
 ecdsa = "0.16"
 ed25519-dalek = "2.1"
 etherparse = "0.13.0"
 eyre = "0.6.9"
-fastrand = "2.1.0"
 flate2 = "1.0.28"
 futures = "0.3.28"
 generic-array = "0.14.7"
@@ -209,15 +212,14 @@ hex = "0.4.3"
 hex-literal = "0.3.3"
 hkdf = "0.12.3"
 hmac = "0.12.1"
-http = "1"
 httpcodec = "0.2.3"
 humantime = "2.1.0"
 humantime-serde = "1.1.1"
+http = "1"
 hyper = "1.3.1"
 indexed_db_futures = "0.3.0"
 inquire = "0.6.2"
 ip_network = "0.4.1"
-ipnetwork = "0.16"
 isocountry = "0.3.2"
 k256 = "0.13"
 lazy_static = "1.4.0"
@@ -240,7 +242,6 @@ publicsuffix = "2.2.3"
 quote = "1"
 rand = "0.8.5"
 rand-07 = "0.7.3"
-rand_chacha = "0.3"
 rand_chacha_02 = "0.2"
 rand_core = "0.6.3"
 rand_distr = "0.4"
@@ -254,7 +255,6 @@ rocket_cors = "0.6.0"
 rocket_okapi = "0.8.0"
 safer-ffi = "0.1.4"
 schemars = "0.8.1"
-semver = "1.0.23"
 serde = "1.0.152"
 serde_bytes = "0.11.6"
 serde_derive = "1.0"
@@ -262,14 +262,12 @@ serde_json = "1.0.91"
 serde_repr = "0.1"
 serde_with = "3.4.0"
 serde_yaml = "0.9.25"
-sha2 = "0.10.8"
 si-scale = "0.2.2"
 sphinx-packet = "0.1.1"
 sqlx = "0.6.3"
 strum = "0.25"
 subtle-encoding = "0.5"
 syn = "1"
-sysinfo = "0.30.12"
 tap = "1.0.1"
 tar = "0.4.40"
 tempfile = "3.5.0"
@@ -280,7 +278,6 @@ tokio-stream = "0.1.14"
 tokio-test = "0.4.2"
 tokio-tungstenite = { version = "0.20.1" }
 tokio-util = "0.7.10"
-toml = "0.8.14"
 tower = "0.4.13"
 tower-http = "0.5.2"
 tracing = "0.1.37"
@@ -295,7 +292,6 @@ utoipa-swagger-ui = "6.0.0"
 vergen = { version = "=8.3.1", default-features = false }
 walkdir = "2"
 wasm-bindgen-test = "0.3.36"
-x25519-dalek = "2.0.0"
 zeroize = "1.6.0"

 prometheus = { version = "0.13.0" }
@@ -343,7 +339,6 @@ wasm-bindgen = "0.2.92"
 wasm-bindgen-futures = "0.4.39"
 wasmtimer = "0.2.0"
 web-sys = "0.3.69"
-itertools = "0.12.0"


 # Profile settings for individual crates
@@ -92,6 +92,7 @@ endef
 $(eval $(call add_cargo_workspace,main,.))
 $(eval $(call add_cargo_workspace,contracts,contracts,--lib --target wasm32-unknown-unknown,RUSTFLAGS='-C link-arg=-s'))
 $(eval $(call add_cargo_workspace,wallet,nym-wallet))
+$(eval $(call add_cargo_workspace,connect,nym-connect/desktop))

 # -----------------------------------------------------------------------------
 # SDK
@@ -7,66 +7,86 @@ SPDX-License-Identifier: Apache-2.0

 The platform is composed of multiple Rust crates. Top-level executable binary crates include:

-* `nym-node` - a tool for running a node within the Nym network. Nym Nodes containing functionality such as `mixnode`, `entry-gateway` and `exit-gateway` are fundamental components of Nym Mixnet architecture. Nym Nodes are ran by decentralised node operators. Read more about `nym-node` in [Operators Guide documentation](https://nymtech.net/operators/nodes/nym-node.html). Network functionality of `nym-node` (labeled with `--mode` flag) can be:
-	- `mixnode` - shuffles [Sphinx](https://github.com/nymtech/sphinx) packets together to provide privacy against network-level attackers.
-	- `gateway` - acts sort of like a mailbox for mixnet messages, which removes the need for direct delivery to potentially offline or firewalled devices. Gateways can be further categorized as `entry-gateway` and `exit-gateway`. The latter has an extra embedded IP packet router and Network requester to route data to the internet.
-* `nym-client` - an executable which you can build into your own applications. Use it for interacting with Nym nodes.
-* `nym-socks5-client` - a Socks5 proxy you can run on your machine and use with existing applications.
-* `nym-explorer` - a (projected) block explorer and (existing) mixnet viewer.
-* `nym-wallet` - a desktop wallet implemented using the [Tauri](https://tauri.studio/en/docs/about/intro) framework.
-<!-- coming soon
-* `nym-network-monitor` - sends packets through the full system to check that they are working as expected, and stores node uptime histories as the basis of a rewards system ("mixmining" or "proof-of-mixing").
-->
-
-```ascii
-                      ┌─►mix──┐  mix     mix
-                      │       │
-            Entry     │       │                   Exit
-client ───► Gateway ──┘  mix  │  mix  ┌─►mix ───► Gateway ───► internet
-                              │       │
-                              │       │
-                         mix  └─►mix──┘  mix
-
-```
+* nym-mixnode - shuffles [Sphinx](https://github.com/nymtech/sphinx) packets together to provide privacy against network-level attackers.
+* nym-client - an executable which you can build into your own applications. Use it for interacting with Nym nodes.
+* nym-socks5-client - a Socks5 proxy you can run on your machine and use with existing applications.
+* nym-gateway - acts sort of like a mailbox for mixnet messages, which removes the need for direct delivery to potentially offline or firewalled devices.
+* nym-network-monitor - sends packets through the full system to check that they are working as expected, and stores node uptime histories as the basis of a rewards system ("mixmining" or "proof-of-mixing").
+* nym-explorer - a (projected) block explorer and (existing) mixnet viewer.
+* nym-wallet - a desktop wallet implemented using the [Tauri](https://tauri.studio/en/docs/about/intro) framework.

 [![Build Status](https://img.shields.io/github/actions/workflow/status/nymtech/nym/build.yml?branch=develop&style=for-the-badge&logo=github-actions)](https://github.com/nymtech/nym/actions?query=branch%3Adevelop)


 ### Building

-* Platform build instructions are available on Nym [Operators Guide documentation](https://nymtech.net/operators/binaries/building-nym.html).
-* Wallet build instructions are available on Nym [Technical docs](https://nymtech.net/docs/wallet/desktop-wallet.html).
+Platform build instructions are available on [our docs site](https://nymtech.net/docs/binaries/pre-built-binaries.html).
+Wallet build instructions are also available on [our docs site](https://nymtech.net/docs/wallet/desktop-wallet.html).

 ### Developing

-There's a [`sandbox.env`](https://github.com/nymtech/nym/envs/sandbox.env) file provided which you can rename to `.env` if you want convenient testing environment. Read more about sandbox environment in our [Operators Guide page](https://nymtech.net/operators/sandbox.html).
+There's a `.env.sample-dev` file provided which you can rename to `.env` if you want convenient logging, backtrace, or other environment variables pre-set. The `.env` file is ignored so you don't need to worry about checking it in.

-References for developers:
-
-* [Developers Portal](https://nymtech.net/developers)
-* [Typescript SDKs](https://sdk.nymtech.net/)
-* [Technical Documentation - Nym network overview](https://nymtech.net/docs/)
-* [Release Cycle - git flow](https://nymtech.net/operators/release-cycle.html)
+For Typescript components, please see [ts-packages](./ts-packages).

 ### Developer chat

+> We used to use Keybase for developer chats, but we have since migrated to Matrix and Discord. We no longer check the old **nymtech.friends** Keybase team.
+
 You can chat to us in two places:
 * The #dev channel on [Matrix](https://matrix.to/#/#dev:nymtech.chat)
-* The various developer channels on [Discord](discord.gg/nymproject)
+* The various developer channels on [Discord](https://discord.gg/nym)

-### Tokenomics & Rewards
+### Rewards

-Nym network economic incentives, operator and validator rewards, and scalability of the network are determined according to the principles laid out in the section 6 of [Nym Whitepaper](https://nymtech.net/nym-whitepaper.pdf).
-Initial reward pool is set to 250 million Nym, making the circulating supply 750 million Nym.
+Node, node operator and delegator rewards are determined according to the principles laid out in the section 6 of [Nym Whitepaper](https://nymtech.net/nym-whitepaper.pdf). Below is a TLDR of the variables and formulas involved in calculating the epoch rewards. Initial reward pool is set to 250 million Nym, making the circulating supply 750 million Nym.
+
+|Symbol|Definition|
+|---|---|
+|<img src="https://render.githubusercontent.com/render/math?math=R#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}R#gh-dark-mode-only">|global share of rewards available, starts at 2% of the reward pool.
+|<img src="https://render.githubusercontent.com/render/math?math=R_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}R_{i}#gh-dark-mode-only">|node reward for mixnode `i`.
+|<img src="https://render.githubusercontent.com/render/math?math=\sigma_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\sigma_{i}#gh-dark-mode-only">|ratio of total node stake (node bond + all delegations) to the token circulating supply.
+|<img src="https://render.githubusercontent.com/render/math?math=\lambda_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\lambda_{i}#gh-dark-mode-only">|ratio of stake operator has pledged to their node to the token circulating supply.
+|<img src="https://render.githubusercontent.com/render/math?math=\omega_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\omega_{i}#gh-dark-mode-only">|fraction of total effort undertaken by node `i`, set to `1/k`.
+|<img src="https://render.githubusercontent.com/render/math?math=k#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}k#gh-dark-mode-only">|number of nodes stakeholders are incentivised to create, set by the validators, a matter of governance. Currently determined by the `reward set` size, and set to 720 in testnet Sandbox.
+|<img src="https://render.githubusercontent.com/render/math?math=\alpha#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\alpha#gh-dark-mode-only">|A Sybil attack resistance parameter - the higher this parameter is set, the stronger the reduction in competitiveness for a Sybil attacker.
+|<img src="https://render.githubusercontent.com/render/math?math=PM_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}PM_{i}#gh-dark-mode-only">|declared profit margin of operator `i`, defaults to 10%.
+|<img src="https://render.githubusercontent.com/render/math?math=PF_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}PF_{i}#gh-dark-mode-only">|uptime of node `i`, scaled to 0 - 1, for the rewarding epoch
+|<img src="https://render.githubusercontent.com/render/math?math=PP_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}PP_{i}#gh-dark-mode-only">|cost of operating node `i` for the duration of the rewarding epoch, set to 40 NYMs.
+
+Node reward for node `i` is determined as:
+
+<img src="https://render.githubusercontent.com/render/math?math=R_{i}=PF_{i} \cdot R \cdot (\sigma^'_{i} \cdot \omega_{i} \cdot k %2b \alpha \cdot \lambda^'_{i} \cdot \sigma^'_{i} \cdot k)/(1 %2b \alpha)#gh-light-mode-only">
+<img src="https://render.githubusercontent.com/render/math?math=\color{white}R_{i}=PF_{i} \cdot R \cdot (\sigma^'_{i} \cdot \omega_{i} \cdot k %2b \alpha \cdot \lambda^'_{i} \cdot \sigma^'_{i} \cdot k)/(1 %2b \alpha)#gh-dark-mode-only">
+where:
+
+<img src="https://render.githubusercontent.com/render/math?math=\sigma^'_{i} = min\{\sigma_{i}, 1/k\}#gh-light-mode-only">
+<img src="https://render.githubusercontent.com/render/math?math=\color{white}\sigma^'_{i} = min\{\sigma_{i}, 1/k\}#gh-dark-mode-only">
+
+and
+
+<img src="https://render.githubusercontent.com/render/math?math=\lambda^'_{i} = min\{\lambda_{i}, 1/k\}#gh-light-mode-only">
+<img src="https://render.githubusercontent.com/render/math?math=\color{white}\lambda^'_{i} = min\{\lambda_{i}, 1/k\}#gh-dark-mode-only">
+
+Operator of node `i` is credited with the following amount:
+
+<img src="https://render.githubusercontent.com/render/math?math=min\{PP_{i},R_{i})\} %2b max\{0, (PM_{i} %2b (1 - PM_{i}) \cdot \lambda_{i}/\delta_{i}) \cdot (R_{i} - PP_{i})\}#gh-light-mode-only">
+<img src="https://render.githubusercontent.com/render/math?math=\color{white}min\{PP_{i},R_{i})\} %2b max\{0, (PM_{i} %2b (1 - PM_{i}) \cdot \lambda_{i}/\delta_{i}) \cdot (R_{i} - PP_{i})\}#gh-dark-mode-only">
+
+Delegate with stake `s` receives:
+
+<img src="https://render.githubusercontent.com/render/math?math=max\{0, (1-PM_{i}) \cdot (s^'/\sigma_{i}) \cdot (R_{i} - PP_{i})\}#gh-light-mode-only">
+<img src="https://render.githubusercontent.com/render/math?math=\color{white}max\{0, (1-PM_{i}) \cdot (s^'/\sigma_{i}) \cdot (R_{i} - PP_{i})\}#gh-dark-mode-only">
+
+where `s'` is stake `s` scaled over total token circulating supply.

 ### Licensing and copyright information

 This is a monorepo and components that make up Nym as a system are licensed individually, so for accurate information, please check individual files.

 As a general approach, licensing is as follows this pattern:
-
 - applications and binaries are GPLv3
 - libraries and components are Apache 2.0 or MIT
 - documentation is Apache 2.0 or CC0-1.0

-Nym Node Operators and Validators Temrs and Conditions can be found [here](https://nymtech.net/terms-and-conditions/operators/v1.0.0).
+Again, for accurate information, please check individual files.
@@ -23,7 +23,7 @@ url = { workspace = true }

 bs58 = { workspace = true }
 clap = { workspace = true, features = ["cargo", "derive"] }
-dirs = { workspace = true }
+dirs = "4.0"
 log = { workspace = true } # self explanatory
 rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] } # for config serialization/deserialization
@@ -37,7 +37,7 @@ zeroize = { workspace = true }

 ## internal
 nym-bandwidth-controller = { path = "../../common/bandwidth-controller" }
-nym-bin-common = { path = "../../common/bin-common", features = ["output_format", "clap"] }
+nym-bin-common = { path = "../../common/bin-common", features = ["output_format"] }
 nym-client-core = { path = "../../common/client-core", features = ["fs-surb-storage", "fs-gateways-storage", "cli"] }
 nym-config = { path = "../../common/config" }
 nym-credential-storage = { path = "../../common/credential-storage" }
@@ -744,18 +744,6 @@
        "concat-map": "0.0.1"
      }
    },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
    "node_modules/browserslist": {
      "version": "4.20.2",
      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz",
@@ -874,6 +862,51 @@
        "fsevents": "~2.3.2"
      }
    },
+    "node_modules/chokidar/node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/chokidar/node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/chokidar/node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/chokidar/node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
    "node_modules/chrome-trace-event": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
@@ -1560,6 +1593,39 @@
        "node": ">=8.6.0"
      }
    },
+    "node_modules/fast-glob/node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fast-glob/node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fast-glob/node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
    "node_modules/fast-glob/node_modules/micromatch": {
      "version": "4.0.4",
      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
@@ -1573,6 +1639,18 @@
        "node": ">=8.6"
      }
    },
+    "node_modules/fast-glob/node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
    "node_modules/fast-json-stable-stringify": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -1605,18 +1683,6 @@
        "node": ">=0.8.0"
      }
    },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
    "node_modules/finalhandler": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
@@ -2071,6 +2137,39 @@
        }
      }
    },
+    "node_modules/http-proxy-middleware/node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
    "node_modules/http-proxy-middleware/node_modules/micromatch": {
      "version": "4.0.4",
      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
@@ -2084,6 +2183,18 @@
        "node": ">=8.6"
      }
    },
+    "node_modules/http-proxy-middleware/node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
    "node_modules/human-signals": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
@@ -2250,15 +2361,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
    "node_modules/is-path-cwd": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
@@ -3751,18 +3853,6 @@
      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
      "dev": true
    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
    "node_modules/toidentifier": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
@@ -5123,15 +5213,6 @@
        "concat-map": "0.0.1"
      }
    },
-    "braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "dev": true,
-      "requires": {
-        "fill-range": "^7.1.1"
-      }
-    },
    "browserslist": {
      "version": "4.20.2",
      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz",
@@ -5202,6 +5283,41 @@
        "is-glob": "~4.0.1",
        "normalize-path": "~3.0.0",
        "readdirp": "~3.6.0"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
      }
    },
    "chrome-trace-event": {
@@ -5736,6 +5852,30 @@
        "micromatch": "^4.0.4"
      },
      "dependencies": {
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
        "micromatch": {
          "version": "4.0.4",
          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
@@ -5745,6 +5885,15 @@
            "braces": "^3.0.1",
            "picomatch": "^2.2.3"
          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
        }
      }
    },
@@ -5777,15 +5926,6 @@
        "websocket-driver": ">=0.5.1"
      }
    },
-    "fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "dev": true,
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
    "finalhandler": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
@@ -6107,6 +6247,30 @@
        "micromatch": "^4.0.2"
      },
      "dependencies": {
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
        "micromatch": {
          "version": "4.0.4",
          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
@@ -6116,6 +6280,15 @@
            "braces": "^3.0.1",
            "picomatch": "^2.2.3"
          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
        }
      }
    },
@@ -6234,12 +6407,6 @@
        "is-extglob": "^2.1.1"
      }
    },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true
-    },
    "is-path-cwd": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
@@ -7357,15 +7524,6 @@
      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
      "dev": true
    },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "requires": {
-        "is-number": "^7.0.0"
-      }
-    },
    "toidentifier": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
@@ -106,10 +106,8 @@ impl SocketClient {
        };

        let storage = self.initialise_storage().await?;
-        let user_agent = nym_bin_common::bin_info!().into();

-        let mut base_client = BaseClientBuilder::new(&self.config.base, storage, dkg_query_client)
-            .with_user_agent(user_agent);
+        let mut base_client = BaseClientBuilder::new(&self.config.base, storage, dkg_query_client);

        if let Some(custom_mixnet) = &self.custom_mixnet {
            base_client = base_client.with_stored_topology(custom_mixnet)?;
@@ -22,9 +22,8 @@ impl AsRef<CommonClientAddGatewayArgs> for Args {
 }

 pub(crate) async fn execute(args: Args) -> Result<(), ClientError> {
-    let user_agent = nym_bin_common::bin_info!().into();
    let output = args.output;
-    let res = add_gateway::<CliNativeClient, _>(args, Some(user_agent)).await?;
+    let res = add_gateway::<CliNativeClient, _>(args).await?;

    println!("{}", output.format(&res));
    Ok(())
@@ -114,9 +114,8 @@ impl Display for InitResults {
 pub(crate) async fn execute(args: Init) -> Result<(), ClientError> {
    eprintln!("Initialising client...");

-    let user_agent = nym_bin_common::bin_info!().into();
    let output = args.output;
-    let res = initialise_client::<CliNativeClient>(args, Some(user_agent)).await?;
+    let res = initialise_client::<CliNativeClient>(args).await?;

    let init_results = InitResults::new(res);
    println!("{}", output.format(&init_results));
@@ -25,18 +25,17 @@ zeroize = { workspace = true }
 nym-bin-common = { path = "../../common/bin-common", features = ["output_format"] }
 nym-client-core = { path = "../../common/client-core", features = ["fs-surb-storage", "fs-gateways-storage", "cli"] }
 nym-config = { path = "../../common/config" }
-nym-credential-storage = { path = "../../common/credential-storage" }
 nym-credentials = { path = "../../common/credentials" }
 nym-crypto = { path = "../../common/crypto" }
 nym-gateway-requests = { path = "../../gateway/gateway-requests" }
-nym-id = { path = "../../common/nym-id" }
+nym-credential-storage = { path = "../../common/credential-storage" }
 nym-network-defaults = { path = "../../common/network-defaults" }
+nym-sphinx = { path = "../../common/nymsphinx" }
 nym-ordered-buffer = { path = "../../common/socks5/ordered-buffer" }
 nym-pemstore = { path = "../../common/pemstore" }
-nym-socks5-client-core = { path = "../../common/socks5-client-core" }
-nym-sphinx = { path = "../../common/nymsphinx" }
 nym-topology = { path = "../../common/topology" }
-nym-validator-client = { path = "../../common/client-libs/validator-client", features = ["http-client"] }
+nym-socks5-client-core = { path = "../../common/socks5-client-core" }
+nym-id = { path = "../../common/nym-id" }

 [features]
 default = []
@@ -22,9 +22,8 @@ impl AsRef<CommonClientAddGatewayArgs> for Args {
 }

 pub(crate) async fn execute(args: Args) -> Result<(), Socks5ClientError> {
-    let user_agent = nym_bin_common::bin_info!().into();
    let output = args.output;
-    let res = add_gateway::<CliSocks5Client, _>(args, Some(user_agent)).await?;
+    let res = add_gateway::<CliSocks5Client, _>(args).await?;

    println!("{}", output.format(&res));
    Ok(())
@@ -129,9 +129,8 @@ impl Display for InitResults {
 pub(crate) async fn execute(args: Init) -> Result<(), Socks5ClientError> {
    eprintln!("Initialising client...");

-    let user_agent = nym_bin_common::bin_info!().into();
    let output = args.output;
-    let res = initialise_client::<CliSocks5Client>(args, Some(user_agent)).await?;
+    let res = initialise_client::<CliSocks5Client>(args).await?;

    let init_results = InitResults::new(res);
    println!("{}", output.format(&init_results));
@@ -116,13 +116,7 @@ pub(crate) async fn execute(args: Run) -> Result<(), Box<dyn std::error::Error +
    let storage =
        OnDiskPersistent::from_paths(config.storage_paths.common_paths, &config.core.base.debug)
            .await?;
-    let user_agent = nym_bin_common::bin_info!().into();
-    NymClient::new(
-        config.core,
-        storage,
-        user_agent,
-        args.common_args.custom_mixnet,
-    )
-    .run_forever()
-    .await
+    NymClient::new(config.core, storage, args.common_args.custom_mixnet)
+        .run_forever()
+        .await
 }
@@ -9,9 +9,9 @@ repository = { workspace = true }

 [dependencies]
 const-str = { workspace = true }
-clap = { workspace = true, features = ["derive"], optional = true }
-clap_complete = { workspace = true, optional = true }
-clap_complete_fig = { workspace = true, optional = true }
+clap = { workspace = true, features = ["derive"] }
+clap_complete = { workspace = true }
+clap_complete_fig = { workspace = true }
 log = { workspace = true }
 pretty_env_logger = { workspace = true }
 semver = "0.11"
@@ -34,7 +34,7 @@ vergen = { workspace = true, features = ["build", "git", "gitcl", "rustc", "carg
 [features]
 default = []
 openapi = ["utoipa"]
-output_format = ["serde_json", "dep:clap"]
+output_format = ["serde_json"]
 bin_info_schema = ["schemars"]
 basic_tracing = ["tracing-subscriber"]
 tracing = [
@@ -44,4 +44,3 @@ tracing = [
    "tracing-opentelemetry",
    "opentelemetry",
 ]
-clap = [ "dep:clap", "dep:clap_complete", "dep:clap_complete_fig" ]
@@ -44,10 +44,6 @@ pub struct BinaryBuildInformation {
    /// Provides the cargo debug mode that was used for the build.
    // NOTE: keep the old name cargo_profile instead of cargo_debug for backwards compatibility
    pub cargo_profile: &'static str,
-
-    // VERGEN_CARGO_TARGET_TRIPLE
-    /// Provides the cargo target triple that was used for the build.
-    pub cargo_triple: &'static str,
 }

 impl BinaryBuildInformation {
@@ -70,7 +66,6 @@ impl BinaryBuildInformation {
            rustc_version: env!("VERGEN_RUSTC_SEMVER"),
            rustc_channel: env!("VERGEN_RUSTC_CHANNEL"),
            cargo_profile,
-            cargo_triple: env!("VERGEN_CARGO_TARGET_TRIPLE"),
        }
    }

@@ -100,7 +95,6 @@ impl BinaryBuildInformation {
            rustc_version: env!("VERGEN_RUSTC_SEMVER"),
            rustc_channel: env!("VERGEN_RUSTC_CHANNEL"),
            cargo_profile,
-            cargo_triple: env!("VERGEN_CARGO_TARGET_TRIPLE"),
        }
    }

@@ -115,7 +109,6 @@ impl BinaryBuildInformation {
            rustc_version: self.rustc_version.to_owned(),
            rustc_channel: self.rustc_channel.to_owned(),
            cargo_profile: self.cargo_profile.to_owned(),
-            cargo_triple: self.cargo_triple.to_owned(),
        }
    }

@@ -163,15 +156,6 @@ pub struct BinaryBuildInformationOwned {
    /// Provides the cargo debug mode that was used for the build.
    // NOTE: keep the old name cargo_profile instead of cargo_debug for backwards compatibility
    pub cargo_profile: String,
-
-    // VERGEN_CARGO_TARGET_TRIPLE
-    /// Provides the cargo target triple that was used for the build.
-    #[serde(default = "unknown")]
-    pub cargo_triple: String,
-}
-
-fn unknown() -> String {
-    "unknown".to_string()
 }

 impl Display for BinaryBuildInformationOwned {
@@ -2,11 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0

 pub mod build_information;
+pub mod completions;
 pub mod logging;
 pub mod version_checker;

-#[cfg(feature = "clap")]
-pub mod completions;
-
 #[cfg(feature = "output_format")]
 pub mod output_format;
@@ -10,7 +10,7 @@ license.workspace = true

 [dependencies]
 async-trait = { workspace = true }
-base64 = { workspace = true }
+base64 = "0.21.2"
 bs58 = { workspace = true }
 cfg-if = { workspace = true }
 clap = { workspace = true, optional = true }
@@ -20,7 +20,7 @@ log = { workspace = true }
 rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-sha2 = { workspace = true }
+sha2 = "0.10.6"
 si-scale = { workspace = true }
 tap = { workspace = true }
 thiserror = { workspace = true }
@@ -16,7 +16,6 @@ use log::info;
 use nym_client_core_gateways_storage::GatewayDetails;
 use nym_crypto::asymmetric::identity;
 use nym_topology::NymTopology;
-use nym_validator_client::UserAgent;
 use std::path::PathBuf;

 #[cfg_attr(feature = "cli", derive(clap::Args))]
@@ -61,10 +60,7 @@ pub struct CommonClientAddGatewayArgs {
    pub custom_mixnet: Option<PathBuf>,
 }

-pub async fn add_gateway<C, A>(
-    args: A,
-    user_agent: Option<UserAgent>,
-) -> Result<GatewayInfo, C::Error>
+pub async fn add_gateway<C, A>(args: A) -> Result<GatewayInfo, C::Error>
 where
    A: AsRef<CommonClientAddGatewayArgs>,
    C: CliClient,
@@ -115,8 +111,7 @@ where
        hardcoded_topology.get_gateways()
    } else {
        let mut rng = rand::thread_rng();
-        crate::init::helpers::current_gateways(&mut rng, &core.client.nym_api_urls, user_agent)
-            .await?
+        crate::init::helpers::current_gateways(&mut rng, &core.client.nym_api_urls).await?
    };

    // since we're registering with a brand new gateway,
@@ -16,7 +16,6 @@ use log::info;
 use nym_client_core_gateways_storage::GatewayDetails;
 use nym_crypto::asymmetric::identity;
 use nym_topology::NymTopology;
-use nym_validator_client::UserAgent;
 use rand::rngs::OsRng;
 use std::path::PathBuf;

@@ -97,7 +96,6 @@ pub struct InitResultsWithConfig<T> {

 pub async fn initialise_client<C>(
    init_args: C::InitArgs,
-    user_agent: Option<UserAgent>,
 ) -> Result<InitResultsWithConfig<C::Config>, C::Error>
 where
    C: InitialisableClient,
@@ -165,8 +163,7 @@ where
        hardcoded_topology.get_gateways()
    } else {
        let mut rng = rand::thread_rng();
-        crate::init::helpers::current_gateways(&mut rng, &core.client.nym_api_urls, user_agent)
-            .await?
+        crate::init::helpers::current_gateways(&mut rng, &core.client.nym_api_urls).await?
    };

    let gateway_setup = GatewaySetup::New {
@@ -53,7 +53,7 @@ use nym_task::connections::{ConnectionCommandReceiver, ConnectionCommandSender,
 use nym_task::{TaskClient, TaskHandle};
 use nym_topology::provider_trait::TopologyProvider;
 use nym_topology::HardcodedTopologyProvider;
-use nym_validator_client::{nyxd::contract_traits::DkgQueryClient, UserAgent};
+use nym_validator_client::nyxd::contract_traits::DkgQueryClient;
 use rand::rngs::OsRng;
 use std::fmt::Debug;
 use std::os::raw::c_int as RawFd;
@@ -184,7 +184,6 @@ pub struct BaseClientBuilder<'a, C, S: MixnetClientStorage> {
    custom_topology_provider: Option<Box<dyn TopologyProvider + Send + Sync>>,
    custom_gateway_transceiver: Option<Box<dyn GatewayTransceiver + Send>>,
    shutdown: Option<TaskClient>,
-    user_agent: Option<UserAgent>,

    setup_method: GatewaySetup,
 }
@@ -208,7 +207,6 @@ where
            custom_topology_provider: None,
            custom_gateway_transceiver: None,
            shutdown: None,
-            user_agent: None,
            setup_method: GatewaySetup::MustLoad { gateway_id: None },
        }
    }
@@ -252,12 +250,6 @@ where
        self
    }

-    #[must_use]
-    pub fn with_user_agent(mut self, user_agent: UserAgent) -> Self {
-        self.user_agent = Some(user_agent);
-        self
-    }
-
    pub fn with_stored_topology<P: AsRef<Path>>(
        mut self,
        file: P,
@@ -475,7 +467,6 @@ where
        custom_provider: Option<Box<dyn TopologyProvider + Send + Sync>>,
        config_topology: config::Topology,
        nym_api_urls: Vec<Url>,
-        user_agent: Option<UserAgent>,
    ) -> Box<dyn TopologyProvider + Send + Sync> {
        // if no custom provider was ... provided ..., create one using nym-api
        custom_provider.unwrap_or_else(|| match config_topology.topology_structure {
@@ -486,7 +477,6 @@ where
                },
                nym_api_urls,
                env!("CARGO_PKG_VERSION").to_string(),
-                user_agent,
            )),
            config::TopologyStructure::GeoAware(group_by) => {
                Box::new(GeoAwareTopologyProvider::new(
@@ -699,7 +689,6 @@ where
            self.custom_topology_provider.take(),
            self.config.debug.topology,
            self.config.get_nym_api_endpoints(),
-            self.user_agent.clone(),
        );

        // needs to be started as the first thing to block if required waiting for the gateway
@@ -5,7 +5,6 @@ use async_trait::async_trait;
 use log::{debug, error, warn};
 use nym_topology::provider_trait::TopologyProvider;
 use nym_topology::{NymTopology, NymTopologyError};
-use nym_validator_client::UserAgent;
 use rand::prelude::SliceRandom;
 use rand::thread_rng;
 use url::Url;
@@ -40,26 +39,14 @@ pub(crate) struct NymApiTopologyProvider {
 }

 impl NymApiTopologyProvider {
-    pub(crate) fn new(
-        config: Config,
-        mut nym_api_urls: Vec<Url>,
-        client_version: String,
-        user_agent: Option<UserAgent>,
-    ) -> Self {
+    pub(crate) fn new(config: Config, mut nym_api_urls: Vec<Url>, client_version: String) -> Self {
        nym_api_urls.shuffle(&mut thread_rng());

-        let validator_client = if let Some(user_agent) = user_agent {
-            nym_validator_client::client::NymApiClient::new_with_user_agent(
-                nym_api_urls[0].clone(),
-                user_agent,
-            )
-        } else {
-            nym_validator_client::client::NymApiClient::new(nym_api_urls[0].clone())
-        };
-
        NymApiTopologyProvider {
            config,
-            validator_client,
+            validator_client: nym_validator_client::client::NymApiClient::new(
+                nym_api_urls[0].clone(),
+            ),
            nym_api_urls,
            client_version,
            currently_used_api: 0,
@@ -9,7 +9,6 @@ use nym_crypto::asymmetric::identity;
 use nym_gateway_client::GatewayClient;
 use nym_topology::{filter::VersionFilterable, gateway, mix};
 use nym_validator_client::client::IdentityKeyRef;
-use nym_validator_client::UserAgent;
 use rand::{seq::SliceRandom, Rng};
 use std::{sync::Arc, time::Duration};
 use tungstenite::Message;
@@ -60,16 +59,11 @@ impl<'a> GatewayWithLatency<'a> {
 pub async fn current_gateways<R: Rng>(
    rng: &mut R,
    nym_apis: &[Url],
-    user_agent: Option<UserAgent>,
 ) -> Result<Vec<gateway::Node>, ClientCoreError> {
    let nym_api = nym_apis
        .choose(rng)
        .ok_or(ClientCoreError::ListOfNymApisIsEmpty)?;
-    let client = if let Some(user_agent) = user_agent {
-        nym_validator_client::client::NymApiClient::new_with_user_agent(nym_api.clone(), user_agent)
-    } else {
-        nym_validator_client::client::NymApiClient::new(nym_api.clone())
-    };
+    let client = nym_validator_client::client::NymApiClient::new(nym_api.clone());

    log::debug!("Fetching list of gateways from: {nym_api}");

@@ -54,7 +54,7 @@ cw-controllers = { workspace = true }
 prost = { workspace = true, default-features = false }
 flate2 = { workspace = true }
 sha2 = { version = "0.9.5" }
-itertools = { workspace = true }
+itertools = { version = "0.10" }
 zeroize = { workspace = true, features = ["zeroize_derive"] }
 cosmwasm-std = { workspace = true }

@@ -8,6 +8,7 @@ use crate::{
    nym_api, DirectSigningReqwestRpcValidatorClient, QueryReqwestRpcValidatorClient,
    ReqwestRpcClient, ValidatorClientError,
 };
+use log::info;
 use nym_api_requests::coconut::models::FreePassNonceResponse;
 use nym_api_requests::coconut::{
    BlindSignRequestBody, BlindedSignatureResponse, FreePassRequest, VerifyCredentialBody,
@@ -19,7 +20,6 @@ use nym_api_requests::models::{
    RewardEstimationResponse, StakeSaturationResponse,
 };
 use nym_api_requests::nym_nodes::SkimmedNode;
-use nym_http_api_client::UserAgent;
 use nym_network_defaults::NymNetworkDetails;
 use url::Url;

@@ -259,16 +259,6 @@ impl NymApiClient {
        NymApiClient { nym_api }
    }

-    pub fn new_with_user_agent(api_url: Url, user_agent: UserAgent) -> Self {
-        let nym_api = nym_api::Client::builder::<_, ValidatorClientError>(api_url)
-            .expect("invalid api url")
-            .with_user_agent(user_agent)
-            .build::<ValidatorClientError>()
-            .expect("failed to build nym api client");
-
-        NymApiClient { nym_api }
-    }
-
    pub fn api_url(&self) -> &Url {
        self.nym_api.current_url()
    }
@@ -281,6 +271,7 @@ impl NymApiClient {
        &self,
        semver_compatibility: Option<String>,
    ) -> Result<Vec<SkimmedNode>, ValidatorClientError> {
+        info!("about to get mixnodes");
        Ok(self
            .nym_api
            .get_basic_mixnodes(semver_compatibility)
@@ -17,7 +17,6 @@ pub use crate::signing::direct_wallet::DirectSecp256k1HdWallet;
 pub use client::NymApiClient;
 pub use client::{Client, CoconutApiClient, Config};
 pub use nym_api_requests::*;
-pub use nym_http_api_client::UserAgent;

 #[cfg(feature = "http-client")]
 pub use cosmrs::rpc::HttpClient as HttpRpcClient;
@@ -4,6 +4,7 @@
 use crate::nym_api::error::NymAPIError;
 use crate::nym_api::routes::{CORE_STATUS_COUNT, SINCE_ARG};
 use async_trait::async_trait;
+use log::info;
 pub use nym_api_requests::{
    coconut::{
        models::{
@@ -100,7 +101,9 @@ pub trait NymApiClientExt: ApiClient {
        &self,
        semver_compatibility: Option<String>,
    ) -> Result<CachedNodesResponse<SkimmedNode>, NymAPIError> {
+        info!("attempting to query the mixnodes/skimmed endpoint");
        let params = if let Some(semver_compatibility) = &semver_compatibility {
+            info!("attaching semver_compatibility param");
            vec![("semver_compatibility", semver_compatibility.as_str())]
        } else {
            vec![]
@@ -29,7 +29,7 @@ time = { workspace = true, features = ["parsing", "formatting"] }
 ts-rs = { workspace = true, optional = true }

 [dev-dependencies]
-rand_chacha = { workspace = true }
+rand_chacha = "0.3"
 time = { workspace = true, features = ["serde", "macros"] }

 [features]
@@ -12,16 +12,16 @@ aes = { workspace = true, optional = true }
 bs58 = { workspace = true }
 blake3 = { workspace = true, features = ["traits-preview"], optional = true }
 ctr = { workspace = true, optional = true }
-digest = { workspace = true, optional = true }
+digest = { version = "0.10.3", optional = true }
 generic-array = { workspace = true, optional = true }
 hkdf = { workspace = true, optional = true }
 hmac = { workspace = true, optional = true }
 cipher = { workspace = true, optional = true }
-x25519-dalek = { workspace = true, features = ["static_secrets"], optional = true }
-ed25519-dalek = { workspace = true, features = ["rand_core"], optional = true }
+x25519-dalek = { version = "2.0", optional = true, features = ["static_secrets"]}
+ed25519-dalek = { version = "2.1", 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_crate = { version = "1.0", optional = true, default_features = false, features = ["derive"], package = "serde" }
 subtle-encoding = { workspace = true, features = ["bech32-preview"] }
 thiserror = { workspace = true }
 zeroize = { workspace = true, optional = true, features = ["zeroize_derive"] }
@@ -31,7 +31,7 @@ nym-sphinx-types = { path = "../nymsphinx/types", version = "0.2.0", default-fea
 nym-pemstore = { path = "../../common/pemstore", version = "0.3.0" }

 [dev-dependencies]
-rand_chacha = { workspace = true }
+rand_chacha = "0.3"

 [features]
 default = ["sphinx"]
@@ -19,7 +19,7 @@ bs58 = { workspace = true }

 lazy_static = { workspace = true }
 rand = { version = "0.8.5", default-features = false}
-rand_chacha = { workspace = true }
+rand_chacha = "0.3"
 rand_core = { workspace = true }
 sha2 = "0.9"
 serde = { workspace = true }
@@ -20,8 +20,6 @@ serde_json = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }

-nym-bin-common = { path = "../bin-common" }
-
 # for request timeout until https://github.com/seanmonstar/reqwest/issues/1135 is fixed
 [target."cfg(target_arch = \"wasm32\")".dependencies.wasmtimer]
 workspace = true
@@ -3,21 +3,17 @@

 use async_trait::async_trait;
 use reqwest::header::HeaderValue;
-use reqwest::{RequestBuilder, Response, StatusCode};
+use reqwest::{Error, RequestBuilder, Response, StatusCode};
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use std::fmt::Display;
 use std::time::Duration;
 use thiserror::Error;
-use tracing::warn;
+use tracing::{error, info, warn};
 use url::Url;

 pub use reqwest::IntoUrl;

-pub use user_agent::UserAgent;
-
-mod user_agent;
-
 pub const DEFAULT_TIMEOUT: Duration = Duration::from_secs(10);

 pub type PathSegments<'a> = &'a [&'a str];
@@ -211,6 +207,7 @@ impl Client {
        E: Display,
    {
        let url = sanitize_url(&self.base_url, path, params);
+        info!("sanitised the request url into {url}");

        #[cfg(target_arch = "wasm32")]
        {
@@ -226,7 +223,19 @@ impl Client {

        #[cfg(not(target_arch = "wasm32"))]
        {
-            Ok(self.reqwest_client.get(url).send().await?)
+            let req = self.reqwest_client.get(url);
+            match req.send().await {
+                Ok(response) => {
+                    info!("request was succesfull");
+                    Ok(response)
+                }
+                Err(err) => {
+                    error!("request failed: {err}");
+                    error!("url: {:?}", err.url());
+                    error!("status code: {:?}", err.status());
+                    Err(err.into())
+                }
+            }
        }
    }

@@ -286,6 +295,7 @@ impl Client {
        V: AsRef<str>,
        E: Display + DeserializeOwned,
    {
+        info!("attempting to send the get request");
        let res = self.send_get_request(path, params).await?;
        parse_response(res, false).await
    }
@@ -515,6 +525,12 @@ where
    T: DeserializeOwned,
    E: DeserializeOwned + Display,
 {
+    info!("parsing the response");
+    info!("status: {}", res.status());
+    info!("headers: {:#?}", res.headers());
+    info!("content_length: {:?}", res.content_length());
+    info!("url: {:?}", res.url());
+    info!("remote_addr: {:?}", res.remote_addr());
    let status = res.status();

    if !allow_empty {
@@ -526,6 +542,9 @@ where
    if res.status().is_success() {
        Ok(res.json().await?)
    } else if res.status() == StatusCode::NOT_FOUND {
+        error!("welp. request couldnt be found. attempting to parse the body...");
+        error!("body: {}", res.text().await?);
+
        Err(HttpClientError::NotFound)
    } else {
        let Ok(plaintext) = res.text().await else {
@@ -1,56 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use std::fmt;
-
-use http::HeaderValue;
-use nym_bin_common::build_information::{BinaryBuildInformation, BinaryBuildInformationOwned};
-
-#[derive(Clone, Debug)]
-pub struct UserAgent {
-    pub application: String,
-    pub version: String,
-    pub platform: String,
-    pub git_commit: String,
-}
-
-impl fmt::Display for UserAgent {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let abbreviated_commit = self.git_commit.chars().take(7).collect::<String>();
-        write!(
-            f,
-            "{}/{}/{}/{}",
-            self.application, self.version, self.platform, abbreviated_commit
-        )
-    }
-}
-
-impl TryFrom<UserAgent> for HeaderValue {
-    type Error = http::header::InvalidHeaderValue;
-
-    fn try_from(user_agent: UserAgent) -> Result<Self, Self::Error> {
-        HeaderValue::from_str(&user_agent.to_string())
-    }
-}
-
-impl From<BinaryBuildInformation> for UserAgent {
-    fn from(build_info: BinaryBuildInformation) -> Self {
-        UserAgent {
-            application: build_info.binary_name.to_string(),
-            version: build_info.build_version.to_string(),
-            platform: build_info.cargo_triple.to_string(),
-            git_commit: build_info.commit_sha.to_string(),
-        }
-    }
-}
-
-impl From<BinaryBuildInformationOwned> for UserAgent {
-    fn from(build_info: BinaryBuildInformationOwned) -> Self {
-        UserAgent {
-            application: build_info.binary_name,
-            version: build_info.build_version,
-            platform: build_info.cargo_triple,
-            git_commit: build_info.commit_sha,
-        }
-    }
-}
@@ -27,6 +27,7 @@ pub const COCONUT_DKG_CONTRACT_ADDRESS: &str =

 pub const REWARDING_VALIDATOR_ADDRESS: &str = "n10yyd98e2tuwu0f7ypz9dy3hhjw7v772q6287gy";

+pub const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "https://mainnet-stats.nymte.ch:8090/";
 pub const NYXD_URL: &str = "https://rpc.nymtech.net";
 pub const NYM_API: &str = "https://validator.nymtech.net/api/";
 pub const NYXD_WS: &str = "wss://rpc.nymtech.net/websocket";
@@ -109,6 +110,10 @@ pub fn export_to_env() {
        var_names::REWARDING_VALIDATOR_ADDRESS,
        REWARDING_VALIDATOR_ADDRESS,
    );
+    set_var_to_default(
+        var_names::STATISTICS_SERVICE_DOMAIN_ADDRESS,
+        STATISTICS_SERVICE_DOMAIN_ADDRESS,
+    );
    set_var_to_default(var_names::NYXD, NYXD_URL);
    set_var_to_default(var_names::NYM_API, NYM_API);
    set_var_to_default(var_names::NYXD_WEBSOCKET, NYXD_WS);
@@ -150,6 +155,10 @@ pub fn export_to_env_if_not_set() {
        var_names::REWARDING_VALIDATOR_ADDRESS,
        REWARDING_VALIDATOR_ADDRESS,
    );
+    set_var_conditionally_to_default(
+        var_names::STATISTICS_SERVICE_DOMAIN_ADDRESS,
+        STATISTICS_SERVICE_DOMAIN_ADDRESS,
+    );
    set_var_conditionally_to_default(var_names::NYXD, NYXD_URL);
    set_var_conditionally_to_default(var_names::NYM_API, NYM_API);
    set_var_conditionally_to_default(var_names::NYXD_WEBSOCKET, NYXD_WS);
@@ -19,6 +19,7 @@ pub const GROUP_CONTRACT_ADDRESS: &str = "GROUP_CONTRACT_ADDRESS";
 pub const MULTISIG_CONTRACT_ADDRESS: &str = "MULTISIG_CONTRACT_ADDRESS";
 pub const COCONUT_DKG_CONTRACT_ADDRESS: &str = "COCONUT_DKG_CONTRACT_ADDRESS";
 pub const REWARDING_VALIDATOR_ADDRESS: &str = "REWARDING_VALIDATOR_ADDRESS";
+pub const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "STATISTICS_SERVICE_DOMAIN_ADDRESS";
 pub const NYXD: &str = "NYXD";
 pub const NYM_API: &str = "NYM_API";
 pub const NYXD_WEBSOCKET: &str = "NYXD_WS";
@@ -6,7 +6,6 @@ use nym_credential_storage::models::StorableIssuedCredential;
 use nym_credential_storage::storage::Storage;
 use nym_credentials::coconut::bandwidth::issued::BandwidthCredentialIssuedDataVariant;
 use nym_credentials::IssuedBandwidthCredential;
-use time::OffsetDateTime;
 use tracing::{debug, warn};
 use zeroize::Zeroizing;

@@ -14,7 +13,7 @@ pub async fn import_credential<S>(
    credentials_store: S,
    raw_credential: Vec<u8>,
    credential_version: impl Into<Option<u8>>,
-) -> Result<Option<OffsetDateTime>, NymIdError>
+) -> Result<(), NymIdError>
 where
    S: Storage,
    <S as Storage>::StorageError: Send + Sync + 'static,
@@ -30,10 +29,9 @@ where
        credential.typ()
    );

-    let expiry_date = match credential.variant_data() {
+    match credential.variant_data() {
        BandwidthCredentialIssuedDataVariant::Voucher(voucher_info) => {
-            debug!("with value of {}", voucher_info.value());
-            None
+            debug!("with value of {}", voucher_info.value())
        }
        BandwidthCredentialIssuedDataVariant::FreePass(freepass_info) => {
            debug!("with expiry at {}", freepass_info.expiry_date());
@@ -44,11 +42,9 @@ where
                return Err(NymIdError::ExpiredCredentialImport {
                    expiration: freepass_info.expiry_date(),
                });
-            } else {
-                Some(freepass_info.expiry_date())
            }
        }
-    };
+    }

    // SAFETY:
    // for the epoch to run over u32::MAX, we'd have to advance it for few centuries every block...
@@ -71,5 +67,5 @@ where
        .map_err(|source| NymIdError::StorageError {
            source: Box::new(source),
        })?;
-    Ok(expiry_date)
+    Ok(())
 }
@@ -9,7 +9,7 @@ license.workspace = true

 [dependencies]
 bls12_381 = { workspace = true, default-features = false, features = ["pairings", "alloc", "experimental"] }
-itertools = { workspace = true }
+itertools = "0.10"
 digest = "0.9"
 rand = "0.8"
 thiserror = { workspace = true }
@@ -33,7 +33,7 @@ default-features = false
 [dev-dependencies]
 criterion = { workspace = true, features = ["html_reports"] }
 doc-comment = { workspace = true }
-rand_chacha = { workspace = true }
+rand_chacha = "0.3"

 [[bench]]
 name = "benchmarks"
@@ -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_crate = { version = "1.0", optional = true, default_features = false, features = ["derive"], package = "serde" }
 generic-array = { workspace = true, optional = true, features = ["serde"] }
 thiserror = { workspace = true }
 zeroize = { workspace = true }
@@ -24,4 +24,4 @@ nym-topology = { path = "../../topology" }
 version = "0.2.83"

 [dev-dependencies]
-rand_chacha = { workspace = true }
+rand_chacha = "0.3"
@@ -300,8 +300,8 @@ impl Fragment {
 #[derive(PartialEq, Clone, Debug)]
 pub(crate) struct FragmentHeader {
    /// ID associated with `FragmentSet` to which this particular `Fragment` belongs.
-    /// Its value is restricted to (0, i32::MAX].
-    /// Note that it *excludes* 0, but *includes* i32::MAX.
+    /// Its value is restricted to (0, i32::max_value()].
+    /// Note that it *excludes* 0, but *includes* i32::max_value().
    /// This allows the field to be represented using 31 bits.
    id: i32,

@@ -319,7 +319,7 @@ pub(crate) struct FragmentHeader {
    previous_fragments_set_id: Option<i32>,

    /// Optional ID of next `FragmentSet` into which the original message was split.
-    /// Note, this option is only valid of `current_fragment == total_fragments == u8::MAX`
+    /// Note, this option is only valid of `current_fragment == total_fragments == u8::max_value()`
    next_fragments_set_id: Option<i32>,
 }

@@ -414,7 +414,7 @@ impl FragmentHeader {

            if current_fragment == 1 {
                previous_fragments_set_id = Some(linked_id);
-            } else if total_fragments == current_fragment && current_fragment == u8::MAX {
+            } else if total_fragments == current_fragment && current_fragment == u8::max_value() {
                next_fragments_set_id = Some(linked_id);
            } else {
                return Err(ChunkingError::MalformedHeaderError);
@@ -585,7 +585,14 @@ mod fragment_tests {
        rng.fill_bytes(&mut msg);

        let fragment = Fragment {
-            header: FragmentHeader::try_new(12345, u8::MAX, u8::MAX, None, Some(1234)).unwrap(),
+            header: FragmentHeader::try_new(
+                12345,
+                u8::max_value(),
+                u8::max_value(),
+                None,
+                Some(1234),
+            )
+            .unwrap(),
            payload: msg,
        };
        let packet_bytes = fragment.clone().into_bytes();
@@ -595,7 +602,14 @@ mod fragment_tests {
        rng.fill_bytes(&mut msg);

        let fragment = Fragment {
-            header: FragmentHeader::try_new(12345, u8::MAX, u8::MAX, None, Some(1234)).unwrap(),
+            header: FragmentHeader::try_new(
+                12345,
+                u8::max_value(),
+                u8::max_value(),
+                None,
+                Some(1234),
+            )
+            .unwrap(),
            payload: msg,
        };
        let packet_bytes = fragment.clone().into_bytes();
@@ -808,8 +822,8 @@ mod fragment_tests {
        assert!(Fragment::try_new(
            &full_payload,
            id,
-            u8::MAX,
-            u8::MAX,
+            u8::max_value(),
+            u8::max_value(),
            None,
            Some(link_id),
            max_plaintext_size(),
@@ -870,8 +884,8 @@ mod fragment_tests {
        assert!(Fragment::try_new(
            &non_full_payload,
            id,
-            u8::MAX,
-            u8::MAX,
+            u8::max_value(),
+            u8::max_value(),
            None,
            Some(link_id),
            max_plaintext_size(),
@@ -880,8 +894,8 @@ mod fragment_tests {
        assert!(Fragment::try_new(
            &non_full_payload2,
            id,
-            u8::MAX,
-            u8::MAX,
+            u8::max_value(),
+            u8::max_value(),
            None,
            Some(link_id),
            max_plaintext_size(),
@@ -891,8 +905,8 @@ mod fragment_tests {
        assert!(Fragment::try_new(
            &too_much_payload,
            id,
-            u8::MAX,
-            u8::MAX,
+            u8::max_value(),
+            u8::max_value(),
            None,
            Some(link_id),
            max_plaintext_size(),
@@ -994,7 +1008,14 @@ mod fragment_header {
        fn fragmented_header_cannot_be_created_with_zero_id() {
            assert!(FragmentHeader::try_new(0, 10, 5, None, None).is_err());
            assert!(FragmentHeader::try_new(12345, 10, 5, Some(0), None).is_err());
-            assert!(FragmentHeader::try_new(12345, u8::MAX, u8::MAX, None, Some(0),).is_err());
+            assert!(FragmentHeader::try_new(
+                12345,
+                u8::max_value(),
+                u8::max_value(),
+                None,
+                Some(0),
+            )
+            .is_err());
        }

        #[test]
@@ -1045,7 +1066,14 @@ mod fragment_header {
        #[test]
        fn can_only_be_post_linked_for_last_fragment() {
            assert!(FragmentHeader::try_new(12345, 10, 10, None, Some(1234)).is_ok());
-            assert!(FragmentHeader::try_new(12345, u8::MAX, u8::MAX, None, Some(1234),).is_ok());
+            assert!(FragmentHeader::try_new(
+                12345,
+                u8::max_value(),
+                u8::max_value(),
+                None,
+                Some(1234),
+            )
+            .is_ok());
            assert!(FragmentHeader::try_new(12345, 10, 2, Some(1234), None).is_err());
        }

@@ -1089,7 +1117,8 @@ mod fragment_header {
        #[test]
        fn post_linked_can_be_converted_to_and_from_bytes_for_exact_number_of_bytes_provided() {
            let fragmented_header =
-                FragmentHeader::try_new(12345, u8::MAX, u8::MAX, None, Some(1234)).unwrap();
+                FragmentHeader::try_new(12345, u8::max_value(), u8::max_value(), None, Some(1234))
+                    .unwrap();

            let header_bytes = fragmented_header.to_bytes();
            let (recovered_header, bytes_used) =
@@ -1101,7 +1130,8 @@ mod fragment_header {
        #[test]
        fn post_linked_can_be_converted_to_and_from_bytes_for_more_than_required_number_of_bytes() {
            let fragmented_header =
-                FragmentHeader::try_new(12345, u8::MAX, u8::MAX, None, Some(1234)).unwrap();
+                FragmentHeader::try_new(12345, u8::max_value(), u8::max_value(), None, Some(1234))
+                    .unwrap();

            let mut header_bytes = fragmented_header.to_bytes();
            header_bytes.append(vec![1, 2, 3, 4, 5].as_mut());
@@ -41,7 +41,7 @@ pub mod set;
 /// (or implicitly the only one), it has no lower bound on the number of `Fragment`s.
 /// (Apart from the restriction of containing at least a single one). If the set is located
 /// somewhere in the middle, *it must be* full. Finally, regardless of its position, it must also be
-/// true that it contains no more than `u8::MAX`, i.e. 255 `Fragment`s.
+/// true that it contains no more than `u8::max_value()`, i.e. 255 `Fragment`s.
 /// Again, the reasoning for this is further explained in `set.rs` file. However, you might
 /// also want to look at `fragment.rs` to understand the full context behind that design choice.
 ///
@@ -151,7 +151,7 @@ mod tests {
            - MAX_NODE_ADDRESS_UNPADDED_LEN;

        let plaintext_lens = vec![17, used_plaintext_len, 20, 42, 10000];
-        const SET_LEN: usize = u8::MAX as usize;
+        const SET_LEN: usize = u8::max_value() as usize;

        for plaintext_len in plaintext_lens {
            let unlinked_len = unlinked_fragment_payload_max_len(plaintext_len);
@@ -24,7 +24,7 @@ struct ReconstructionBuffer {
    previous_fragments_set_id: Option<i32>,
    /// Once all fragments are received, the value of `next_fragments_set_id` is copied
    /// from the last `Fragment` in the set (assuming the set is full, i.e. it contains
-    /// `u8::MAX` elements).
+    /// `u8::max_value()` elements).
    next_fragments_set_id: Option<i32>,

    /// The actual `Fragment` data held by the `ReconstructionBuffer`. When created it is already
@@ -40,7 +40,7 @@ pub type ReconstructedMessage = (Vec<u8>, Vec<i32>);
 impl ReconstructionBuffer {
    /// Initialises new instance of a `ReconstructionBuffer` with given size, i.e.
    /// number of expected `Fragment`s in the set.
-    /// The `u8` input type of `size` argument ensures it has the `u8::MAX` upper bound.
+    /// The `u8` input type of `size` argument ensures it has the `u8::max_value()` upper bound.
    fn new(size: u8) -> Self {
        // Note: `new` should have never been called with size 0 in the first place
        // as `size` value is based on the first recovered `Fragment` in the set.
@@ -122,8 +122,8 @@ impl ReconstructionBuffer {
                .as_ref()
                .unwrap()
                .previous_fragments_set_id();
-            self.next_fragments_set_id = if self.fragments.len() == u8::MAX as usize {
-                self.fragments[u8::MAX as usize - 1]
+            self.next_fragments_set_id = if self.fragments.len() == u8::max_value() as usize {
+                self.fragments[u8::max_value() as usize - 1]
                    .as_ref()
                    .unwrap()
                    .next_fragments_set_id()
@@ -313,8 +313,8 @@ mod reconstruction_buffer {
            assert_eq!(None, frag);
        }

-        let buf = ReconstructionBuffer::new(u8::MAX);
-        assert_eq!(u8::MAX as usize, buf.fragments.len());
+        let buf = ReconstructionBuffer::new(u8::max_value());
+        assert_eq!(u8::max_value() as usize, buf.fragments.len());
        for frag in buf.fragments {
            assert_eq!(None, frag);
        }
@@ -358,11 +358,11 @@ mod reconstruction_buffer {
        buf.insert_fragment(Fragment::try_from_bytes(&raw_fragments[2]).unwrap());
        assert_eq!(message.to_vec(), buf.reconstruct_set_data());

-        let mut buf = ReconstructionBuffer::new(u8::MAX);
+        let mut buf = ReconstructionBuffer::new(u8::max_value());
        let message = vec![
            42u8;
            unlinked_fragment_payload_max_len(AVAILABLE_PLAINTEXT_SIZE)
-                * u8::MAX as usize
+                * u8::max_value() as usize
        ];
        let raw_fragments: Vec<_> =
            crate::split_into_sets(&mut rand::rngs::OsRng, &message, AVAILABLE_PLAINTEXT_SIZE)
@@ -445,7 +445,7 @@ mod reconstruction_buffer {
                .map(|x| x.into_bytes())
                .collect();

-        for raw_fragment in raw_fragments.iter().take(u8::MAX as usize - 1) {
+        for raw_fragment in raw_fragments.iter().take(u8::max_value() as usize - 1) {
            buf.insert_fragment(Fragment::try_from_bytes(raw_fragment).unwrap());
        }

@@ -563,7 +563,7 @@ mod message_reconstructor {
                .map(|x| x.into_bytes())
                .collect();

-        for raw_fragment in raw_fragments.iter().take(u8::MAX as usize) {
+        for raw_fragment in raw_fragments.iter().take(u8::max_value() as usize) {
            assert!(reconstructor
                .insert_new_fragment(
                    reconstructor
@@ -611,7 +611,7 @@ mod message_reconstructor {
                .collect();

        // note that first set is not fully inserted
-        for raw_fragment in raw_fragments.iter().take(u8::MAX as usize - 1) {
+        for raw_fragment in raw_fragments.iter().take(u8::max_value() as usize - 1) {
            assert!(reconstructor
                .insert_new_fragment(
                    reconstructor
@@ -657,7 +657,7 @@ mod message_reconstructor {
                .map(|x| x.into_bytes())
                .collect();

-        for raw_fragment in raw_fragments.iter().take(u8::MAX as usize) {
+        for raw_fragment in raw_fragments.iter().take(u8::max_value() as usize) {
            assert!(reconstructor
                .insert_new_fragment(
                    reconstructor
@@ -699,7 +699,7 @@ mod message_reconstructor {
                .map(|x| x.into_bytes())
                .collect();

-        for raw_fragment in raw_fragments.iter().take(u8::MAX as usize) {
+        for raw_fragment in raw_fragments.iter().take(u8::max_value() as usize) {
            assert!(reconstructor
                .insert_new_fragment(
                    reconstructor
@@ -738,7 +738,7 @@ mod message_reconstructor {
                .collect();

        // note that first set is not fully inserted
-        for raw_fragment in raw_fragments.iter().take(u8::MAX as usize - 1) {
+        for raw_fragment in raw_fragments.iter().take(u8::max_value() as usize - 1) {
            assert!(reconstructor
                .insert_new_fragment(
                    reconstructor
@@ -779,7 +779,7 @@ mod message_reconstructor {
                .map(|x| x.into_bytes())
                .collect();

-        for raw_fragment in raw_fragments.iter().take(u8::MAX as usize * 2) {
+        for raw_fragment in raw_fragments.iter().take(u8::max_value() as usize * 2) {
            assert!(reconstructor
                .insert_new_fragment(
                    reconstructor
@@ -793,7 +793,7 @@ mod message_reconstructor {
        assert!(reconstructor
            .insert_new_fragment(
                reconstructor
-                    .recover_fragment(raw_fragments[(u8::MAX as usize) * 2].clone())
+                    .recover_fragment(raw_fragments[(u8::max_value() as usize) * 2].clone())
                    .unwrap()
            )
            .is_none());
@@ -822,7 +822,11 @@ mod message_reconstructor {
                .collect();

        // note that first set is not fully inserted
-        for raw_fragment in raw_fragments.iter().skip(1).take(u8::MAX as usize * 2 - 1) {
+        for raw_fragment in raw_fragments
+            .iter()
+            .skip(1)
+            .take(u8::max_value() as usize * 2 - 1)
+        {
            assert!(reconstructor
                .insert_new_fragment(
                    reconstructor
@@ -835,7 +839,7 @@ mod message_reconstructor {
        assert!(reconstructor
            .insert_new_fragment(
                reconstructor
-                    .recover_fragment(raw_fragments[(u8::MAX as usize) * 2].clone())
+                    .recover_fragment(raw_fragments[(u8::max_value() as usize) * 2].clone())
                    .unwrap()
            )
            .is_none());
@@ -892,7 +896,7 @@ mod message_reconstructor {
                .collect();

        // note that first set is not fully inserted
-        for raw_fragment in raw_fragments1.iter().take(u8::MAX as usize - 1) {
+        for raw_fragment in raw_fragments1.iter().take(u8::max_value() as usize - 1) {
            assert!(reconstructor
                .insert_new_fragment(
                    reconstructor
@@ -926,7 +930,7 @@ mod message_reconstructor {
                .map(|x| x.into_bytes())
                .collect();

-        for raw_fragment in raw_fragments2.iter().take(u8::MAX as usize) {
+        for raw_fragment in raw_fragments2.iter().take(u8::max_value() as usize) {
            assert!(reconstructor
                .insert_new_fragment(
                    reconstructor
@@ -966,7 +970,7 @@ mod message_reconstructor {
                .map(|x| x.into_bytes())
                .collect();

-        for raw_fragment in raw_fragments.iter().take(u8::MAX as usize) {
+        for raw_fragment in raw_fragments.iter().take(u8::max_value() as usize) {
            assert!(reconstructor
                .insert_new_fragment(
                    reconstructor
@@ -1248,7 +1252,7 @@ mod message_reconstructor {
        //
        // we're inserting this via the buffer approach as not to trigger immediate re-assembly
        let mut reconstructor = MessageReconstructor::default();
-        let mut set_buf1 = ReconstructionBuffer::new(u8::MAX);
+        let mut set_buf1 = ReconstructionBuffer::new(u8::max_value());
        let mut set_buf2 = ReconstructionBuffer::new(1);

        let mut rng = thread_rng();
@@ -1263,7 +1267,7 @@ mod message_reconstructor {
                .map(|x| x.into_bytes())
                .collect();

-        for raw_fragment in raw_fragments.iter().take(u8::MAX as usize) {
+        for raw_fragment in raw_fragments.iter().take(u8::max_value() as usize) {
            set_buf1.insert_fragment(Fragment::try_from_bytes(raw_fragment).unwrap());
        }

@@ -1626,19 +1630,19 @@ mod message_reconstruction {
                    .into_iter()
                    .flat_map(|fragment_set| fragment_set.into_iter())
                    .collect();
-            assert_eq!(fragments1.len(), u8::MAX as usize);
+            assert_eq!(fragments1.len(), u8::max_value() as usize);
            let mut fragments2: Vec<_> =
                crate::split_into_sets(&mut rand::rngs::OsRng, &message2, AVAILABLE_PLAINTEXT_SIZE)
                    .into_iter()
                    .flat_map(|fragment_set| fragment_set.into_iter())
                    .collect();
-            assert_eq!(fragments2.len(), u8::MAX as usize);
+            assert_eq!(fragments2.len(), u8::max_value() as usize);

            // combine and shuffle fragments
            fragments1.append(fragments2.as_mut());
            fragments1.shuffle(&mut rng);
            let fragments = fragments1;
-            assert_eq!(fragments.len(), (u8::MAX as usize) * 2);
+            assert_eq!(fragments.len(), (u8::max_value() as usize) * 2);

            let mut message_reconstructor = MessageReconstructor::default();
            for fragment in fragments.into_iter() {
@@ -1758,7 +1762,7 @@ mod message_reconstruction {
                    .flat_map(|fragment_set| fragment_set.into_iter())
                    .map(|x| x.into_bytes())
                    .collect();
-            assert_eq!(fragments.len(), 4 * (u8::MAX as usize));
+            assert_eq!(fragments.len(), 4 * (u8::max_value() as usize));
            // shuffle the fragments
            fragments.shuffle(&mut rng);

@@ -1807,19 +1811,19 @@ mod message_reconstruction {
                    .into_iter()
                    .flat_map(|fragment_set| fragment_set.into_iter())
                    .collect();
-            assert_eq!(fragments1.len(), 4 * (u8::MAX as usize));
+            assert_eq!(fragments1.len(), 4 * (u8::max_value() as usize));
            let mut fragments2: Vec<_> =
                crate::split_into_sets(&mut rand::rngs::OsRng, &message2, AVAILABLE_PLAINTEXT_SIZE)
                    .into_iter()
                    .flat_map(|fragment_set| fragment_set.into_iter())
                    .collect();
-            assert_eq!(fragments2.len(), 4 * (u8::MAX as usize));
+            assert_eq!(fragments2.len(), 4 * (u8::max_value() as usize));

            // combine and shuffle fragments
            fragments1.append(fragments2.as_mut());
            fragments1.shuffle(&mut rng);
            let fragments = fragments1;
-            assert_eq!(fragments.len(), (u8::MAX as usize) * 8);
+            assert_eq!(fragments.len(), (u8::max_value() as usize) * 8);

            let mut message_reconstructor = MessageReconstructor::default();
            for fragment in fragments.into_iter() {
@@ -11,7 +11,7 @@ use rand::Rng;
 /// on its payload length of the maximum number of `Fragment`s multiplied by their maximum,
 /// fragmented, length.
 pub const fn max_unlinked_set_payload_length(max_plaintext_size: usize) -> usize {
-    u8::MAX as usize * unlinked_fragment_payload_max_len(max_plaintext_size)
+    u8::max_value() as usize * unlinked_fragment_payload_max_len(max_plaintext_size)
 }

 /// If the set is being linked to another one, by either being the very first set, or the very last,
@@ -52,8 +52,8 @@ pub const fn two_way_linked_set_payload_length(max_plaintext_size: usize) -> usi
 pub(crate) type FragmentSet = Vec<Fragment>;

 /// Generate a pseudo-random id for a `FragmentSet`.
-/// Its value is restricted to (0, i32::MAX].
-/// Note that it *excludes* 0, but *includes* i32::MAX.
+/// Its value is restricted to (0, i32::max_value()].
+/// Note that it *excludes* 0, but *includes* i32::max_value().
 /// This particular range allows for the id to be represented using 31bits, rather than
 /// the full length of 32 while still providing more than enough variability to
 /// distinguish different `FragmentSet`s.
@@ -89,13 +89,13 @@ fn prepare_unlinked_fragmented_set(
        / unlinked_fragment_payload_max_len(max_plaintext_size) as f64)
        .ceil() as usize;

-    debug_assert!(pre_casted_frags <= u8::MAX as usize);
+    debug_assert!(pre_casted_frags <= u8::max_value() as usize);
    let num_fragments = pre_casted_frags as u8;

    let mut fragments = Vec::with_capacity(num_fragments as usize);

    for i in 1..(pre_casted_frags + 1) {
-        // we can't use u8 directly here as upper (NON-INCLUSIVE, so it would always fit) bound could be u8::MAX + 1
+        // we can't use u8 directly here as upper (NON-INCLUSIVE, so it would always fit) bound could be u8::max_value() + 1
        let lb = (i - 1) * unlinked_fragment_payload_max_len(max_plaintext_size);
        let ub = usize::min(
            message.len(),
@@ -131,7 +131,7 @@ fn prepare_linked_fragment_set(
 ) -> FragmentSet {
    // determine number of fragments in the set:
    let num_frags_usize = if next_link_id.is_some() {
-        u8::MAX as usize
+        u8::max_value() as usize
    } else {
        // we know this set is linked, if it's not post-linked then it MUST BE pre-linked
        let tail_len = if message.len() >= linked_fragment_payload_max_len(max_plaintext_size) {
@@ -142,7 +142,7 @@ fn prepare_linked_fragment_set(
        let pre_casted_frags = 1
            + (tail_len as f64 / unlinked_fragment_payload_max_len(max_plaintext_size) as f64)
                .ceil() as usize;
-        if pre_casted_frags > u8::MAX as usize {
+        if pre_casted_frags > u8::max_value() as usize {
            panic!("message would produce too many fragments!")
        };
        pre_casted_frags
@@ -162,7 +162,7 @@ fn prepare_linked_fragment_set(

    let mut fragments = Vec::with_capacity(num_frags_usize);
    for i in 1..(num_frags_usize + 1) {
-        // we can't use u8 directly here as upper (NON-INCLUSIVE, so i would always fit) bound could be u8::MAX + 1
+        // we can't use u8 directly here as upper (NON-INCLUSIVE, so i would always fit) bound could be u8::max_value() + 1
        let fragment = Fragment::try_new(
            &message[lb..ub],
            id,
@@ -343,7 +343,7 @@ mod tests {
    fn verify_post_linked_set_payload(mut set: FragmentSet, payload: &[u8]) {
        for i in (0..set.len()).rev() {
            let lb = i * unlinked_fragment_payload_max_len(max_plaintext_size());
-            let ub = if i == (u8::MAX as usize - 1) {
+            let ub = if i == (u8::max_value() as usize - 1) {
                i * unlinked_fragment_payload_max_len(max_plaintext_size())
                    + linked_fragment_payload_max_len(max_plaintext_size())
            } else {
@@ -365,7 +365,7 @@ mod tests {
                (i - 1) * unlinked_fragment_payload_max_len(max_plaintext_size())
                    + linked_fragment_payload_max_len(max_plaintext_size())
            };
-            let ub = if i == (u8::MAX as usize - 1) {
+            let ub = if i == (u8::max_value() as usize - 1) {
                (i - 1) * unlinked_fragment_payload_max_len(max_plaintext_size())
                    + 2 * linked_fragment_payload_max_len(max_plaintext_size())
            } else {
@@ -434,7 +434,7 @@ mod tests {
                id,
                max_plaintext_size(),
            );
-            assert_eq!(u8::MAX as usize, max_fragment_set.len());
+            assert_eq!(u8::max_value() as usize, max_fragment_set.len());
            verify_unlinked_set_payload(max_fragment_set, &max_fragments_set_payload);

            let mut full_set_payload =
@@ -442,7 +442,7 @@ mod tests {
            rng.fill_bytes(&mut full_set_payload);
            let full_fragment_set =
                prepare_unlinked_fragmented_set(&full_set_payload, id, max_plaintext_size());
-            assert_eq!(u8::MAX as usize, full_fragment_set.len());
+            assert_eq!(u8::max_value() as usize, full_fragment_set.len());
            verify_unlinked_set_payload(full_fragment_set, &full_set_payload);
        }

@@ -515,7 +515,7 @@ mod tests {
                None,
                max_plaintext_size(),
            );
-            assert_eq!(u8::MAX as usize, max_fragment_set.len());
+            assert_eq!(u8::max_value() as usize, max_fragment_set.len());
            verify_pre_linked_set_payload(max_fragment_set, &max_fragments_set_payload);

            let mut full_set_payload =
@@ -528,7 +528,7 @@ mod tests {
                None,
                max_plaintext_size(),
            );
-            assert_eq!(u8::MAX as usize, full_fragment_set.len());
+            assert_eq!(u8::max_value() as usize, full_fragment_set.len());
            verify_pre_linked_set_payload(full_fragment_set, &full_set_payload);
        }

@@ -561,7 +561,7 @@ mod tests {
                Some(link_id),
                max_plaintext_size(),
            );
-            assert_eq!(u8::MAX as usize, full_fragment_set.len());
+            assert_eq!(u8::max_value() as usize, full_fragment_set.len());
            verify_post_linked_set_payload(full_fragment_set, &full_set_payload);
        }

@@ -608,7 +608,7 @@ mod tests {
                Some(post_link_id),
                max_plaintext_size(),
            );
-            assert_eq!(u8::MAX as usize, full_fragment_set.len());
+            assert_eq!(u8::max_value() as usize, full_fragment_set.len());
            verify_two_way_linked_set_payload(full_fragment_set, &full_set_payload);
        }

@@ -700,8 +700,8 @@ mod tests {

            let mut sets = split_into_sets(&mut rng, &message, max_plaintext_size());
            assert_eq!(2, sets.len());
-            assert_eq!(sets[0].len(), u8::MAX as usize);
-            assert_eq!(sets[1].len(), u8::MAX as usize);
+            assert_eq!(sets[0].len(), u8::max_value() as usize);
+            assert_eq!(sets[1].len(), u8::max_value() as usize);
            verify_correct_link(&sets[0], &sets[1]);
            verify_pre_linked_set_payload(
                sets.pop().unwrap(),
@@ -726,9 +726,9 @@ mod tests {
            rng.fill_bytes(&mut message);
            let mut sets = split_into_sets(&mut rng, &message, max_plaintext_size());
            assert_eq!(4, sets.len());
-            assert_eq!(sets[0].len(), u8::MAX as usize);
-            assert_eq!(sets[1].len(), u8::MAX as usize);
-            assert_eq!(sets[2].len(), u8::MAX as usize);
+            assert_eq!(sets[0].len(), u8::max_value() as usize);
+            assert_eq!(sets[1].len(), u8::max_value() as usize);
+            assert_eq!(sets[2].len(), u8::max_value() as usize);

            verify_correct_link(&sets[0], &sets[1]);
            verify_correct_link(&sets[1], &sets[2]);
@@ -766,10 +766,10 @@ mod tests {

            let mut sets = split_into_sets(&mut rng, &message, max_plaintext_size());
            assert_eq!(4, sets.len());
-            assert_eq!(sets[0].len(), u8::MAX as usize);
-            assert_eq!(sets[1].len(), u8::MAX as usize);
-            assert_eq!(sets[2].len(), u8::MAX as usize);
-            assert_eq!(sets[3].len(), u8::MAX as usize);
+            assert_eq!(sets[0].len(), u8::max_value() as usize);
+            assert_eq!(sets[1].len(), u8::max_value() as usize);
+            assert_eq!(sets[2].len(), u8::max_value() as usize);
+            assert_eq!(sets[3].len(), u8::max_value() as usize);

            verify_correct_link(&sets[0], &sets[1]);
            verify_correct_link(&sets[1], &sets[2]);
@@ -17,7 +17,7 @@ cosmrs.workspace = true
 eyre = { workspace = true }
 futures.workspace = true
 humantime = { workspace = true }
-sha2 = { workspace = true }
+sha2 = "0.10.8"
 serde = { workspace = true, features = ["derive"] }
 sqlx = { workspace = true, features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate", "time"] }
 tendermint.workspace = true
@@ -8,7 +8,7 @@ license.workspace = true

 [dependencies]
 anyhow = { workspace = true }
-dirs = { workspace = true }
+dirs = "4.0"
 futures = { workspace = true }
 log = { workspace = true }
 pin-project = { workspace = true }
@@ -27,7 +27,6 @@ use nym_task::manager::TaskStatus;
 use nym_task::{TaskClient, TaskHandle};

 use anyhow::anyhow;
-use nym_validator_client::UserAgent;
 use std::error::Error;
 use std::path::PathBuf;

@@ -62,8 +61,6 @@ pub struct NymClient<S> {

    setup_method: GatewaySetup,

-    user_agent: UserAgent,
-
    /// Optional path to a .json file containing standalone network details.
    custom_mixnet: Option<PathBuf>,
 }
@@ -77,17 +74,11 @@ where
    <S::GatewaysDetailsStore as GatewaysDetailsStore>::StorageError: Sync + Send,
    <S::KeyStore as KeyStore>::StorageError: Send + Sync,
 {
-    pub fn new(
-        config: Config,
-        storage: S,
-        user_agent: UserAgent,
-        custom_mixnet: Option<PathBuf>,
-    ) -> Self {
+    pub fn new(config: Config, storage: S, custom_mixnet: Option<PathBuf>) -> Self {
        NymClient {
            config,
            storage,
            setup_method: GatewaySetup::MustLoad { gateway_id: None },
-            user_agent,
            custom_mixnet,
        }
    }
@@ -235,8 +226,7 @@ where

        let mut base_builder =
            BaseClientBuilder::new(&self.config.base, self.storage, dkg_query_client)
-                .with_gateway_setup(self.setup_method)
-                .with_user_agent(self.user_agent);
+                .with_gateway_setup(self.setup_method);

        if let Some(custom_mixnet) = &self.custom_mixnet {
            base_builder = base_builder.with_stored_topology(custom_mixnet)?;
@@ -0,0 +1,20 @@
+# Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+# SPDX-License-Identifier: Apache-2.0
+
+[package]
+name = "nym-statistics-common"
+version = "1.0.1"
+edition = "2021"
+license.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+async-trait = { workspace = true }
+log = { workspace = true }
+reqwest = { workspace = true, features = ["json"] }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+sqlx = { workspace = true, features = ["runtime-tokio-rustls", "chrono"]}
+thiserror = { workspace = true }
+tokio = { workspace = true, features = ["time"] }
@@ -0,0 +1,51 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::error::StatsError;
+use crate::StatsMessage;
+
+pub const DEFAULT_STATISTICS_SERVICE_ADDRESS: &str = "127.0.0.1";
+pub const DEFAULT_STATISTICS_SERVICE_PORT: u16 = 8091;
+
+pub const STATISTICS_SERVICE_VERSION: &str = "/v1";
+pub const STATISTICS_SERVICE_API_STATISTICS: &str = "statistic";
+
+pub async fn build_and_send_statistics_request(
+    msg: StatsMessage,
+    url: String,
+) -> Result<(), StatsError> {
+    reqwest::Client::new()
+        .post(format!(
+            "{url}{STATISTICS_SERVICE_VERSION}/{STATISTICS_SERVICE_API_STATISTICS}"
+        ))
+        .json(&msg)
+        .send()
+        .await?;
+
+    Ok(())
+}
+
+pub fn build_statistics_request_bytes(msg: StatsMessage) -> Result<Vec<u8>, StatsError> {
+    let json_msg = msg.to_json()?;
+
+    let req = reqwest::Request::new(
+        reqwest::Method::POST,
+        reqwest::Url::parse(&format!(
+            "http://{DEFAULT_STATISTICS_SERVICE_ADDRESS}:{DEFAULT_STATISTICS_SERVICE_PORT}{STATISTICS_SERVICE_VERSION}/{STATISTICS_SERVICE_API_STATISTICS}"
+        ))
+        .unwrap(),
+    );
+    let data = format!(
+        "{} {} {:?}\n\
+        Content-Type: application/json\n\
+        Content-Length: {}\n\n\
+        {}\n",
+        req.method().as_str(),
+        req.url().as_str(),
+        req.version(),
+        json_msg.len(),
+        json_msg
+    );
+
+    Ok(data.into_bytes())
+}
@@ -0,0 +1,57 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use async_trait::async_trait;
+use log::error;
+use sqlx::types::chrono::{DateTime, Utc};
+use std::time::Duration;
+use tokio::time;
+
+use crate::error::StatsError;
+use crate::StatsMessage;
+
+const STATISTICS_TIMER_INTERVAL: Duration = Duration::from_secs(60);
+
+#[async_trait]
+pub trait StatisticsCollector {
+    async fn create_stats_message(
+        &self,
+        interval: Duration,
+        timestamp: DateTime<Utc>,
+    ) -> StatsMessage;
+    async fn send_stats_message(&self, stats_message: StatsMessage) -> Result<(), StatsError>;
+    async fn reset_stats(&mut self);
+}
+
+pub struct StatisticsSender<T: StatisticsCollector> {
+    collector: T,
+    interval: Duration,
+    timestamp: DateTime<Utc>,
+}
+
+impl<T: StatisticsCollector> StatisticsSender<T> {
+    pub fn new(collector: T) -> Self {
+        StatisticsSender {
+            collector,
+            interval: STATISTICS_TIMER_INTERVAL,
+            timestamp: Utc::now(),
+        }
+    }
+
+    pub async fn run(&mut self) {
+        let mut interval = time::interval(self.interval);
+        loop {
+            interval.tick().await;
+
+            let stats_message = self
+                .collector
+                .create_stats_message(self.interval, self.timestamp)
+                .await;
+            if let Err(e) = self.collector.send_stats_message(stats_message).await {
+                error!("Statistics not sent: {}", e);
+            }
+            self.collector.reset_stats().await;
+            self.timestamp = Utc::now();
+        }
+    }
+}
@@ -0,0 +1,13 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub enum StatsError {
+    #[error("Serde JSON error: {0}")]
+    SerdeJsonError(#[from] serde_json::Error),
+
+    #[error("Reqwest error: {0}")]
+    ReqwestError(#[from] reqwest::Error),
+}
@@ -0,0 +1,65 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use serde::{Deserialize, Serialize};
+
+use error::StatsError;
+
+pub mod api;
+pub mod collector;
+pub mod error;
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct StatsMessage {
+    pub stats_data: Vec<StatsData>,
+    pub interval_seconds: u32,
+    pub timestamp: String,
+}
+
+impl StatsMessage {
+    pub fn to_json(&self) -> Result<String, StatsError> {
+        Ok(serde_json::to_string(self)?)
+    }
+
+    pub fn from_json(s: &str) -> Result<Self, StatsError> {
+        Ok(serde_json::from_str(s)?)
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub enum StatsData {
+    Service(StatsServiceData),
+    Gateway(StatsGatewayData),
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct StatsGatewayData {
+    pub gateway_id: String,
+    pub inbox_count: u32,
+}
+
+impl StatsGatewayData {
+    pub fn new(gateway_id: String, inbox_count: u32) -> Self {
+        StatsGatewayData {
+            gateway_id,
+            inbox_count,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct StatsServiceData {
+    pub requested_service: String,
+    pub request_bytes: u32,
+    pub response_bytes: u32,
+}
+
+impl StatsServiceData {
+    pub fn new(requested_service: String, request_bytes: u32, response_bytes: u32) -> Self {
+        StatsServiceData {
+            requested_service,
+            request_bytes,
+            response_bytes,
+        }
+    }
+}
@@ -8,21 +8,21 @@ rust-version = "1.58"
 license.workspace = true

 [dependencies]
-base64 = { workspace = true }
+base64 = "0.21.4"
 eyre = { workspace = true }
 hmac = { workspace = true }
-itertools = { workspace = true }
+itertools = "0.11"
 log = { workspace = true }
 reqwest = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-sha2 = { workspace = true }
+sha2 = "0.10.8"
 strum = { workspace = true, features = ["derive"] }
 thiserror = { workspace = true }
 ts-rs = { workspace = true }
 url = { workspace = true }
-x25519-dalek = { workspace = true, features = ["static_secrets"] }
+x25519-dalek = { version = "2.0.0", features = ["static_secrets"] }

 cosmwasm-std = { workspace = true }
 cosmrs = { workspace = true }
@@ -124,6 +124,7 @@ pub struct GatewayNetworkRequesterDetails {
    pub encryption_key: String,

    pub open_proxy: bool,
+    pub enabled_statistics: bool,

    // just a convenience wrapper around all the keys
    pub address: String,
@@ -141,7 +142,8 @@ impl fmt::Display for GatewayNetworkRequesterDetails {
        writeln!(f, "\tencryption key: {}", self.encryption_key)?;
        writeln!(f, "\taddress: {}", self.address)?;

-        writeln!(f, "\tuses open proxy: {}", self.open_proxy)
+        writeln!(f, "\tuses open proxy: {}", self.open_proxy)?;
+        writeln!(f, "\tsends statistics: {}", self.enabled_statistics)
    }
 }

@@ -122,7 +122,7 @@ pub async fn setup_gateway_from_api(
    nym_apis: &[Url],
 ) -> Result<InitialisationResult, WasmCoreError> {
    let mut rng = thread_rng();
-    let gateways = current_gateways(&mut rng, nym_apis, None).await?;
+    let gateways = current_gateways(&mut rng, nym_apis).await?;
    setup_gateway_wasm(client_store, force_tls, chosen_gateway, &gateways).await
 }

@@ -25,13 +25,13 @@ nym-network-defaults = { path = "../network-defaults" }

 ## verify:
 hmac = { workspace = true, optional = true }
-sha2 = { workspace = true, optional = true }
+sha2 = { version = "0.10.8", optional = true }

 ## openapi:
 utoipa = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }

-x25519-dalek = { workspace = true, features = ["static_secrets"] }
+x25519-dalek = { version = "2.0.0", features = ["static_secrets"] }

 [dev-dependencies]
 rand = "0.8.5"
@@ -11,13 +11,13 @@ license.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-base64 = { workspace = true }
+base64 = "0.21.3"
 dashmap = { workspace = true }
 defguard_wireguard_rs = { workspace = true }
 # The latest version on crates.io at the time of writing this (6.0.0) has a
 # version mismatch with x25519-dalek/curve25519-dalek that is resolved in the
 # latest commit. So pick that for now.
-x25519-dalek = { workspace = true }
+x25519-dalek = "2.0.0"
 ip_network = { workspace = true }
 log.workspace = true
 nym-crypto = { path = "../crypto", features = ["asymmetric"] }
@@ -423,11 +423,11 @@
      }
    },
    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
      "dependencies": {
-        "fill-range": "^7.1.1"
+        "fill-range": "^7.0.1"
      },
      "engines": {
        "node": ">=8"
@@ -559,9 +559,9 @@
      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
    },
    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
      "dependencies": {
        "to-regex-range": "^5.0.1"
      },
@@ -1537,11 +1537,11 @@
      }
    },
    "braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
      "requires": {
-        "fill-range": "^7.1.1"
+        "fill-range": "^7.0.1"
      }
    },
    "brorand": {
@@ -1659,9 +1659,9 @@
      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
    },
    "fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
      "requires": {
        "to-regex-range": "^5.0.1"
      }
@@ -15,6 +15,7 @@
 - [Chat demo (webapp)](quickstart/chat-demo.md)
 - [Coconut Credential Playground (webapp)](quickstart/cred-playground.md)
 - [SOCKS Proxy (CLI)](quickstart/socks-proxy.md)
+- [NymConnect Beta (GUI)](quickstart/nymconnect-gui.md)

 # User Manuals

@@ -71,13 +72,11 @@
 [//]: # (- [A Note on Infrastructure]&#40;shipyard/infra.md&#41;)
 [//]: # (- [Submission Guidelines]&#40;shipyard/guidelines.md&#41;)

-<!-- Commenting out as a lot of the stuff is deprecated, can be purged as a part of the large overhaul
 # Events

 - [Web3Privacy Now](./events/web3-privacy.md)
 - [HCPP23-serinko](./events/hcpp23-serinko.md)
 - [HCPP23-max](./events/hcpp23-max.md)
-->

 # FAQ
 - [General](faq/general-faq.md)
@@ -1,9 +1,9 @@
 # Integrations FAQ

-On this page, you'll find links and frequently asked questions on how to get started on integrating your project with Nym's Mixnet and its blockchain, Nyx.
+On this page, you'll find links and frequently asked questions on how to get started on integrating your project with Nym's Mixnet and its blockchain, Nyx. 

 ## Links
-### General Info
+### General Info 
 * [Nym Website](https://nymtech.net/)
 * [Nym Mixnet Explorer](https://explorer.nymtech.net/)
 * [Nyx Block Explorer](https://nym.explorers.guru/)
@@ -13,30 +13,30 @@ On this page, you'll find links and frequently asked questions on how to get sta
 * [Nym Project](https://github.com/nymtech/)

 ### Documentation Info
-* [Documentation](https://nymtech.net/docs/)
-* Developer Portal - you are currently viewing the Developer Portal
+* [Documentation](https://nymtech.net/docs/) 
+* Developer Portal - you are currently viewing the Developer Portal 

-## Wallet Installation
-The Nym wallet can be downloaded [here](https://nymtech.net/download/).
+## Wallet Installation 
+The Nym wallet can be downloaded [here](https://nymtech.net/download/). 

-You can find all the instructions related to setting up your wallet in the [docs](https://nymtech.net/docs/wallet/desktop-wallet.html), as well as instructions on how to build the wallet if there is not a downloadable version built for your operating system.
+You can find all the instructions related to setting up your wallet in the [docs](https://nymtech.net/docs/wallet/desktop-wallet.html), as well as instructions on how to build the wallet if there is not a downloadable version built for your operating system. 

 ### What are the machine hardware requirements for Nym Wallet?
 About 16GB of RAM is recommended for the wallet. However you can expect an average memory usage of ~100MB.


-## Interacting with the Nyx blockchain
-### Where can I find information on the blockchain, such as RPC endpoints?
-You can find most information required for integration in the [Cosmos Chain Registry](https://github.com/cosmos/chain-registry/blob/master/nyx/chain.json) and [Keplr Chain Registry](https://github.com/chainapsis/keplr-chain-registry/blob/main/cosmos/nyx.json) repositories.
+## Interacting with the Nyx blockchain 
+### Where can I find information on the blockchain, such as RPC endpoints? 
+You can find most information required for integration in the [Cosmos Chain Registry](https://github.com/cosmos/chain-registry/blob/master/nyx/chain.json) and [Keplr Chain Registry](https://github.com/chainapsis/keplr-chain-registry/blob/main/cosmos/nyx.json) repositories. 

 ### How can I use `JSON-RPC` methods to interact with the Nyx blockchain?
-There are multiple ways to use `JSON-RPC` methods to interact with the Nyx blockchain. Which method you use will depend on the type of application you are integrating Nyx interactions into.
+There are multiple ways to use `JSON-RPC` methods to interact with the Nyx blockchain. Which method you use will depend on the type of application you are integrating Nyx interactions into. 

-1. The standalone `nyxd` binary can be used for CLI wallets, interacting with smart contracts via the CLI, setting up RPC nodes, and even running validators. This is a version of the Cosmos Hub's `gaiad` binary compiled with Nyx chain configuration, and is written in `Go`. Instructions on setting up the `nyxd` binary can be found [here](https://nymtech.net/docs/nyx/interacting-with-chain.html). This is recommended for more complex commands. For full documentation check the [`gaiad documentation`](https://hub.cosmos.network/main/hub-overview/overview.html#).
+1. The standalone `nyxd` binary can be used for CLI wallets, interacting with smart contracts via the CLI, setting up RPC nodes, and even running validators. This is a version of the Cosmos Hub's `gaiad` binary compiled with Nyx chain configuration, and is written in `Go`. Instructions on setting up the `nyxd` binary can be found [here](https://nymtech.net/docs/nyx/interacting-with-chain.html). This is recommended for more complex commands. For full documentation check the [`gaiad documentation`](https://hub.cosmos.network/main/hub-overview/overview.html#). 

-2. `CosmJS` is a Typescript library allowing for developers to interact with CosmosSDK blockchains from a Javascript or Typescript project. You can find it on Github [here](https://github.com/cosmos/cosmjs) and an explainer of its functionality [in the Cosmos Developer Portal](https://tutorials.cosmos.network/tutorials/7-cosmjs/1-cosmjs-intro.html). You can find a list of example apps which use CosmJS [here](https://codesandbox.io/examples/package/@cosmjs/stargate).
+2. `CosmJS` is a Typescript library allowing for developers to interact with CosmosSDK blockchains from a Javascript or Typescript project. You can find it on Github [here](https://github.com/cosmos/cosmjs) and an explainer of its functionality [in the Cosmos Developer Portal](https://tutorials.cosmos.network/tutorials/7-cosmjs/1-cosmjs-intro.html). You can find a list of example apps which use CosmJS [here](https://codesandbox.io/examples/package/@cosmjs/stargate). 

-3. The `Nym-CLI` tool, a standalone rust binary which can be built and used according to the [docs](https://nymtech.net/docs/tools/nym-cli.html) can be used in much the same way as `nyxd`. It is a bit simpler to use than the `nyxd` binary, but is not recommended for complex queries, and not all commands are currently implemented. A list of Nym CLI commands and example usage can be found [here](https://nymtech.net/docs/tools/nym-cli.html)
+3. The `Nym-CLI` tool, a standalone rust binary which can be built and used according to the [docs](https://nymtech.net/docs/tools/nym-cli.html) can be used in much the same way as `nyxd`. It is a bit simpler to use than the `nyxd` binary, but is not recommended for complex queries, and not all commands are currently implemented. A list of Nym CLI commands and example usage can be found [here](https://nymtech.net/docs/tools/nym-cli.html) 

 ### How do I generate an address/mnemonic for users to interact with?
 **Nyxd**
@@ -53,11 +53,11 @@ Use the following command, replacing `your_id` with the ID you want to use for y

 Both methods will generate a keypair and log the mnemonic in the console.

-**CosmJS**
+**CosmJS** 

-You can find example code for keypair generation [here](https://tutorials.cosmos.network/tutorials/7-cosmjs/2-first-steps.html#testnet-preparation).
+You can find example code for keypair generation [here](https://tutorials.cosmos.network/tutorials/7-cosmjs/2-first-steps.html#testnet-preparation). 

-### How to get block information like block height, block hash, block time as so on?
+### How to get block information like block height, block hash, block time as so on? 
 **Nyxd**

 You would use one of the subcommands returned by this command:
@@ -70,9 +70,9 @@ You would use one of the subcommands returned by this command:
 ./nym-cli block current-height
 ```

-**CosmJS**
+**CosmJS** 

-`CosmJS` documentation can be found [here](https://cosmos.github.io/cosmjs/). We will be working on example code blocks soon.
+`CosmJS` documentation can be found [here](https://cosmos.github.io/cosmjs/). We will be working on example code blocks soon. 

 ### How to get account/address balance to check there is enough coins to withdraw?
 **Nyxd**
@@ -85,11 +85,11 @@ You would use one of the subcommands returned by this command:
 ./nym-cli account balance
 ```

-**CosmJS**
+**CosmJS** 

-`CosmJS` documentation can be found [here](https://cosmos.github.io/cosmjs/). We will be working on example code blocks soon.
+`CosmJS` documentation can be found [here](https://cosmos.github.io/cosmjs/). We will be working on example code blocks soon. 

-### How do I transfer tokens to another address?
+### How do I transfer tokens to another address? 
 **Nyxd**
 ```
 ./nyxd tx bank send [from_key_or_address] [to_address] [amount] --chain-id=nyx --gas=auto --gas-adjustment=1.4 --fees=7000unym
@@ -99,46 +99,46 @@ You would use one of the subcommands returned by this command:
 ```
 ./nym-cli account send TARGET_ADDRESS AMOUNT
 ```
-**CosmJS**
+**CosmJS** 

-`CosmJS` documentation can be found [here](https://cosmos.github.io/cosmjs/). We will be working on example code blocks soon.
+`CosmJS` documentation can be found [here](https://cosmos.github.io/cosmjs/). We will be working on example code blocks soon. 

 ### Does the address support the inclusion of a `memo` or `destinationTag` when doing the transfer?
 Yes, it is supported.

-### Can I use my Ledger hardware wallet to interact with the Nyx blockchain?
-Yes. Follow the instructions in the [Ledger support for Nyx documentation](https://nymtech.net/docs/nyx/ledger-live.html).
+### Can I use my Ledger hardware wallet to interact with the Nyx blockchain? 
+Yes. Follow the instructions in the [Ledger support for Nyx documentation](https://nymtech.net/docs/nyx/ledger-live.html). 

-### Where can I find network details such as deployed smart contract addresses?
-In the [`network defaults`](https://github.com/nymtech/nym/blob/master/common/network-defaults/src/mainnet.rs) file.
+### Where can I find network details such as deployed smart contract addresses? 
+In the [`network defaults`](https://github.com/nymtech/nym/blob/master/common/network-defaults/src/mainnet.rs) file. 

-## `NYM` Token
-The token used to reward mixnet infrastructure operators - `NYM` - is one of the native tokens of the Nyx blockchain. The other token is `NYX`.
+## `NYM` Token 
+The token used to reward mixnet infrastructure operators - `NYM` - is one of the native tokens of the Nyx blockchain. The other token is `NYX`. 

-`NYM` is used to incentivise the mixnet, whereas `NYX` is used to secure the Nyx blockchain via Validator staking.
+`NYM` is used to incentivise the mixnet, whereas `NYX` is used to secure the Nyx blockchain via Validator staking. 

 > Integration with Nym's technology stack will most likely involve using `NYM` if you do need to interact with the Nyx blockchain and transfer tokens.

-### I've seen an ERC20 representation of `NYM` on Ethereum - what's this and how do I use it?
+### I've seen an ERC20 representation of `NYM` on Ethereum - what's this and how do I use it? 

-We use the [Gravity Bridge](https://github.com/Gravity-Bridge) blockchain to bridge an ERC20 representation of `NYM` between the Cosmos ecosystem of IBC-enabled chains and Ethereum mainnet. Gravity Bridge is its own IBC-enabled CosmosSDK chain, which interacts with a smart contract deployed on Ethereum mainnet.
+We use the [Gravity Bridge](https://github.com/Gravity-Bridge) blockchain to bridge an ERC20 representation of `NYM` between the Cosmos ecosystem of IBC-enabled chains and Ethereum mainnet. Gravity Bridge is its own IBC-enabled CosmosSDK chain, which interacts with a smart contract deployed on Ethereum mainnet. 

 > The ERC20 representation of `NYM` **cannot** be used with the mixnet; only the native Cosmos representation is usable for staking or bonding nodes.

-If you need to transfer tokens across the bridge, we recommend users use Cosmostation's [spacestation.zone](https://spacestation.zone/) dApp with Metamask and Keplr.
+If you need to transfer tokens across the bridge, we recommend users use Cosmostation's [spacestation.zone](https://spacestation.zone/) dApp with Metamask and Keplr. 

 ### What is Circulating Supply and how to find out the distribution amount?

 Circulating supply is the total number of available `NYM`. `NYM` is currently present on the IBC-enabled Nyx blockchain, as well as in ERC20 form on Ethereum Mainnet.

-The Validator API endpoints can be found via the [Swagger Documentation](https://validator.nymtech.net/api/swagger/index.html). The following endpoints can be called to retrieve the correct distribution amount and circulating supply within Nym.
+The Validator API endpoints can be found via the [Swagger Documentation](https://validator.nymtech.net/api/swagger/index.html). The following endpoints can be called to retrieve the correct distribution amount and circulating supply within Nym. 

 Using this API endpoint returns information about the circulating supply of Nym tokens:

 ```
 /circulating-supply
 ```
-Query Response:
+Query Response: 

 	{
 	    "total_supply": {
@@ -174,7 +174,7 @@ Using this API endpoint returns the current value of the total supply of NYM tok
 ```
 Query Response:

-	1000000000.0
+	1000000000.0 

 > The maximum number of `NYM` tokens that can ever be created is 1 billion.

@@ -190,9 +190,15 @@ Query Response:
 > This refers to the present quantity of `NYM` tokens that are actively in circulation.


-## Sending traffic through the Nym mixnet
-### Is the mixnet free to use?
-For the moment then yes, the mixnet is free to use. There are no limits on the amount of traffic that an app can send through the mixnet.
+## Sending traffic through the Nym mixnet  
+### Is the mixnet free to use? 
+For the moment then yes, the mixnet is free to use. There are no limits on the amount of traffic that an app can send through the mixnet. 
+
+### Do I need to run my own gateway to send application traffic through the mixnet? 
+No, although we do recommend that apps that wish to integrate look into running some of their own infrastructure such as gateways in order to assure uptime. 
+
+### How can I find out if an application is already supported by network requester services? 
+You can check the [default allowed list](https://nymtech.net/.wellknown/network-requester/standard-allowed-list.txt) file to see which application traffic is whitelisted by default. If the domain is present on that list, it means that existing [network requesters](https://nymtech.net/docs/nodes/network-requester.html) can be used to privacy-protect your application traffic. Simply use [NymConnect](../quickstart/nymconnect-gui.md) to connect to this service through the mixnet.
+
+Currently we are undergoing changes on this policy under the name [Project Smoosh](https://nymtech.net/operators/faq/smoosh-faq.html) where a new type of node [Exit Gateway](https://nymtech.net/operators/legal/exit-gateway.html) will allow users to connect to much wider range of domains, restricted by our new [exit policy](https://nymtech.net/.wellknown/network-requester/exit-policy.txt). Follow the changes [here](https://nymtech.net/operators/faq/smoosh-faq.html#what-are-the-changes).

-### Do I need to run my own gateway to send application traffic through the mixnet?
-No, although we do recommend that apps that wish to integrate look into running some of their own infrastructure such as gateways in order to assure uptime.
@@ -1,8 +1,6 @@
 # NymVPN CLI Guide

 ```admonish info
-To download NymVPN desktop version, visit [nymvpn.com/en/download](https://nymvpn.com/en/download).
-
 NymVPN is an experimental software and it's for testing purposes only. Anyone can submit a registration to the private alpha round on [nymvpn.com](https://nymvpn.com/en).
 ```

@@ -21,7 +19,7 @@ The core binaries consist of:

 > Any syntax in `<>` brackets is a user's/version unique variable. Exchange with a corresponding name without the `<>` brackets.

-1. Open Github [releases page]({{nym_vpn_releases}}) and download the CLI latest binary for your system (labelled as `nym-vpn-core`)
+1. Open Github [releases page]({{nym_vpn_releases}}) and download the CLI latest binary for your system

 2. Verify sha hash of your downloaded binary with the one listed on the [releases page]({{nym_vpn_releases}}). You can use a simple `shasum` command and compare strings (ie with Python) or run in the same directory the following command, exchanging `<SHA_STRING>` with the one of your binary, like in the example:
 ```sh
@@ -1,11 +1,9 @@
 # SOCKS Proxy (CLI)

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

 The Nym socks5 client allows you to proxy traffic from a desktop application through the mixnet, meaning you can send and receive information from remote application servers without leaking metadata which can be used to deanonymise you, even if you're using an encrypted application such as Signal.

-## Setup and Run
-
 ### Download or compile socks5 client

 If you are using OSX or a Debian-based operating system, you can download the `nym-socks5-client` binary from our [Github releases page](https://github.com/nymtech/nym/releases).
@@ -14,33 +12,23 @@ If you are using a different operating system, head over to the [Building from S

 ### Initialise your 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.
-
-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 your socks5 client with the address of a Nym-operated [Network Requester](https://nymtech.net/docs/nodes/network-requester.html) as a provider (the endpoint that will be proxying your traffic out of the mixnet) for ease:

 ```
-./nym-socks5-client init --id <ID> --provider <PROVIDER>
+./nym-socks5-client init --id quickstart --provider Entztfv6Uaz2hpYHQJ6JKoaCTpDL5dja18SuQWVJAmmx.Cvhn9rBJw5Ay9wgHcbgCnVg89MPSV5s2muPV2YF1BXYu@Fo4f4SQLdoyoGkFae5TpVhRVoXCF8UiypLVGtGjujVPf
 ```

-~~~admonish tip
-Another option to find a NR address associated with a Gateway is to query nodes [*Self Described* API endpoint](https://validator.nymtech.net/api/v1/gateways/described) where the NR address is noted like in this example:
-```sh
-"network_requester": {
-    "address": "CyuN49nkyeuiLohSpV5A1MbSqcugHLJQ95B5HooCpjv8.CguTh45Vp99QuGWZRBKpBjZDQbsJaHaXqAMGyc4Qhkzp@2w5RduXRqxKgHt1wtp4qGA4AfXaBj8TuUj1LvcPe2Ea1",
-    "uses_exit_policy": true
-}
-```
-~~~
+You can always check out the list of endpoints you can use otherwise on the [mixnet service provider explorer page](https://explorer.nymtech.net/network-components/service-providers).

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

 ```
-./nym-socks5-client run --id <ID>
+./nym-socks5-client run --id quickstart
 ```

-## Proxying traffic
-After completing the steps above, your local `nym-socks5-client` will be listening on `localhost:1080` ready to proxy traffic to the Network Requester set as the `--provider` when initialising.
+### Proxying traffic
+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`.

@@ -52,20 +40,6 @@ Most wallets and other applications will work basically the same way: find the n

 In some other applications, this might be written as **localhost:1080** if there's only one proxy entry field.

-## Supported Applications
-
-Any application which can be redirected over Socks5 proxy should work. Nym community has been successfully running over Nym Mixnet these applications:
-
- Bitcoin Electrum wallet
- Monero wallet (GUI and CLI with monerod)
- Telegram chat
- Element/Matrix chat
- Firo wallet
- ircd chat
- Blockstream Green
-
-Keep in mind that Nym has been developing a new client **[NymVPN](https://nymvpn.com) (GUI and CLI) routing all users traffic through the Mixnet.**
-
 ## Further reading

 If you want to dig more into the architecture and use of the socks5 client check out its documentation [here](https://nymtech.net/docs/clients/socks5-client.html).
@@ -66,6 +66,7 @@ Quite a bit of stuff gets built. The key working parts are:

 The repository also contains Typescript applications which aren't built in this process. These can be built by following the instructions on their respective docs pages.
 * [Nym Wallet](../wallet/desktop-wallet.md)
+* [Nym Connect](https://nymtech.net/developers/quickstart/nymconnect-gui.html)
 * [Network Explorer UI](../explorers/mixnet-explorer.md)

 > You cannot build from GitHub's .zip or .tar.gz archive files on the releases page - the Nym build scripts automatically include the current git commit hash in the built binary during compilation, so the build will fail if you use the archive code (which isn't a Git repository). Check the code out from github using `git clone` instead.
@@ -1,36 +1,34 @@
-<!--If this page was ever to be uncomented, please keep in mind that nym connect is no longer existing -->
-
 # Version Compatibility Table

-There are numerous components to Nym which are released independently of one another aside from when breaking changes occur in the [core platform code](https://github.com/nymtech/nym/) - mix nodes, gateways, network requesters, and clients.
+There are numerous components to Nym which are released independently of one another aside from when breaking changes occur in the [core platform code](https://github.com/nymtech/nym/) - mix nodes, gateways, network requesters, and clients.  

 Whilst in general it recommended to be running the most recent version of any software, if you cannot do that for whatever reason this table will tell you which versions of different components are mutually compatible with which platform code releases.


 | Core Platform    | SDK           | Wallet          | NymConnect      | Network Explorer | Mixnet contract | Vesting contract |
 | ---------------- | ------------- | --------------- | --------------- | ---------------- | --------------- | ---------------- |
-| 1.1.13 - 1.1.14* | 1.1.7         | 1.1.12 - 1.1.13 | 1.1.12 - 1.1.13 | 1.1.2            | 1.2.0 - 1.3.0   | 1.2.0 - 1.3.0    |
+| 1.1.13 - 1.1.14* | 1.1.7         | 1.1.12 - 1.1.13 | 1.1.12 - 1.1.13 | 1.1.2            | 1.2.0 - 1.3.0   | 1.2.0 - 1.3.0    |   
 | 1.1.1 - 1.1.12   | 1.1.4 - 1.1.7 | 1.1.0 - 1.1.12  | 1.1.1 - 1.1.12  | 1.1.0 - 1.1.2    | 1.1.0 - 1.1.3   | 1.1.0  - 1.1.3   |
 | 1.1.0 - 1.1.1    | 1.1.4         | 1.1.0           | 1.1.0 - 1.1.1   | 1.1.0            | 1.1.0           | 1.1.0            |
 | 1.1.0            | x             | 1.1.0           | 1.1.0           | 1.1.0            | 1.1.0           | 1.1.0            |

-`*` the `nym-mixnode` binary is currently one point ahead of the main platform release version
+`*` the `nym-mixnode` binary is currently one point ahead of the main platform release version 

-> There are seperate changelogs for [`NymConnect`](https://github.com/nymtech/nym/blob/release/{{platform_release_version}}/nym-connect/CHANGELOG.md) and the [`Desktop Wallet`](https://github.com/nymtech/nym/blob/release/{{platform_release_version}}/nym-wallet/CHANGELOG.md). The changelog referenced below is for the core platform code.
+> There are seperate changelogs for [`NymConnect`](https://github.com/nymtech/nym/blob/release/{{platform_release_version}}/nym-connect/CHANGELOG.md) and the [`Desktop Wallet`](https://github.com/nymtech/nym/blob/release/{{platform_release_version}}/nym-wallet/CHANGELOG.md). The changelog referenced below is for the core platform code. 

 | Platform release changelog                                                               |
 | ---------------------------------------------------------------------------------------- |
 | 1.1.14 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.14/CHANGELOG.md))   |
 | 1.1.13 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.13/CHANGELOG.md))   |
 | 1.1.12 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.12/CHANGELOG.md))   |
-| 1.1.11 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.11/CHANGELOG.md))   |
-| 1.1.10 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.10/CHANGELOG.md))   |
-| 1.1.9 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.9/CHANGELOG.md))     |
-| 1.1.8 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.8/CHANGELOG.md))     |
-| 1.1.7 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.7/CHANGELOG.md))     |
-| 1.1.6 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.6/CHANGELOG.md))     |
-| 1.1.5 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.5/CHANGELOG.md))     |
-| 1.1.4 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.4/CHANGELOG.md))     |
+| 1.1.11 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.11/CHANGELOG.md))   | 
+| 1.1.10 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.10/CHANGELOG.md))   |  
+| 1.1.9 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.9/CHANGELOG.md))     | 
+| 1.1.8 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.8/CHANGELOG.md))     | 
+| 1.1.7 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.7/CHANGELOG.md))     | 
+| 1.1.6 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.6/CHANGELOG.md))     | 
+| 1.1.5 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.5/CHANGELOG.md))     | 
+| 1.1.4 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.4/CHANGELOG.md))     | 
 | 1.1.3 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.3/CHANGELOG.md))     |
 | 1.1.2 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.2/CHANGELOG.md))     |
 | 1.1.1 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.1/CHANGELOG.md))     |
@@ -5,7 +5,7 @@ The Nym Desktop Wallet lets you interact with your Nym node and to delegate stak

 You can download it for Mac, Windows, or Linux.

-[![download nym wallet](../images/download-wallet.png)](https://nymtech.net/download/wallet)
+[![download nym wallet](../images/download-wallet.png)](https://github.com/nymtech/nym/releases/tag/nym-wallet-v1.2.4)

 ### Bypassing security warnings

@@ -35,7 +35,6 @@ performance_validator = "http://validator.performance.nymte.ch/"
 performance_testing_release = "v2024.2-fast-and-furious-v2"
 # dependencies
 prometheus_latest_version = "v2.50.1"
-toc_page = "https://nymtech.net/terms-and-conditions/operators/v1.0.0"

 [preprocessor.last-changed]
 command = "mdbook-last-changed"
@@ -68,8 +67,7 @@ extra-watch-dirs = []             # directories to watch for triggering builds
 theme         = "nym_themes"
 default-theme = "coal"
 preferred-dark-theme = "coal"
-#curly-quotes = true
-smart-punctuation = true
+curly-quotes = true
 copy-fonts = true
 no-section-label = false
 additional-css = ["./nym_themes/custom.css", "./nym_themes/mdbook-admonish.css", "./nym_themes/pagetoc.css"]
@@ -3,8 +3,6 @@

 - [Introduction](introduction.md)
 - [Changelog](changelog.md)
- [Release Cycle](release-cycle.md)
- [Sandbox Testnet](sandbox.md)

 # Binaries

@@ -32,7 +30,6 @@
 - [Performance Monitoring & Testing](testing/performance.md)
  <!--- [Node Setup](testing/node-setup.md)-->
  - [Gateway Probe](testing/gateway-probe.md)
-  - [Node API Check](testing/node-api-check.md)
  - [Prometheus & Grafana](testing/prometheus-grafana.md)
    - [ExploreNYM scripts](testing/explorenym-scripts.md)
 <!--    - [Run in a Docker](testing/docker-monitor.md) -->
@@ -84,6 +81,5 @@
 ---
 # Misc.
 - [Code of Conduct](coc.md)
- [Terms & Conditions](toc.md)
 - [Licensing](licensing.md)
 ---
@@ -62,9 +62,10 @@ Quite a bit of stuff gets built. The key working parts are:
 * [nym-cli tool](https://nymtech.net/docs/tools/nym-cli.html): `nym-cli`
 * [nym-api](../nodes/nym-api.md): `nym-api`
 * [nymvisor](../nodes/nymvisor-upgrade.md): `nymvisor`
-
+ 
 The repository also contains Typescript applications which aren't built in this process. These can be built by following the instructions on their respective docs pages.
 * [Nym Wallet](https://nymtech.net/docs/wallet/desktop-wallet.html)
+* [Nym Connect](https://nymtech.net/developers/quickstart/nymconnect-gui.html)
 * [Network Explorer UI](https://nymtech.net/docs/explorers/mixnet-explorer.html)

 > You cannot build from GitHub's .zip or .tar.gz archive files on the releases page - the Nym build scripts automatically include the current git commit hash in the built binary during compilation, so the build will fail if you use the archive code (which isn't a Git repository). Check the code out from github using `git clone` instead.
@@ -1,37 +1,34 @@
-<!--If this page was ever to be uncomented, please keep in mind that nym connect is no longer existing -->
-
 # Version Compatibility Table

-
-There are numerous components to Nym which are released independently of one another aside from when breaking changes occur in the [core platform code](https://github.com/nymtech/nym/) - mix nodes, gateways, network requesters, and clients.
+There are numerous components to Nym which are released independently of one another aside from when breaking changes occur in the [core platform code](https://github.com/nymtech/nym/) - mix nodes, gateways, network requesters, and clients.  

 Whilst in general it recommended to be running the most recent version of any software, if you cannot do that for whatever reason this table will tell you which versions of different components are mutually compatible with which platform code releases.


 | Core Platform    | SDK           | Wallet          | NymConnect      | Network Explorer | Mixnet contract | Vesting contract |
 | ---------------- | ------------- | --------------- | --------------- | ---------------- | --------------- | ---------------- |
-| 1.1.13 - 1.1.14* | 1.1.7         | 1.1.12 - 1.1.13 | 1.1.12 - 1.1.13 | 1.1.2            | 1.2.0 - 1.3.0   | 1.2.0 - 1.3.0    |
+| 1.1.13 - 1.1.14* | 1.1.7         | 1.1.12 - 1.1.13 | 1.1.12 - 1.1.13 | 1.1.2            | 1.2.0 - 1.3.0   | 1.2.0 - 1.3.0    |   
 | 1.1.1 - 1.1.12   | 1.1.4 - 1.1.7 | 1.1.0 - 1.1.12  | 1.1.1 - 1.1.12  | 1.1.0 - 1.1.2    | 1.1.0 - 1.1.3   | 1.1.0  - 1.1.3   |
 | 1.1.0 - 1.1.1    | 1.1.4         | 1.1.0           | 1.1.0 - 1.1.1   | 1.1.0            | 1.1.0           | 1.1.0            |
 | 1.1.0            | x             | 1.1.0           | 1.1.0           | 1.1.0            | 1.1.0           | 1.1.0            |

-`*` the `nym-mixnode` binary is currently one point ahead of the main platform release version
+`*` the `nym-mixnode` binary is currently one point ahead of the main platform release version 

-> There are seperate changelogs for [`NymConnect`](https://github.com/nymtech/nym/blob/release/{{platform_release_version}}/nym-connect/CHANGELOG.md) and the [`Desktop Wallet`](https://github.com/nymtech/nym/blob/release/{{platform_release_version}}/nym-wallet/CHANGELOG.md). The changelog referenced below is for the core platform code.
+> There are seperate changelogs for [`NymConnect`](https://github.com/nymtech/nym/blob/release/{{platform_release_version}}/nym-connect/CHANGELOG.md) and the [`Desktop Wallet`](https://github.com/nymtech/nym/blob/release/{{platform_release_version}}/nym-wallet/CHANGELOG.md). The changelog referenced below is for the core platform code. 

 | Platform release changelog                                                               |
 | ---------------------------------------------------------------------------------------- |
 | 1.1.14 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.14/CHANGELOG.md))   |
 | 1.1.13 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.13/CHANGELOG.md))   |
 | 1.1.12 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.12/CHANGELOG.md))   |
-| 1.1.11 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.11/CHANGELOG.md))   |
-| 1.1.10 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.10/CHANGELOG.md))   |
-| 1.1.9 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.9/CHANGELOG.md))     |
-| 1.1.8 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.8/CHANGELOG.md))     |
-| 1.1.7 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.7/CHANGELOG.md))     |
-| 1.1.6 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.6/CHANGELOG.md))     |
-| 1.1.5 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.5/CHANGELOG.md))     |
-| 1.1.4 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.4/CHANGELOG.md))     |
+| 1.1.11 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.11/CHANGELOG.md))   | 
+| 1.1.10 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.10/CHANGELOG.md))   |  
+| 1.1.9 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.9/CHANGELOG.md))     | 
+| 1.1.8 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.8/CHANGELOG.md))     | 
+| 1.1.7 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.7/CHANGELOG.md))     | 
+| 1.1.6 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.6/CHANGELOG.md))     | 
+| 1.1.5 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.5/CHANGELOG.md))     | 
+| 1.1.4 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.4/CHANGELOG.md))     | 
 | 1.1.3 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.3/CHANGELOG.md))     |
 | 1.1.2 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.2/CHANGELOG.md))     |
 | 1.1.1 ([CHANGELOG](https://github.com/nymtech/nym/blob/release/v1.1.1/CHANGELOG.md))     |
@@ -2,218 +2,13 @@

 This page displays a full list of all the changes during our release cycle from [`v2024.3-eclipse`](https://github.com/nymtech/nym/blob/nym-binaries-v2024.3-eclipse/CHANGELOG.md) onwards. Operators can find here the newest updates together with links to relevant documentation. The list is sorted so that the newest changes appear first.

-## `v2024.6-chomp`
-
- [Release binaries](https://github.com/nymtech/nym/releases/tag/nym-binaries-v2024.6-chomp)
- [Release CHANGELOG.md](https://github.com/nymtech/nym/blob/nym-binaries-v2024.6-chomp/CHANGELOG.md)
- [`nym-node`](nodes/nym-node.md) version `1.1.3`
- Standalone `nym-gateway` and `nym-mixnode` binaries are no longer released
-
-~~~admonish example collapsible=true title='CHANGELOG.md'
- Remove additional code as part of Ephemera Purge and SP and contracts ([#4650])
- bugfix: make sure nym-api can handle non-cw2 (or without detailed build info) compliant contracts ([#4648])
- introduced a flag to accept toc and exposed it via self-described API ([#4647])
- bugfix: make sure to return an error on invalid public ip ([#4646])
- Add ci check for PR having an assigned milestone ([#4644])
- Removed ephemera code ([#4642])
- Remove stale peers ([#4640])
- Add generic wg private network routing ([#4636])
- Feature/new node endpoints ([#4635])
- standarised ContractBuildInformation and added it to all contracts ([#4631])
- validate nym-node public ips on startup ([#4630])
- Bump defguard wg ([#4625])
- Fix cargo warnings ([#4624])
- Update kernel peers on peer modification ([#4622])
- Handle v6 and v7 requests in the IPR, but reply with v6 ([#4620])
- fix typo ([#4619])
- Update crypto and rand crates ([#4607])
- Purge name service and service provider directory contracts ([#4603])
-
-[#4650]: https://github.com/nymtech/nym/pull/4650
-[#4648]: https://github.com/nymtech/nym/pull/4648
-[#4647]: https://github.com/nymtech/nym/pull/4647
-[#4646]: https://github.com/nymtech/nym/pull/4646
-[#4644]: https://github.com/nymtech/nym/pull/4644
-[#4642]: https://github.com/nymtech/nym/pull/4642
-[#4640]: https://github.com/nymtech/nym/pull/4640
-[#4636]: https://github.com/nymtech/nym/pull/4636
-[#4635]: https://github.com/nymtech/nym/pull/4635
-[#4631]: https://github.com/nymtech/nym/pull/4631
-[#4630]: https://github.com/nymtech/nym/pull/4630
-[#4625]: https://github.com/nymtech/nym/pull/4625
-[#4624]: https://github.com/nymtech/nym/pull/4624
-[#4622]: https://github.com/nymtech/nym/pull/4622
-[#4620]: https://github.com/nymtech/nym/pull/4620
-[#4619]: https://github.com/nymtech/nym/pull/4619
-[#4607]: https://github.com/nymtech/nym/pull/4607
-[#4603]: https://github.com/nymtech/nym/pull/4603
-~~~
-
-### Features
-
- [Make embedded NR/IPR ignore performance of the Gateway](https://github.com/nymtech/nym/pull/4671): fixes bug in relation to scoring issue on nym-nodes operating as exit gateways failing to come online.
- [Introduce a flag to accept Operators Terms and Conditions and exposed it via self-described API](https://github.com/nymtech/nym/pull/4647)
-~~~admonish example collapsible=true title='Testing steps performed'
- Verify that the `execute` function correctly checks if the `accept_operator_terms` flag is set.
- Test that a warning is displayed when the `accept_operator_terms` flag is not set.
- Confirm that the `NymNode` instance is initialized with `with_accepted_toc(accepted_toc)` when the flag is set.
- Apply the `--accept-toc` flag in the service and confirmed the change by running:
-```
-curl -s -X 'GET' 'http://18.171.251.41:8080/api/v1/auxiliary-details?output=json' -H 'accept: application/json' | jq .accepted_toc
-```
- Verify that the output is `true`.
-~~~
-
- [Rename 'accept-toc' flag and fields into explicit 'accept-operator-terms-and-conditions'](https://github.com/nymtech/nym/pull/4654): makes the `accept-toc` flag more explicit.
- [Validate nym-node public ips on startup](https://github.com/nymtech/nym/pull/4630): makes sure `nym-node` is not run with an empty `public_ips` and that they do not correspond to common misconfigurations like `127.0.0.1` or `0.0.0.0` unless run with `--local` flag.
-~~~admonish example collapsible=true title='Testing steps performed'
- Use the latest release/chomp binary with nym-node and input a dodgy ip
-<img width="361" alt="image" src="https://github.com/nymtech/nym/assets/60836166/6f2210f9-90ec-48fb-932f-f325c701de09">
-
- Validation:
-<img width="1104" alt="image" src="https://github.com/nymtech/nym/assets/60836166/3bac221f-82f2-44cd-b8c0-6c599b0eb325">
-When restarting the node it complains within the service launch file
-~~~
-
- [New node endpoints](https://github.com/nymtech/nym/pull/4635): introduces new endpoints on nym-api (and creates scaffolding for additional ones) for providing **unfiltered** network topology alongside performance score of all nodes.
-    - `NymApiTopologyProvider` got modified to use those endpoints alongside (configurable) filtering of nodes with score < 50% (like our current blacklist)
-    - Old clients should work as before as no existing endpoint got removed
-~~~admonish example collapsible=true title='Testing steps performed'
- Validate that the `skimmed` endpoints are working, keeping in mind that they are unstable. The *full-fat* and *semi-skimmed* have not yet been implemented.
-~~~
-
- [Remove stale peers](https://github.com/nymtech/nym/pull/4640)
- [Removed ephemera code](https://github.com/nymtech/nym/pull/4642)
-~~~admonish example collapsible=true title='Testing steps performed'
- Check references to everything named SP and Ephemera and removed any additional references
-~~~
-
- [Remove additional code as part of Ephemera Purge and SP and contracts](https://github.com/nymtech/nym/pull/4650): in line with [#4642](https://github.com/nymtech/nym/pull/4642) and [#4603](https://github.com/nymtech/nym/pull/4603)
-~~~admonish example collapsible=true title='Testing steps performed'
- Check references to everything named SP and Ephemera and removed any additional references
-~~~
-
- [Add ci check for PR having an assigned milestone](https://github.com/nymtech/nym/pull/4644): add a CI check for checking that a PR is assigned to a milestone. Can bypassed the check by adding a `no-milestone` label to a PR
-~~~admonish example collapsible=true title='Testing steps performed'
- CI complains if no milestone is associated with the an issue.
-~~~
-
- [Bump defguard wireguard](https://github.com/nymtech/nym/pull/4625)
- [Add generic wireguard private network routing](https://github.com/nymtech/nym/pull/4636): as defguard wireguard only allows for peer routing modifications, we will configure the entire wireguard private network to be routed to the wg device. Configuring per peer is also not desirable, as the interface doesn't allow removing routes, so unused ip routing won't be cleaned until gateway restart (and it would also pollute to routing table with a lot of rules when many peers are added).
-~~~admonish example collapsible=true title='Testing steps performed'
- This is a part of a bigger ticket, but initial testing has proven to shown that launching nym-nodes (entry and exit gateways) in WG enable mode to be working
-
-*QA will use this template for the other related WG tickets in this release milestone.*
-~~~
- [Standarise `ContractBuildInformation` and add it to all contracts](https://github.com/nymtech/nym/pull/4631): Similarly to `cw2`, we're now saving `ContractBuildInformation` under a constant storage key, i.e. `b"contract_build_info"` that standarises the retrieval by nym-api.
-    - Also each of our contracts now saves and updates that information upon init and migration.
-~~~admonish example collapsible=true title='Testing steps performed'
- Use the latest release/chomp contracts and deploy these to QA
- Use the `nym-api` to query for the results of these new contracts
-
-```sh
- curl -X 'GET' \
-   'https://qa-nym-api.qa.nymte.ch/api/v1/network/nym-contracts-detailed' \
-   -H 'accept: application/json'
-```
-
- It returns a detailed view of the contracts and which branch they were built from, alongside rust versions and so forth.
-<img width="1257" alt="image" src="https://github.com/nymtech/nym/assets/60836166/b5711431-c2f6-44ee-bf02-b17e6c48c5ee">
-~~~
-
- [Update kernel peers on peer modification](https://github.com/nymtech/nym/pull/4622):
-~~~admonish example collapsible=true title='Testing steps performed'
- This is a part of a bigger ticket, but initial testing has proven to shown that launching nym-nodes (entry and exit gateways) in WG enable mode to be working.
-*QA will use this template for the other related WG tickets in this release milestone.*
-~~~
-
- [Handle v6 and v7 requests in the IPR, but reply with v6](https://github.com/nymtech/nym/pull/4620): teach the IPR to read both v6 and v7 requests, but always reply with v6. This is to prepare for bumping to v7 and signed connect/disconnect messages. Follow up PRs will add
-    - Verify signature
-    - Send v7 in client with signatures included
- [Purge name service and service provider directory contracts](https://github.com/nymtech/nym/pull/4603): this is a compiler assisted purge of the `nym-name-service` and `nym-service-provider-directory` contracts that were never deployed on mainnet, and will anyhow be superseded by the new mixnode directory that is being worked on.
-~~~admonish example collapsible=true title='Testing steps performed'
-It works insofar that it compiles, we need to deploy and test this on non-mainnet before merging in
-
- Purge `nym-name-service` contract
- Purge `nym-name-service-common`
- Purge `nym-service-provider-directory` contract
- Purge `nym-service-provider-directory-common`
- Remove everywhere name-service contract is used
- Remove everywhere sp contract is used
-
-Performed:
- Check references to everything named SP and Ephemera and removed any additional references
-~~~
-
-### Crypto
-
- [Update crypto and rand crates](https://github.com/nymtech/nym/pull/4607): Update sphinx crate to `0.1.1` along with 25519 crates and `rand` crates
-~~~admonish example collapsible=true title="Comments"
-This PR contains a test failure due to the update [here](https://github.com/nymtech/nym/blob/b4a0487a41375167b2f481c00917b957b9f89789/common/crypto/src/asymmetric/encryption/mod.rs#L353-L358)
-
- This is due a change in `x25519-dalek` from `1.1.1` to `2`.
- Crypto operations should be identical, but the byte representation has changed (sphinx clamps at creation, x25519 clamps at use). This cannot be changed in the sphinx crate without breaking changes.
- There is a good chance that this failure doesn't impact anything else, but it has to be tested to see.
- A mix of old and new clients with a mix of old and new mixnodes should do
-~~~
-
-### Bugfix
- [Make sure nym-api can handle non-cw2 (or without detailed build info) compliant contracts](https://github.com/nymtech/nym/pull/4648): fixes the issue (even if some contracts aren't uploaded on chain it doesn't prohibit the api from working - caveat, the essential vesting and mixnet contract are required)
-~~~admonish example collapsible=true title='Testing steps performed'
- Use the latest release/chomp contracts and deploy these to QA
- If the contract was not found, the API would complain of invalid contracts, thus not starting the rest of the operations of the API (network monitor / rewarding etc)
-
- `Jun 11 16:27:34 qa-v2-nym-api bash[1352642]:  2024-06-11T16:27:34.551Z ERROR nym_api::nym_contract_cache::cache::refresher > Failed to refresh validator cache - Abci query failed with code 6 - address n14y2x8a60knc5jjfeztt84kw8x8l5pwdgnqg256v0p9v4p7t2q6eswxyusw: no such contract: unknown request`
-~~~
-
- [Make sure to return an error on `nym-node` invalid public ip](https://github.com/nymtech/nym/pull/4646): bugfix for [#4630](https://github.com/nymtech/nym/pull/4630) that interestingly hasn't been detected by clippy.
-~~~admonish example collapsible=true title='Testing steps performed'
- Use the latest release/chomp binary with nym-node and input a dodgy ip
-<img width="361" alt="image" src="https://github.com/nymtech/nym/assets/60836166/6f2210f9-90ec-48fb-932f-f325c701de09">
-
- Validation:
-<img width="1104" alt="image" src="https://github.com/nymtech/nym/assets/60836166/3bac221f-82f2-44cd-b8c0-6c599b0eb325">
-~~~
-
- [Extend the return error when connecting to gateway fails](https://github.com/nymtech/nym/pull/4626)
-~~~admonish example collapsible=true title='Testing steps performed'
- Verify that the `establish_connection` function correctly attempts to establish a connection to the gateway.
- Test error handling for `NetworkConnectionFailed` by simulating a failed connection.
- Ensure that the `NetworkConnectionFailed` error includes the `address` and `source` details as expected.
- Checked that `SocketState::Available` is set correctly when a connection is successfully established.
-~~~
-
- [Fix Cargo warnings](https://github.com/nymtech/nym/pull/4624): On every cargo command we have the set warnings:
-~~~admonish example collapsible=true title="Cargo warnings"
-warning: /home/alice/src/nym/nym/common/dkg/Cargo.toml: `default-features` is ignored for bls12_381, since `default-features` was not specified for `workspace.dependencies.bls12_381`, this could become a hard error in the future warning: /home/alice/src/nym/nym/common/dkg/Cargo.toml: `default-features` is ignored for ff, since `default-features` was not specified for `workspace.dependencies.ff`, this could become a hard error in the future warning: /home/alice/src/nym/nym/common/dkg/Cargo.toml: `default-features` is ignored for group, since `default-features` was not specified for `workspace.dependencies.group`, this could become a hard error in the future warning: /home/alice/src/nym/nym/common/client-libs/validator-client/Cargo.toml: `default-features` is ignored for bip32, since `default-features` was not specified for `workspace.dependencies.bip32`, this could become a hard error in the future warning: /home/alice/src/nym/nym/common/client-libs/validator-client/Cargo.toml: `default-features` is ignored for prost, since `default-features` was not specified for `workspace.dependencies.prost`, this could become a hard error in the future warning: /home/alice/src/nym/nym/common/credentials-interface/Cargo.toml: `default-features` is ignored for bls12_381, since `default-features` was not specified for `workspace.dependencies.bls12_381`, this could become a hard error in the future warning: /home/alice/src/nym/nym/common/credentials/Cargo.toml: `default-features` is ignored for bls12_381, since `default-features` was not specified for `workspace.dependencies.bls12_381`, this could become a hard error in the future warning: /home/alice/src/nym/nym/common/nymcoconut/Cargo.toml: `default-features` is ignored for bls12_381, since `default-features` was not specified for `workspace.dependencies.bls12_381`, this could become a hard error in the future warning: /home/alice/src/nym/nym/common/nymcoconut/Cargo.toml: `default-features` is ignored for ff, since `default-features` was not specified for `workspace.dependencies.ff`, this could become a hard error in the future warning: /home/alice/src/nym/nym/common/nymcoconut/Cargo.toml: `default-features` is ignored for group, since `default-features` was not specified for `workspace.dependencies.group`, this could become a hard error in the future.
-~~~
-    - This PR adds `default-features = false` to the workspace dependencies to fix these. An alternative way would be to remove `default-features = false` in the crates, but we assume these were put there for a good reason. Also we might have other crates outside of the main workspace that depends on these crates having default features disabled.
-    - We also have the warning `warning: profile package spec nym-wasm-sdk in profile release did not match any packages`  which we fix by commenting out the profile settings, since the crate is currently commented out in the workspace crate list.
-~~~admonish example collapsible=true title='Testing steps performed'
- All binaries have been built and deployed from this branch and no issues have surfaced.
-~~~
-
-### Operators Guide updates
-
- [New Release Cycle](release-cycle.md) introduced: a transparent release flow, including:
-    - New environments
-    - Stable testnet
-    - [Testnet token faucet](https://nymtech.net/operators/sandbox.html#sandbox-token-faucet)
-    - Flow [chart](release-cycle.md#release-flow)
- [Sandbox testnet](sandbox.md) guide: teaching Nym node operators how to run their nodes in Nym Sandbox testnet environment.
- [Terms & Conditions flag](nodes/setup.md#terms--conditions)
- [Node API Check CLI](testing/node-api-check.md)
- [Pruning VPS `syslog` scripts](troubleshooting/vps-isp.md#pruning-logs)
- [Black-xit: Exiting the blacklist](troubleshooting/nodes.md#my-gateway-is-blacklisted)
-
---

 ## `v2024.5-ragusa`

 - [Release binaries](https://github.com/nymtech/nym/releases/tag/nym-binaries-v2024.5-ragusa)
 - [Release CHANGELOG.md](https://github.com/nymtech/nym/blob/nym-binaries-v2024.5-ragusa/CHANGELOG.md)
 - [`nym-node`](nodes/nym-node.md) version `1.1.2`
-~~~admonish example collapsible=true title='CHANGELOG.md'
+~~~admonish example collapsible=true title="CHANGELOG.md"
 - Feature/nym node api location ([#4605])
 - Add optional signature to IPR request/response ([#4604])
 - Feature/unstable tested nodes endpoint ([#4601])
@@ -257,7 +52,7 @@ warning: /home/alice/src/nym/nym/common/dkg/Cargo.toml: `default-features` is ig
    2. For new nodes: Initialise the node with `--location` flag, where they have to provide the country info. Either full country name (e.g. 'Jamaica'), two-letter alpha2 (e.g. 'JM'), three-letter alpha3 (e.g. 'JAM') or three-digit numeric-3 (e.g. '388') can be provided.
    3. For existing nodes: It's also possible to use exactly the same `--location` argument as above, but make sure to also provide `--write-changes` (or `-w`) flag to persist those changes!
 - [Feature/unstable tested nodes endpoint](https://github.com/nymtech/nym/pull/4601): Adds new data structures (`TestNode`, `TestRoute`, `PartialTestResult`) to handle test results for Mixnodes and Gateways. With the inclusion of pagination to handle large API responses efficiently. Lastly, introducing a new route with the tag `unstable` thus meaning not to be consumed without a user risk, prefixes in endpoints with unstable, are what it says on the tin.
-~~~admonish example collapsible=true title='Testing steps performed'
+~~~admonish example collapsible=true title="Testing steps performed"
 - Deploy new api changes to sandbox environment
 - Ensure current operations are transactional and standed operations are working
 - Run a script to ensure that the new endpoints are working as expected with pagination
@@ -265,7 +60,7 @@ warning: /home/alice/src/nym/nym/common/dkg/Cargo.toml: `default-features` is ig
 ~~~

 - [`nym-api`: make report/avg_uptime endpoints ignore blacklist](https://github.com/nymtech/nym/pull/4599): When querying for node specific data, it's no longer going to go through the entire list of all cached (and filtered nodes) to find it; instead it will attempt to retrieve a single unfiltered entry.
-~~~admonish example collapsible=true title='Testing steps performed'
+~~~admonish example collapsible=true title="Testing steps performed"
 - Build the project and deployed it in a test environment.
 - Manually test API endpoints for mixnode and gateway data.
 - Verify that the endpoints return the expected data and handle blacklists correctly.
@@ -279,7 +74,7 @@ curl -X 'GET' 'https://validator.nymtech.net/api/v1/status/gateway/Fo4f4SQLdoyoG

 - [Use rfc3339 for last_polled in described nym-api endpoint](https://github.com/nymtech/nym/pull/4591): Fix issue where the validator-client can't parse the nym-api response for the described endpoint, in particular the `latest_polled` field that was recently added, by making the field use `rfc3339`
    - **Note:** This will require upgrading `nym-api` and everything that depends on the described endpoint.
-~~~admonish example collapsible=true title='Testing steps performed'
+~~~admonish example collapsible=true title="Testing steps performed"
 - Update a `nym-api` to the binary built from this branch, then restart the api
 - Check the `journalctl` for error messages
 - Connected via client and could not see the error messages, this is backwards compatible
@@ -299,7 +94,7 @@ called Result::unwrap() on an Err value: ClientCoreError(ValidatorClientError(Ny
    - Run cargo autoinherit in the root
    - Merge in the new workspace deps in the main list
    - We made sure to not mix in other changes as well - all features flags for all crates should be the same as before
-~~~admonish example collapsible=true title='Testing steps performed'
+~~~admonish example collapsible=true title="Testing steps performed"
 - Run `cargo autoinherit` in the root directory to move dependencies to the workspace level
 - Merge the new workspace dependencies into the main list
 - Ensure no other changes were mixed in during the process
@@ -316,7 +111,7 @@ called Result::unwrap() on an Err value: ClientCoreError(ValidatorClientError(Ny
 #### Crypto

 - [Remove blocking for coconut in the final epoch state](https://github.com/nymtech/nym/pull/4598)
-~~~admonish example collapsible=true title='Testing steps performed'
+~~~admonish example collapsible=true title="Testing steps performed"
 - Build the project to ensure no compilation errors
 - Run tests to verify the functionality of the `issue_credential` function
 - Execute integration tests to check the behaviour during an epoch transition.
@@ -326,7 +121,7 @@ called Result::unwrap() on an Err value: ClientCoreError(ValidatorClientError(Ny
 - [Explicitly handle constraint unique violation when importing credential](https://github.com/nymtech/nym/pull/4588): Add a strong type for when a duplicate credential is imported so the vpn lib can handle this.
 - [Feature/wasm coconut](https://github.com/nymtech/nym/pull/4584): This pull request requires [\#4585](https://github.com/nymtech/nym/pull/4585) to be merged first
 - [Feature/nyxd scraper pruning](https://github.com/nymtech/nym/pull/4564): This PR introduces storage pruning to `nyxd` scraper which is then used by the validators rewarder.
-~~~admonish example collapsible=true title='Testing steps performed'
+~~~admonish example collapsible=true title="Testing steps performed"
 - Add a `main.rs` file in the `nyxd` scraper dir, underneath `lib.rs`, amend `config.pruning_options.validate()?;` to be `let _ = config.pruning_options.validate();` in the mod.rs file
 - Test the different variations of `pruning_options`:
    - Check the *default* option: `pruning_options: PruningOptions::default()`
@@ -345,7 +140,7 @@ called Result::unwrap() on an Err value: ClientCoreError(ValidatorClientError(Ny
 - [`noop` flag for `nym-api` for `nymvisor` compatibility](https://github.com/nymtech/nym/pull/4586)
    - The application starts correctly and logs the starting message
    - The `--no_banner` flag works as intended, providing compatibility with `nymvisor`
-~~~admonish example collapsible=true title='Testing steps performed'
+~~~admonish example collapsible=true title="Testing steps performed"
 - Build the project to ensure no compilation errors
 - Run the binary with different command-line arguments to verify the CLI functionality
 - Test with and without the `--no_banner` flag to ensure compatibility and expected behavior
@@ -167,7 +167,7 @@ IPv6 routing is not only a case for gateways. Imagine a rare occassion when you
 ```ascii
 [client] -> [entry-gateway] -> [mixnode layer 1] -> [your mixnode] -> [IPv6 mixnode layer3] -> [exit-gateway]
 ```
-In this (unusual) case your `mixnode` will not be able to route the packets. The node will drop the packets and its performance would go down. For that reason it's beneficial to have IPv6 enabled when running a `mixnode` functionality.
+In this (unusual) case your `mixnode` will not be able to route the packets. The node will drop the packets and its performance would go down. For that reason it's befetial to have IPv6 enabled when running a `mixnode` functionality.

 ### Quick IPv6 Check

@@ -24,36 +24,30 @@ To run a new node, you can simply execute the `nym-node` command without any fla

 The most crucial aspect of running the node is specifying the `--mode`, which can be one of three: `mixnode`, `entry-gateway`, and `exit-gateway`.

-Currently the `nym-node` binary can only be run in a single `--mode` at any one time. In the future however, operators will be able to specify multiple modes that a single `nym-node` binary can run. Our goal is to have as many nodes as possible enabling multiple modes, and allow the Nym API to position the node according the network's needs in the beginning of each epoch.
+Currently `nym-node` binary enables to run only one `--mode` at a time. In the future the operators will be able to specify multiple modes within one `nym-node`. Our goal is to have as many nodes each running all the available modes enabled and let the Nym API to position the node acoording the network needs in the beginning of each epoch.

 Every `exit-gateway` mode is basically an `entry-gateway` with NR (Network Requester) and IPR (IP Packet Router) enabled. This means that every `exit-gateway` is automatically seen as an `entry-gateway` but not the opposite.

 Gateway operators can check out the node performance, connectivity and much more in our new tool [harbourmaster.nymtech.net](https://harbourmaster.nymtech.net/).

 To determine which mode your node is running, you can check the `:8080/api/v1/roles` endpoint. For example:
-```sh
-# sustitude <NODE_IP_ADDRESS> or <NODE_DOMAIN> with a real one
+```
 # for http
-http://<NODE_IP_ADDRESS>:8080/api/v1/roles
-# or
-http://<NODE_IP_ADDRESS>/api/v1/roles
+http://<IP_ADDRESS>:8080/api/v1/roles

-# for reversed proxy/WSS
-https://<NODE_DOMAIN>/api/v1/roles
+# for https reversed proxy
+https://<DOMAIN>/api/v1/roles
 ```

 Everything necessary will exist on your node by default. For instance, if you're running a mixnode, you'll find that a NR (Network Requester) and IPR (IP Packet Router) address exist, but they will be ignored in `mixnode` mode.

 For more information about available endpoints and their status, you can refer to:
-```sh
-# sustitude <NODE_IP_ADDRESS> or <NODE_DOMAIN> with a real one
+```
 # for http
-http://<NODE_IP_ADDRESS>:8080/api/v1/swagger/#/
-# or
-http://<NODE_IP_ADDRESS>/api/v1/swagger/#/
+http://<IP>:8080/api/v1/swagger/#/

-# for reversed proxy/WSS
-https://<NODE_DOMAIN>/api/v1/swagger/#/
+# for https reversed proxy
+https://<DOMAIN>/api/v1/swagger/#/
 ```

 ## Usage
@@ -94,7 +88,6 @@ Some of the most useful flags and their explanation:

 ~~~admonish example collapsible=true title="Flags explanation:"
 - `--id <YOUR_ID>`: Local identifier of your node. This `<ID>` determines your config path located at `~/.nym/nym-nodes/<ID>/config/config.toml`, default value is `default-nym-node`
- `--accept-operator-terms-and-conditions`:  Explicitly specify whether you agree with the terms and conditions of a nym node operator as defined at [nymtech.net/terms-and-conditions/operators/v1.0.0]({{toc_page}})
 - `--config-file <PATH>`: Used for the migrate command to indicate the location of the existing node config file. Default path is `~/.nym/nym-nodes/default-nym-node/config/config.toml`
 - `--deny-init`: Use this flag to prevent a new node from being initialized. It's recommended to use this after the first run to avoid accidental spinning up of a second node.
 - `--init-only`: Use this flag if you want to set up a node without starting it.
@@ -106,46 +99,10 @@ Some of the most useful flags and their explanation:
 - `--expose-crypto-hardware <true/false>`: Sets your crypto hardware info visibility on the network.
 ~~~

-### Terms & Conditions
-
-```admonish info
-From `nym-node` version `1.1.3` onward is required to accept [**Operators Terms & Conditions**]({{toc_page}}) in order to be part of the active set. Make sure to read them before you add the flag.
-```
-
-There has been a long ongoing discussion whether and how to apply Terms and Conditions for Nym network operators, with an aim to stay aligned with the philosophy of Free Software and provide legal defense for both node operators and Nym developers. To understand better the reasoning behind this decision, you can listen to the first [Nym Operator Town Hall](https://www.youtube.com/live/7hwb8bAZIuc?si=3mQ2ed7AyUA1SsCp&t=915) introducing the T&Cs or to [Operator AMA with CEO Harry Halpin](https://www.youtube.com/watch?v=yIN-zYQw0I0) from June 4th, 2024, explaining pros and cons of T&Cs implementation.
-
-Accepting T&Cs is done via an explicit flag `--accept-operator-terms-and-conditions` added to `nym-node run` command.
-
-To check whether any node has T&Cs accepted or not can be done by querying Swagger API endpoint `/auxiliary_details` via one of these ports (depending on node setup):
-```sh
-# sustitude <NODE_IP_ADDRESS> or <NODE_DOMAIN> with a real one
-http://<NODE_IP_ADDRESS>:8080/api/v1/auxiliary_details
-https://<NODE_DOMAIN>/api/v1/auxiliary_details
-http://<NODE_IP_ADDRESS>/api/v1/auxiliary_details
-```
-
-~~~admonish example collapsible=true title="Example of `/auxiliary_details` query"
-```sh
-# substitude <NODE_IP_ADDRESS> with a real one
-curl -X 'GET' \
-  'http://<NODE_IP_ADDRESS>:8080/api/v1/auxiliary-details' \
-  -H 'accept: application/json'
-
-{
-  "location": "Kurdistan",
-  "accepted_operator_terms_and_conditions": true
-}
-```
-~~~
-
 ### Commands & Examples

 **`nym-node` introduces a default human readible ID (local only) `default-nym-node`, which is used if there is not an explicit custom `--id <ID>` specified. All configuration is stored in `~/.nym/nym-nodes/default-nym-node/config/config.toml` or `~/.nym/nym-nodes/<ID>/config/config.toml` respectively.**

-```admonish info
-All commands with more options listed below include `--accept-operator-terms-and-conditions` flag, read [Terms & Conditions](#terms--conditions) chapter above before executing these commands.
-```
-
 ### Initialise & Run

 When we use `run` command the node will do `init` as well, unless we specify with a flag `--deny-init`. Below are some examples of initialising and running `nym-node` with different modes (`--mode`) like `mixnode`, `entry-gateway`, `exit-gateway`.
@@ -164,13 +121,15 @@ To prevent over-flooding of our documentation we cannot provide with every singl

 #### Mode: `exit-gateway`

+As part of the transition, `allowed.list` on Exit Gateway embedded Network Requester was depreciated.
+
 **Initialise and run** in one command:
 ```sh
 # simple default
 ./nym-node  run  --mode exit-gateway

 # with other options
-./nym-node run --id <ID> --mode exit-gateway --public-ips "$(curl -4 https://ifconfig.me)" --hostname "<YOUR_DOMAIN>" --http-bind-address 0.0.0.0:8080 --mixnet-bind-address 0.0.0.0:1789 --location <COUNTRY_FULL_NAME> --accept-operator-terms-and-conditions --wireguard-enabled false
+./nym-node run --id <ID> --mode exit-gateway --public-ips "$(curl -4 https://ifconfig.me)" --hostname "<YOUR_DOMAIN>" --http-bind-address 0.0.0.0:8080 --mixnet-bind-address 0.0.0.0:1789 --location <COUNTRY_FULL_NAME> --wireguard-enabled false

 # <YOUR_DOMAIN> is in format without 'https://' prefix
 # <COUNTRY_FULL_NAME> is format like 'Jamaica',  or two-letter alpha2 (e.g. 'JM'), three-letter alpha3 (e.g. 'JAM') or three-digit numeric-3 (e.g. '388') can be provided.
@@ -184,7 +143,7 @@ To prevent over-flooding of our documentation we cannot provide with every singl
 ./nym-node run --init-only --mode exit-gateway

 # with a custom `--id` and other options
-./nym-node run --id <ID> --init-only --mode exit-gateway --public-ips "$(curl -4 https://ifconfig.me)" --hostname "<YOUR_DOMAIN>" --http-bind-address 0.0.0.0:8080 --mixnet-bind-address 0.0.0.0:1789 --location <COUNTRY_FULL_NAME> --accept-operator-terms-and-conditions --wireguard-enabled false
+./nym-node run --id <ID> --init-only --mode exit-gateway --public-ips "$(curl -4 https://ifconfig.me)" --hostname "<YOUR_DOMAIN>" --http-bind-address 0.0.0.0:8080 --mixnet-bind-address 0.0.0.0:1789 true --location <COUNTRY_FULL_NAME> --wireguard-enabled false

 # <YOUR_DOMAIN> is in format without 'https://' prefix
 # <COUNTRY_FULL_NAME> is format like 'Jamaica',  or two-letter alpha2 (e.g. 'JM'), three-letter alpha3 (e.g. 'JAM') or three-digit numeric-3 (e.g. '388') can be provided.
@@ -193,7 +152,7 @@ To prevent over-flooding of our documentation we cannot provide with every singl

 Run the node with custom `--id` without initialising, using `--deny-init` command
 ```sh
-./nym-node run --id <ID> --deny-init --mode exit-gateway --accept-operator-terms-and-conditions
+./nym-node run --id <ID> --deny-init --mode exit-gateway
 ```

 #### Mode: `entry-gateway`
@@ -205,12 +164,12 @@ Run the node with custom `--id` without initialising, using `--deny-init` comman

 Initialise only with a custom `--id` and `--init-only` command:
 ```sh
-./nym-node run --id <ID> --init-only --mode entry-gateway --public-ips "$(curl -4 https://ifconfig.me)" --hostname "<YOUR_DOMAIN>" --http-bind-address 0.0.0.0:8080 --mixnet-bind-address 0.0.0.0:1789 --accept-operator-terms-and-conditions
+./nym-node run --id <ID> --init-only --mode entry-gateway --public-ips "$(curl -4 https://ifconfig.me)" --hostname "<YOUR_DOMAIN>" --http-bind-address 0.0.0.0:8080 --mixnet-bind-address 0.0.0.0:1789
 ```

 Run the node with custom `--id` without initialising:
 ```sh
-./nym-node run --id <ID> --deny-init --mode entry-gateway --accept-operator-terms-and-conditions
+./nym-node run --id <ID> --deny-init --mode entry-gateway
 ```

 #### Mode: `mixnode`
@@ -222,17 +181,17 @@ Run the node with custom `--id` without initialising:

 Initialise only with a custom `--id` and `--init-only` command:
 ```sh
-./nym-node run --id <ID> --init-only --mode mixnode --verloc-bind-address 0.0.0.0:1790 --public-ips "$(curl -4 https://ifconfig.me)" --accept-operator-terms-and-conditions
+./nym-node run --id <ID> --init-only --mode mixnode --verloc-bind-address 0.0.0.0:1790 --public-ips "$(curl -4 https://ifconfig.me)"
 ```

 Run the node with custom `--id` without initialising:
 ```sh
-./nym-node run --id <ID> --deny-init --mode mixnode --accept-operator-terms-and-conditions
+./nym-node run --id <ID> --deny-init --mode mixnode
 ```

 Run the node with custom `--id` without initialising:
 ```sh
-./nym-node run --id <ID> --deny-init --mode entry-gateway --accept-operator-terms-and-conditions
+./nym-node run --id <ID> --deny-init --mode entry-gateway
 ```

 ### Migrate
@@ -253,7 +212,7 @@ Make sure to use `--deny-init` flag to prevent initialisation of a new node.
 ./nym-node migrate --config-file ~/.nym/mixnodes/<MIXNODE_ID>/config/config.toml mixnode

 # initialise with the new nym-node config
-./nym-node run --mode mixnode --id <NYM-NODE_ID> --accept-operator-terms-and-conditions
+./nym-node run --mode mixnode --id <NYM-NODE_ID> --deny-init
 ```

 #### Mode: `entry-gateway` and `exit-gateway`
@@ -261,11 +220,8 @@ Make sure to use `--deny-init` flag to prevent initialisation of a new node.
 # move relevant infor from config.toml
 ./nym-node migrate --config-file ~/.nym/gateways/<GATEWAY_ID>/config/config.toml gateway

-# initialise with the new nym-node config - entry-gateway
-./nym-node run --mode entry-gateway --id <NYM-NODE_ID> --accept-operator-terms-and-conditions
-
-# or as exit-gateway
-./nym-node run --id <NYM-NODE_ID> --mode exit-gateway --public-ips "$(curl -4 https://ifconfig.me)" --hostname "<YOUR_DOMAIN>" --http-bind-address 0.0.0.0:8080 --mixnet-bind-address 0.0.0.0:1789 --location <COUNTRY_FULL_NAME> --accept-operator-terms-and-conditions --wireguard-enabled false
+# initialise with the new nym-node config
+./nym-node run --mode exit-gateway --id <NYM-NODE_ID> --deny-init # or change to entry-gateway
 ```

 ### Next steps
@@ -102,7 +102,7 @@ ufw allow 1789,1790,8000,9000,9001,22/tcp
 ufw allow 9001/tcp

 # in case of reverse proxy for the swagger page (for Gateway optionality)
-ufw allow 8080,80,443/tcp
+ufw allow 8080,80,443

 # for validator
 ufw allow 1317,26656,26660,22,80,443/tcp
@@ -1,91 +0,0 @@
-# Release Cycle
-
-The Nym operator community is growing in quality and quantity. With node operators and developers joining the effort to make the Mixnet more robust and scalable, testing new features, sharing integration pull requests and generally taking an active part in Nym development, more transparency on the release cycle is required.
-
-The core team therefore established a flow with different environments:
-
- ***local***: Developers use their local environments for feature building
- ***canary***: Nym internal testing environment managed by Qualty Assurance team (QA)
- [***sandbox***](sandbox.md): Public testnet, including testnet NYM token available in the [faucet](sandbox.md#sandbox-token-faucet)
- ***mainnet***: Nym Mixnet - the production version of Nym network
-
-## Release Flow
-
-Frequency of releases to mainnet is aimed to be every ~14 days. This time window is an optimal compromise between periodicity and quality assurance/testing, key factors playing an essential role in development.
-
-| **Stage**                                 | **Environment** | **Branch**                 | **Ownership** |
-| :--                                       | :--             | :--                        | :--           |
-| development work                          | local/canary    | feature branches           | devs          |
-| cut and test release                      | canary          | release branch             | QA            |
-| bug fixing                                | canary          | directly on release branch | QA & devs     |
-| put release on sandbox                    | sandbox         | release -> master/develop  | QA            |
-| promote release to mainnet after 3-5 days | mainnet         | master                     | QA            |
-
-```ascii
-                   ▲                          ▲
-                   │                          │
-                   │  merge back into develop │
-      MAINNET      ├─────────────────────────►│
-      easy         │                          │
-      autopromotion│                          │
-      ▲            │                          │
-      │            │                          │
-      │            │                          │◄───────────────────────────────┐
-      │            │                          │                                │
-      └───release  │                          │                                │
-          to       x◄───────────────┐         │                                │
-          sandbox  ▲                │         │◄────────────────────────┐      │
-                   │   ┌────────────►         │                         │      │
-                   │   │            │         │                         │      │
-                   │   │ bug        │         │                         │      │
-                   │   │ fix        │         │◄─────────────────┐      │      │
-                   │   │            │         │                  │      │      │
-                   │   │            │         │ M                │      │      │
-                   │   └────────────┤         │ I                │      │      │
-                   │                │         │ L                │      │      │
-                   │                └─────────x E                │      │      │
-                   │                  release ▲ S                │      │      │
-       ^           │                  cut     │ T                │      │      │
-       :           │                  ---     │ O                │      │      │
-       :           │                  fixed   │ N                │      │      │
-       :           │                  release │ E                │      │      │
-       :           │                  every   │     feature-bob3 │      │      │
-       :           │                  14 days ├──────────────────┘      │      │
-       :           │                          │                         │      │
-       :           │                          │                         │      │
-       :           │                          │     feature-bob2        │      │
-       :           │                          ├─────────────────────────┘      │
-       :           │                          │                                │
-       :           │                          │                                │
-       :           │                          │     feature-bob1               │
-       :           │                          ├────────────────────────────────┘
-       :           │                          │
-       :           │                          │
-       :t          │                          │
-       :i          │                          │
-       :m          │                          │
-       :e          │                          │
-
-                master                     develop             feature branches
-
-ENVs
-┌─────────┬────────┬──────────────────────────┬─────────────────────────────────┐
-│mainnet  │sandbox │ QA / canary              │ development                     │
-│         │        │                          │                                 │
-└─────────┴────────┴──────────────────────────┴─────────────────────────────────┘
-```
-
-### Changes & Collaboration
-
-To track changes easily, builders and operators can visit one of the following:
-
- [*CHANGELOG.md*](https://github.com/nymtech/nym/blob/master/CHANGELOG.md): Raw changelog of the merged feauters in Nym's monorepo, managed by devs and QA.
- [*Changelog page*](changelog.md): A copy of *CHANGELOG.md* with more detailed explanation, testing steps and updated summary of documentation changes, managed by devrels.
-
-In case you want to propose changes or resolve some of the existing [issues](https://github.com/nymtech/nym/issues), start [here](https://github.com/nymtech/nym/issues/new/choose). If you want to add content to the Operators Guide, visit [this page](legal/add-content.md).
-
-```admonish tip
-Feature tickets need explicit (while concise) wording because that title is eventually added to the changelog. Keep in mind that bad ticket naming results in bad changelog.
-
-If you want to run in the testing environment, follow our [Sandbox testnet](sandbox.md) guide.
-```
@@ -1,55 +0,0 @@
-# Sandbox Testnet
-
-Nym node operators can run their nodes in Nym Sandbox testnet environment. Whether it's testing new configuration, hot features from Nym developers or just trying to setup a node for the first time, this environment is for you.
-
-Below are steps to [setup your environment](#sandbox-environment-setup) and an introduction to [Sandbox token faucet](#sandbox-token-faucet).
-
-```admonish warning title=""
-This page is for Nym node operators. If you want to run NymVPN CLI over Sandbox testnet, visit our [developers portal](https://nymtech.net/developers/nymvpn/cli.html#testnet-environment).
-```
-
-## Sandbox Environment Setup
-
-> Any syntax in `<>` brackets is a user's unique variable. Exchange with a corresponding name without the `<>` brackets.
-
-To run Nym binaries in Sandbox testnet, you need to get `sandbox.env` configuration file and point your binary to it. Follow the steps below:
-
-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 binaries:
-```sh
-curl -o sandbox.env -L https://raw.githubusercontent.com/nymtech/nym/develop/envs/sandbox.env
-
-# In case you want to save the file elswhere, change the path in '-o' flag
-```
-
-2. Run your `nym-node` with an additional flag `-c` or `--config-env-file` with a path to `sandbox.env` file followed by all needed commands and options. For example:
-```sh
-# this example is for nym-node in mixnode mode
-./nym-node --config-env-file <PATH/TO/>sandbox.env run --mode mixnode
-
-# this example is for nym-node in exit-gateway mode
-./nym-node --config-file-env <PATH/TO/>sandbox.env run --mode exit-gateway --id <ID> --public-ips "$(curl -4 https://ifconfig.me)" --hostname "<YOUR_DOMAIN>" --http-bind-address 0.0.0.0:8080 --mixnet-bind-address 0.0.0.0:1789 true --location <COUNTRY_FULL_NAME>
-
-# In case you downloaded sandbox.env to the same directory, <PATH> is not needed
-```
-
-3. Bond your node to Nym Sandbox environment:
-	- Open [Nym Wallet](https://nymtech.net/download/wallet) and switch to testnet
-	- Go to [faucet.nymtech.net](https://faucet.nymtech.net) and aquire 101 testnet NYM tokens
-	- Follow the steps on the [bonding page](nodes/bonding.md)
-
-![](images/sandbox.png)
-
-~~~admonish tip
-1. If you [built Nym from source](building-nym.md), you already have `sandbox.env` as a part of the monorepo (`nym/envs/sandbox.env`). Giving that you are likely to run `nym-node` from `nym/target/release`, the flag will look like this `--config-env-file ../../envs/sandbox.env`
-
-2. You can export the path to `sandbox.env` to your enviromental variables:
-```sh
-export NYMNODE_CONFIG_ENV_FILE_ARG=<PATH/TO/sandbox.env>
-```
-~~~
-
-## Sandbox Token Faucet
-
-To run your nodes in Sandbox environment, you need testnet version of NYM token, that can be aquired from [faucet.nymtech.net](https://faucet.nymtech.net).
-
-To prevent abuse, the faucet is rate-limited - your request will fail if the requesting wallet already has 101 NYM tokens.
@@ -1,125 +0,0 @@
-# Node API Check
-
-> Any syntax in `<>` brackets is a user's unique variable/version. Exchange with a corresponding name without the `<>` brackets.
-
-Operating a `nym-node` is not a *"set and forget"* endeavor, it takes some work. To diagnose node performance querying APIs is a good knowledge to have. There are two main places to look for API endpoints regarding `nym-node`:
-
- [`openapi.json`](https://validator.nymtech.net/api/v1/openapi.json): a list of all endpoints
- [Swagger UI page](https://validator.nymtech.net/api/swagger/index.html)
-
-Besides that, Gateway operators can check out their node performance, connectivity and much more on [harbourmaster.nymtech.net](https://harbourmaster.nymtech.net/).
-
-### Basic API usage
-
-For information about available endpoints and their status, you can refer to:
-```sh
-# sustitude <NODE_IP_ADDRESS> or <NODE_DOMAIN> with a real one
-# for http
-http://<NODE_IP_ADDRESS>:8080/api/v1/swagger/#/
-# or
-http://<NODE_IP_ADDRESS>/api/v1/swagger/#/
-
-# for reversed proxy/WSS
-https://<NODE_DOMAIN>/api/v1/swagger/#/
-```
-
-For example to determine which mode your node is running, you can check `:8080/api/v1/roles` endpoint:
-```sh
-# sustitude <NODE_IP_ADDRESS> or <NODE_DOMAIN> with a real one
-# for http
-http://<NODE_IP_ADDRESS>:8080/api/v1/roles
-# or
-http://<NODE_IP_ADDRESS>/api/v1/roles
-
-# for reversed proxy/WSS
-https://<NODE_DOMAIN>/api/v1/roles
-```
-
-## `node_api_check.py`
-
-To make this a bit easier, we made a CLI tool querying all available API endpoints based on node `Identity Key` (further denoted as `<ID_KEY>`) called `node_api_check.py`. To diagnose your node performance, whether by yourself or by sharing an output in our [operator channel](https://matrix.to/#/#operators:nymtech.chat), this tool provides you with a quick overview of live data. We recommend to run this checker alongside [`nym_gateway_probe`](gateway-probe.md) to triage both performance and an actual routing.
-
-Besides querying any bonded node APIs, `nym_api_check` has a function counting all existing nodes in provided version.
-
-### Setup
-
-#### Pre-requsities
-
-**Python3**
-
-1. Start with installing Python3:
-```sh
-sudo apt install python3
-```
-
-2. Make sure Python3 is your default Python version:
-```sh
-update-alternatives --install  /usr/bin/python python /usr/bin/python3 1
-
-# controll
-python --version
-
-# should return higher than 3
-```
-
-3. Install Python modules `tabulate`, `pandas` and `argparse`:
- either using [`pip`](https://python.land/virtual-environments/installing-packages-with-pip) and then running:
-```sh
-pip install tabulate pandas argparse
-```
- or if you installed Python3 system-wide you can install modules directly:
-```sh
-sudo apt install python3-tabulate python3-pandas python3-argparse
-```
-
-**Installation**
-
-4. Get [`node_api_check.py`](https://github.com/nymtech/nym/tree/develop/scripts/node_api_check.py) and [`api_endpoints.json`](https://github.com/nymtech/nym/tree/develop/scripts/api_endpoints.json). If you [compiled from source](../binaries/building-nym.md), you already have both of these files. If you prefer to download them individually, do it by opening terminal in your desired location and running:
-```sh
-wget https://raw.githubusercontent.com/nymtech/nym/tree/develop/node_api_check.py
-
-wget https://raw.githubusercontent.com/nymtech/nym/tree/develop/api_endpoints.json
-```
-
-5. Make executable:
-```sh
-chmod u+x node_api_check.py
-```
-
-Now you are ready to check your node.
-
-### Usage
-
-Run with `--help` flag to see the available commands:
-
-~~~admonish example collapsible=true title="./node_api_check.py --help"
-```python
-<!--cmdrun cd ../../../../scripts && python ./node_api_check.py --help-->
-```
-~~~
-
-#### `query_stats`
-
-When you want to see all the options connected to a command, add a `--help` flag after the command of your choice, like in this example:
-~~~admonish example collapsible=true title="./node_api_check.py query_stats --help"
-```python
-<!--cmdrun cd ../../../../scripts && python ./node_api_check.py query_stats --help-->
-```
-~~~
-
-The most common usage may be `./node_api_check.py query_stats <ID_KEY>` where `<ID_KEY>` is required, substitute it with node Identity Key.
-
-**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     |
-
-#### `version_count`
-
-Another command is `version_count` where at least one `nym-node` version is required. In case of multiple version count, separate the versions with space. We recommend to run this command with `--markdown` flag for a nicer output. This is an example where we want to look up how many registered nodes are on versions `1.1.0`, `1.1.1`, `1.1.2` and `1.1.3`:
-```sh
-./node_api_check version_count 1.1.0 1.1.1 1.1.2 1.1.3 --markdown
-```
@@ -1,9 +0,0 @@
-# Terms and Conditions
-
-With `nym-node` version `1.1.3`, NymTech SA introduced [**Operators Terms & Conditions**]({{toc_page}}) for operators who want their nodes to become a part of the active set of Nym Mixnet.
-
-There has been a long ongoing discussion whether and how to apply Terms and Conditions for Nym network operators, with an aim to stay aligned with the philosophy of Free Software and provide legal defense for both node operators and Nym developers. To understand better the reasoning behind this decision, you can listen to the first [Nym Operator Town Hall](https://www.youtube.com/live/7hwb8bAZIuc?si=3mQ2ed7AyUA1SsCp&t=915) introducing the T&Cs or to [Operator AMA with CEO Harry Halpin](https://www.youtube.com/watch?v=yIN-zYQw0I0) from June 4th, 2024, explaining pros and cons of T&Cs implementation.
-
-Accepting T&Cs is done via an explicit flag `--accept-operator-terms-and-conditions` added to `nym-node run` command.
-
-More information on how to setup your node or check whether any node has T&C accepted can be found in [`nym-node` setup guide](nodes/setup.md#terms--conditions).
@@ -85,8 +85,6 @@ There are 2 community explorers currently, which have been created by [Nodes Gur
 * [Mainnet](https://mixnet.explorers.guru/)
 * [Sandbox testnet](https://sandbox.mixnet.explorers.guru/)

-You can run [Node API Check CLI](../testing/node-api-check.md) to query all API endpoints of your node at once.
-
 [Here](https://github.com/cosmos/chain-registry/blob/master/nyx/chain.json#L158-L187) is a dictionary with Nyx chain registry entry regarding all explorers.

 If you want more information, or if your node isn't showing up on the explorer of your choice and you want to double-check, here are some examples on how to check if the node is configured properly.
@@ -293,67 +291,50 @@ Let your Gateway run and follow these steps:

 ### My Gateway is blacklisted

-Nym API measures performance by routing traffic through the Mixnet. If the average of a Gateway's routing score in past 24h is less than 50%, the Gateway gets blacklisted and it remains so until its performance is higher than 50%.
+Nym API measures performance by routing traffic through the Mixnet. If the average of a Gateway's routing score in past 24h is less than 50%, the Gateway gets blacklisted and remains so until this number is higher than 50%.

 In case your Gateway appeared on the [blacklist](https://validator.nymtech.net/api/v1/gateways/blacklisted), it's because there is some flaw in the configuration. The most common sources of problems are:

- Outdated version of `nym-node`
 - Bonding before starting the node/service
 - Bonding before opening [needed ports](../nodes/vps-setup.md#configure-your-firewall)
- VPS restarted without operator having a [systemd automation](../nodes/configuration.md#systemd) or some alert notification flow setup (so the operator doesn't know the node was stopped)
- IP address or host is incorrectly configured
- Process logs grew too big
- Node is wrapped in [systemd service](../nodes/configuration.md#systemd) and the operator forgot to run `systemctl daemon-reload` after last changes
+- VPS restarted without operator having a [systemd automation](../nodes/configuration.md#systemd) or some alert notification flow setup

-**What to do**
+What to do:

-Begin with a sanity check by opening [harbourmaster.nymtech.net](https://harbourmaster.nymtech.net) and check your node there. To query all API endpoints of your node at once, you can run [Node API Check CLI](../testing/node-api-check.md). To see IPv4 and IPv6 routing in real time (harbourmaster can have a cache up to 90 min), run [Gateway Probe CLI](../testing/gateway-probe.md).
-
-Then follow these steps:
-
-1. Make sure your node is on the [latest version](../changelog.md) and it's running . Do *not* stop it if there is no need!
-2. Open all [needed ports](../nodes/vps-setup.md#configure-your-firewall)
-3. Check your `config.toml` - often people have filled `hostname` without the domain being registered to `nym-node` IP, or a wrong IP address after moving their node.
+1. Make sure your node is running and do not stop it if there is no need
+2. Open all needed [needed ports](../nodes/vps-setup.md#configure-your-firewall)
+3. Check your `config.toml` - often people have filled `hostname` without such hostname being configured or a wrong IP address after moving their node.
 4. [Check Gateway Connectivity](#check-gateway-connectivity)
 5. See logs of your Gateway and search [for errors](#nym-node-errors) - if you find any unusual one, you can ask in the [Element Node Operators](https://matrix.to/#/#operators:nymtech.chat) channel
  - If your logs show that your Node has `cover down: 0.00` that means that the embedded IPR and NR is not sending any cover traffic.
-6. [Check out if your `syslog`s](vps-isp.md#pruning-logs) aren't eating all your disk space and prune them
-7. When all problems are addressed: Restart the node/service (don't forget `systemctl daemon-reload`) and wait until your node gets above 50% of performance (average of last 24h) - this will likely take 24-48 hours. During this time your node is tested by `nym-api` and every positive response picks up your routing score.
-8. If your node doesn't pick up the routing score within 24h at all and it was running in `--mode exit-gateway`, run it as `--mode entry-gateway`. When your node is above 75% performance (past 24h), switch back to `--mode exit-gateway`.
+6. When all problems addressed:Wait until your node gets above 50% of performance (average of last 24h) - this will likely take several hours, up to a day. During this time your node is tested by `nym-api` and every positive response picks up your Gateway's routing score.

-**Do not repeatedly restart your Nym Node without reason, your routing score will only get worse!**
+**Do not restart your Nym Node without reason, your routing score will only get worse!**

 ### Check Gateway connectivity

 **1. Check out the API endpoints**

 Start with checking if your Gateway IPR and NR is active. To determine which mode your node is running, you can check the `:8080/api/v1/roles` endpoint. For example:
-```sh
-# sustitude <NODE_IP_ADDRESS> or <NODE_DOMAIN> with a real one
+```
 # for http
-http://<NODE_IP_ADDRESS>:8080/api/v1/roles
-# or
-http://<NODE_IP_ADDRESS>/api/v1/roles
+http://<IP_ADDRESS>:8080/api/v1/roles

-# for reversed proxy/WSS
-https://<NODE_DOMAIN>/api/v1/roles
+# for https reversed proxy
+https://<DOMAIN>/api/v1/roles
 ```

 Everything necessary will exist on your node by default. For instance, if you're running a mixnode, you'll find that a NR (Network Requester) and IPR (IP Packet Router) address exist, but they will be ignored in `mixnode` mode.

 For more information about available endpoints and their status, you can refer to:
 ```sh
-# sustitude <NODE_IP_ADDRESS> or <NODE_DOMAIN> with a real one
 # for http
-http://<NODE_IP_ADDRESS>:8080/api/v1/swagger/#/
-# or
-http://<NODE_IP_ADDRESS>/api/v1/swagger/#/
+http://<IP>:8080/api/v1/swagger/#/

-# for reversed proxy/WSS
-https://<NODE_DOMAIN>/api/v1/swagger/#/
+# for https reversed proxy
+https://<DOMAIN>/api/v1/swagger/#/
 ```

-
 **2. Configure IPv4 and IPv6 tables and rules**

 - In case you haven't, follow the steps in the node [configuration](../nodes/configuration.md) chapter [connectivity test and configurastion](../nodes/configuration.md#connectivity-test-and-configuration).
@@ -49,43 +49,3 @@ To find the right IP configuration, contact your VPS provider for support to fin
 On self-hosted machine it's a bit more tricky. In that case as an operator you must be sure that your ISP allows for public IPv4 and IPv6 and then it may be a bit of playing around to find the right configuration. One way may be to bind your binary with the `--host` flag to local address `127.0.0.1` and run `echo "$(curl -4 https://ifconfig.me)"` to get a public address which you use to bond your Mix Node to `nym-api` via Nym wallet.

 It's up to you as a node operator to ensure that your public and private IPs match up properly.
-
-### Pruning Logs
-
-Running a `nym-node` as a standalone process or wrapped in a service can produce gigabytes of logs. Eventually your operation can malfunction due to the logs chewing up too much disk space or memory. Below are two scripts that can help you clean this up.
-
-```admonish warning
-`rm` is a powerful tool, without an easy way of revoking. If you need to extract or backup anything, do it now. Make sure you understand what you removing before you execute these commands.
-```
-
-```sh
-# I WANT TO SEE WHATS EATING ALL MY DISKSPACE
-sudo find /var -type f -printf "%s\t%p\n" | sort -n -r | head -n 20 | ls -lh
-sudo find /var -type f -exec ls -lh {} + 2>/dev/null | sort -k 5 -n -r | head -n 20
-
-sudo du -h --max-depth=1 /var
-sudo du -h /var/log
-
-#PRUNE THOSE LOGS
-sudo rm -f /var/log/syslog.1
-sudo rm -f /var/log/syslog
-journalctl --disk-usage
-sudo journalctl --vacuum-time=3d
-sudo journalctl --vacuum-size=50M
-
-#ENFORCE LOG ROTATION
-sudo logrotate --force /etc/logrotate.conf
-sudo service rsyslog restart
-
-# REMOVE ALL THOSE OLD PACKAGES...
-sudo apt-get clean
-sudo apt-get autoremove
-
-sudo apt-get clean
-sudo rm -rf /var/lib/apt/lists/*
-sudo apt-get update
-
-for snap in $(sudo snap list --all | awk '/disabled/{print $1, $3}'); do
-    sudo snap remove $snap
-done
-```
@@ -12,7 +12,7 @@ clap = { workspace = true, features = ["cargo", "derive"] }
 dotenvy = { workspace = true }
 humantime-serde = { workspace = true }
 isocountry = { workspace = true }
-itertools = { workspace = true }
+itertools = "0.10.3"
 log = { workspace = true }
 maxminddb = { workspace = true }
 okapi = { workspace = true, features = ["impl_json_schema"] }
@@ -15,9 +15,7 @@ const HM_SIZE: u8 = 100;

 #[derive(Debug)]
 pub enum GetSpError {
-    #[allow(dead_code)]
    ReqwestError(ReqwestError),
-    #[allow(dead_code)]
    Error(String),
 }

@@ -23,11 +23,11 @@ bs58 = { workspace = true }
 clap = { workspace = true, features = ["cargo", "derive"] }
 colored = { workspace = true }
 dashmap = { workspace = true }
-dirs = { workspace = true }
+dirs = "4.0"
 dotenvy = { workspace = true }
 futures = { workspace = true }
 humantime-serde = { workspace = true }
-ipnetwork = { workspace = true }
+ipnetwork = "0.16"
 log = { workspace = true }
 once_cell = { workspace = true }
 rand = { workspace = true }
@@ -72,6 +72,7 @@ nym-network-requester = { path = "../service-providers/network-requester" }
 nym-node-http-api = { path = "../nym-node/nym-node-http-api" }
 nym-pemstore = { path = "../common/pemstore" }
 nym-sphinx = { path = "../common/nymsphinx" }
+nym-statistics-common = { path = "../common/statistics" }
 nym-task = { path = "../common/task" }
 nym-types = { path = "../common/types" }
 nym-validator-client = { path = "../common/client-libs/validator-client" }
@@ -17,7 +17,7 @@ use nym_gateway::helpers::{
 };
 use nym_network_defaults::mainnet;
 use nym_network_defaults::var_names::NYXD;
-use nym_network_defaults::var_names::{BECH32_PREFIX, NYM_API};
+use nym_network_defaults::var_names::{BECH32_PREFIX, NYM_API, STATISTICS_SERVICE_DOMAIN_ADDRESS};

 use nym_network_requester::{
    generate_new_client_keys, set_active_gateway, setup_fs_gateways_storage, setup_gateway,
@@ -39,6 +39,8 @@ pub(crate) struct OverrideConfig {
    pub(crate) mix_port: Option<u16>,
    pub(crate) clients_port: Option<u16>,
    pub(crate) datastore: Option<PathBuf>,
+    pub(crate) enabled_statistics: Option<bool>,
+    pub(crate) statistics_service_url: Option<url::Url>,
    pub(crate) nym_apis: Option<Vec<url::Url>>,
    pub(crate) mnemonic: Option<bip39::Mnemonic>,
    pub(crate) nyxd_urls: Option<Vec<url::Url>>,
@@ -61,6 +63,12 @@ impl OverrideConfig {
                NYM_API,
                nym_config::parse_urls,
            )
+            .with_optional(Config::with_enabled_statistics, self.enabled_statistics)
+            .with_optional_env(
+                Config::with_custom_statistics_service_url,
+                self.statistics_service_url,
+                STATISTICS_SERVICE_DOMAIN_ADDRESS,
+            )
            .with_optional(Config::with_custom_persistent_store, self.datastore)
            .with_optional(Config::with_cosmos_mnemonic, self.mnemonic)
            .with_optional_custom_env(
@@ -200,6 +208,7 @@ pub(crate) async fn initialise_local_network_requester(
        identity_key: address.identity().to_string(),
        encryption_key: address.encryption_key().to_string(),
        open_proxy: nr_cfg.network_requester.open_proxy,
+        enabled_statistics: nr_cfg.network_requester.enabled_statistics,
        address: address.to_string(),
        config_path: nr_cfg_path.display().to_string(),
    })
@@ -73,6 +73,14 @@ pub struct Run {
    #[arg(long, hide = true)]
    only_coconut_credentials: Option<bool>,

+    /// Enable/disable gateway anonymized statistics that get sent to a statistics aggregator server
+    #[arg(long)]
+    enabled_statistics: Option<bool>,
+
+    /// URL where a statistics aggregator is running. The default value is a Nym aggregator server
+    #[arg(long)]
+    statistics_service_url: Option<url::Url>,
+
    /// Allows this gateway to run an embedded network requester for minimal network overhead
    #[arg(long)]
    with_network_requester: Option<bool>,
@@ -86,6 +94,15 @@ pub struct Run {
    #[arg(long)]
    open_proxy: Option<bool>,

+    /// Enable service anonymized statistics that get sent to a statistics aggregator server
+    #[arg(long)]
+    enable_statistics: Option<bool>,
+
+    /// Mixnet client address where a statistics aggregator is running. The default value is a Nym
+    /// aggregator client
+    #[arg(long)]
+    statistics_recipient: Option<String>,
+
    /// Mostly debug-related option to increase default traffic rate so that you would not need to
    /// modify config post init
    #[arg(long, hide = true, conflicts_with = "medium_toggle")]
@@ -130,6 +147,8 @@ impl From<Run> for OverrideConfig {
            nym_apis: run_config.nym_apis,
            mnemonic: run_config.mnemonic,

+            enabled_statistics: run_config.enabled_statistics,
+            statistics_service_url: run_config.statistics_service_url,
            nyxd_urls: run_config.nyxd_urls,
            only_coconut_credentials: run_config.only_coconut_credentials,
            with_network_requester: run_config.with_network_requester,
@@ -145,6 +164,8 @@ impl<'a> From<&'a Run> for OverrideNetworkRequesterConfig {
            no_cover: value.no_cover,
            medium_toggle: value.medium_toggle,
            open_proxy: value.open_proxy,
+            enable_statistics: value.enable_statistics,
+            statistics_recipient: value.statistics_recipient.clone(),
        }
    }
 }
@@ -32,6 +32,15 @@ pub struct CmdArgs {
    #[clap(long)]
    open_proxy: Option<bool>,

+    /// Enable service anonymized statistics that get sent to a statistics aggregator server
+    #[clap(long)]
+    enable_statistics: Option<bool>,
+
+    /// Mixnet client address where a statistics aggregator is running. The default value is a Nym
+    /// aggregator client
+    #[clap(long)]
+    statistics_recipient: Option<String>,
+
    /// Mostly debug-related option to increase default traffic rate so that you would not need to
    /// modify config post init
    #[clap(long, hide = true, conflicts_with = "medium_toggle")]
@@ -62,6 +71,8 @@ impl<'a> From<&'a CmdArgs> for OverrideNetworkRequesterConfig {
            no_cover: value.no_cover,
            medium_toggle: value.medium_toggle,
            open_proxy: value.open_proxy,
+            enable_statistics: value.enable_statistics,
+            statistics_recipient: value.statistics_recipient.clone(),
        }
    }
 }
@@ -226,6 +226,16 @@ impl Config {
        self
    }

+    pub fn with_enabled_statistics(mut self, enabled_statistics: bool) -> Self {
+        self.gateway.enabled_statistics = enabled_statistics;
+        self
+    }
+
+    pub fn with_custom_statistics_service_url(mut self, statistics_service_url: Url) -> Self {
+        self.gateway.statistics_service_url = statistics_service_url;
+        self
+    }
+
    pub fn with_custom_nym_apis(mut self, nym_api_urls: Vec<Url>) -> Self {
        self.gateway.nym_api_urls = nym_api_urls;
        self
@@ -265,6 +275,10 @@ impl Config {
        self
    }

+    pub fn get_statistics_service_url(&self) -> Url {
+        self.gateway.statistics_service_url.clone()
+    }
+
    pub fn get_nym_api_endpoints(&self) -> Vec<Url> {
        self.gateway.nym_api_urls.clone()
    }
@@ -356,6 +370,13 @@ pub struct Gateway {
    #[serde(deserialize_with = "de_maybe_port")]
    pub clients_wss_port: Option<u16>,

+    /// Whether gateway collects and sends anonymized statistics
+    pub enabled_statistics: bool,
+
+    /// Domain address of the statistics service
+    #[zeroize(skip)]
+    pub statistics_service_url: Url,
+
    /// Addresses to APIs from which the node gets the view of the network.
    #[serde(alias = "validator_api_urls")]
    #[zeroize(skip)]
@@ -384,6 +405,10 @@ impl Gateway {
            mix_port: DEFAULT_MIX_LISTENING_PORT,
            clients_port: DEFAULT_CLIENT_LISTENING_PORT,
            clients_wss_port: None,
+            enabled_statistics: false,
+            statistics_service_url: mainnet::STATISTICS_SERVICE_DOMAIN_ADDRESS
+                .parse()
+                .expect("Invalid default statistics service URL"),
            nym_api_urls: vec![mainnet::NYM_API.parse().expect("Invalid default API URL")],
            nyxd_urls: vec![mainnet::NYXD_URL.parse().expect("Invalid default nyxd URL")],
            cosmos_mnemonic: bip39::Mnemonic::generate(24)
@@ -122,6 +122,8 @@ impl From<ConfigV1_1_36> for Config {
                mix_port: value.gateway.mix_port,
                clients_port: value.gateway.clients_port,
                clients_wss_port: value.gateway.clients_wss_port,
+                enabled_statistics: value.gateway.enabled_statistics,
+                statistics_service_url: value.gateway.statistics_service_url,
                nym_api_urls: value.gateway.nym_api_urls,
                nyxd_urls: value.gateway.nyxd_urls,
                cosmos_mnemonic: value.gateway.cosmos_mnemonic,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jędrzej Stuczyński	1541227f65	even more logs	2024-06-20 16:33:54 +01:00
Jędrzej Stuczyński	391c9984c8	possibly useful, or not, logs for topology request	2024-06-20 16:07:11 +01:00
Jędrzej Stuczyński	42995e08d5	make embedded NR/IPR ignore performance of the gateway	2024-06-20 14:59:13 +01:00