update plugins

update mdbook admonish
2023-10-16 14:04:22 +02:00 · 2023-10-16 13:46:16 +02:00
893 changed files with 9947 additions and 40645 deletions
@@ -1,37 +0,0 @@
-name: 'Install wasm-opt'
-description: 'Installs wasm-opt from binaryen'
-inputs:
-  version:
-    description: 'Version of wasm-opt to install'
-    default: '116'
-runs:
-  using: 'composite'
-  steps:
-    - name: Check platform compatibility
-      run: |
-        if [[ "$(uname)" != "Linux" ]]; then
-          echo "Error: This action is only compatible with Linux."
-          exit 1
-        fi
-      shell: bash
-
-    - name: Download wasm-opt
-      run: |
-        set -e
-        SOURCE="https://github.com/WebAssembly/binaryen/releases/download/version_${{ inputs.version }}/binaryen-version_${{ inputs.version }}-x86_64-linux.tar.gz"
-        TEMP_ARCHIVE="$RUNNER_TEMP/binaryen-version_${{ inputs.version }}-x86_64-linux.tar.gz"
-        curl -L -o "$TEMP_ARCHIVE" "$SOURCE"
-        tar -xvzf $TEMP_ARCHIVE -C $RUNNER_TEMP
-        echo "$RUNNER_TEMP/binaryen-version_${{ inputs.version }}/bin" >> $GITHUB_PATH
-      shell: bash
-      id: install-binary
-
-    - name: Verify installation
-      run: |
-        if ! command -v wasm-opt &> /dev/null; then
-          echo "Error: wasm-opt binary was not installed successfully."
-          exit 1
-        fi
-      shell: bash
-      id: verify-installation
-
@@ -1,16 +1,16 @@
-name: build-upload-binaries
+name: Build and upload binaries to artifact storage

 on:
  workflow_dispatch:
-    inputs:
+    inputs:  
      add_tokio_unstable:
        description: 'True to add RUSTFLAGS="--cfg tokio_unstable"'
        required: true
        default: false
-        type: boolean
-
+        type: boolean 
+    
 env:
-  NETWORK: mainnet
+  NETWORK: mainnet    

 jobs:
  publish-nym:
@@ -1,14 +1,15 @@
-name: cd-docs
+name: CD docs

 on:
  workflow_dispatch:
  push:
+    branches: master
    paths:
      - 'documentation/docs/**'

 jobs:
  build:
-    runs-on: custom-linux
+    runs-on: custom-runner-linux
    steps:
      - uses: actions/checkout@v3
      - name: Install rsync
@@ -25,7 +26,7 @@ jobs:
        uses: actions-rs/cargo@v1
        with:
          command: build
-          args: --workspace --release
+          args: --workspace --release --all
      - name: Install mdbook
        run: (test -x $HOME/.cargo/bin/mdbook || cargo install --vers "^0.4.33" mdbook)
      - name: Install mdbook plugins
@@ -38,6 +39,30 @@ jobs:
        run: cd documentation && ./build_all_to_dist.sh
        continue-on-error: false

+      - name: Deploy branch master to dev
+        continue-on-error: true
+        uses: easingthemes/ssh-deploy@main
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.CD_WWW_SSH_PRIVATE_KEY }}
+          ARGS: "-rltgoDzvO --delete"
+          SOURCE: "dist/docs/"
+          REMOTE_HOST: ${{ secrets.CD_WWW_REMOTE_HOST_DEV }}
+          REMOTE_USER: ${{ secrets.CD_WWW_REMOTE_USER }}
+          TARGET: ${{ secrets.CD_WWW_REMOTE_TARGET }}/
+          EXCLUDE: "/node_modules/"
+
+      - name: Deploy branch master to prod
+        if: github.ref == 'refs/heads/master'
+        uses: easingthemes/ssh-deploy@main
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.CD_WWW_SSH_PRIVATE_KEY }}
+          ARGS: "-rltgoDzvO --delete"
+          SOURCE: "dist/docs/"
+          REMOTE_HOST: ${{ secrets.CD_WWW_REMOTE_HOST_PROD }}
+          REMOTE_USER: ${{ secrets.CD_WWW_REMOTE_USER }}
+          TARGET: ${{ secrets.CD_WWW_REMOTE_TARGET }}/
+          EXCLUDE: "/node_modules/"
+
      - name: Post process
        run: cd documentation && ./post_process.sh
        continue-on-error: false
@@ -1,4 +1,4 @@
-name: ci-binary-config-checker
+name: Run config checks on all binaries

 on:
  workflow_dispatch:
@@ -31,8 +31,8 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        platform: [custom-linux]
-
+        platform: [custom-runner-linux]
+         
    runs-on: ${{ matrix.platform }}
    steps:
      - uses: actions/checkout@v3
@@ -45,12 +45,12 @@ jobs:
        uses: actions-rs/toolchain@v1
        with:
          toolchain: stable
-
+          
      - name: Branch name
        run: echo running on branch ${GITHUB_REF##*/}
-
+                    
      - name: Run tests against binaries
        run: ./build_and_run.sh ${{ github.head_ref || github.ref_name }}
        working-directory: tests/
-
-
+        
+      
@@ -1,14 +1,13 @@
 name: ci-build-ts

 on:
-  pull_request:
+  push:
    paths:
-      - "ts-packages/**"
-      - "sdk/typescript/**"
+      - 'ts-packages/**'

 jobs:
  build:
-    runs-on: ubuntu-20.04-16-core
+    runs-on: custom-runner-linux
    steps:
    - uses: actions/checkout@v2
    - name: Install rsync
@@ -21,7 +20,7 @@ jobs:
    - name: Setup yarn
      run: npm install -g yarn
    - name: Build
-      run: yarn && yarn build && yarn build:ci:storybook
+      run: yarn && yarn build && yarn build:ci
    - name: Deploy branch to CI www (storybook)
      continue-on-error: true
      uses: easingthemes/ssh-deploy@main
@@ -2,6 +2,20 @@ name: ci-build-upload-binaries

 on:
  workflow_dispatch:
+  push:
+    paths:
+      - 'clients/**'
+      - 'common/**'
+      - 'explorer-api/**'
+      - 'gateway/**'
+      - 'integrations/**'
+      - 'mixnode/**'
+      - 'sdk/rust/nym-sdk/**'
+      - 'service-providers/**'
+      - 'nym-api/**'
+      - 'nym-outfox/**'
+      - 'tools/nym-cli/**'
+      - 'tools/ts-rs-cli/**'
  pull_request:
    paths:
      - 'clients/**'
@@ -17,6 +31,9 @@ on:
      - 'tools/nym-cli/**'
      - 'tools/ts-rs-cli/**'

+env:
+  NETWORK: mainnet
+
 jobs:
  publish-nym:
    strategy:
@@ -27,6 +44,8 @@ jobs:
    runs-on: ${{ matrix.platform }}
    env:
      CARGO_TERM_COLOR: always
+    # a push event from the origin repo, or a PR from external repo
+    if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'nymtech/nym' }}
    steps:
      - uses: actions/checkout@v3

@@ -40,7 +59,8 @@ jobs:
          echo $OUTPUT_DIR

      - name: Install Dependencies (Linux)
-        run: sudo apt update && sudo apt install libudev-dev
+        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools protobuf-compiler
+        continue-on-error: true

      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
@@ -48,6 +48,9 @@ jobs:
    runs-on: ${{ matrix.os }}
    env:
      CARGO_TERM_COLOR: always
+    # Enable sccache via environment variable
+    # env:
+      # RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache
    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 libudev-dev squashfs-tools protobuf-compiler
@@ -2,6 +2,10 @@ name: ci-contracts-schema

 on:
  workflow_dispatch:
+  push:
+    paths:
+      - 'contracts/**'
+      - 'common/**'
  pull_request:
    paths:
      - 'contracts/**'
@@ -10,7 +14,7 @@ on:
 jobs:
  check-schema:
    name: Generate and check schema
-    runs-on: custom-linux
+    runs-on: custom-runner-linux
    env:
      CARGO_TERM_COLOR: always
    steps:
@@ -2,6 +2,10 @@ name: ci-contracts-upload-binaries

 on:
  workflow_dispatch:
+  push:
+    paths:
+      - 'common/**'
+      - 'contracts/**'
  pull_request:
    paths:
      - 'common/**'
@@ -20,6 +24,8 @@ jobs:
    runs-on: ${{ matrix.platform }}
    env:
      CARGO_TERM_COLOR: always
+    # a push event from the origin repo, or a PR from external repo
+    if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'nymtech/nym' }}
    steps:
      - uses: actions/checkout@v3

@@ -32,17 +38,19 @@ jobs:
          mkdir -p $OUTPUT_DIR
          echo $OUTPUT_DIR

+      - name: Install Dependencies (Linux)
+        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools protobuf-compiler
+        continue-on-error: true
+
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
-          toolchain: stable
+          toolchain: 1.69.0
          target: wasm32-unknown-unknown
          override: true

      - name: Install wasm-opt
-        uses: ./.github/actions/install-wasm-opt
-        with:
-          version: '114'
+        run: cargo install --version 0.112.0 wasm-opt

      - name: Build release contracts
        run: make contracts
@@ -9,7 +9,7 @@ on:

 jobs:
  build:
-    runs-on: custom-linux
+    runs-on: custom-runner-linux
    steps:
      - uses: actions/checkout@v3
      - name: Install rsync
@@ -26,22 +26,17 @@ jobs:
        uses: actions-rs/cargo@v1
        with:
          command: build
-          args: --workspace --release
+          args: --workspace --release --all
      - name: Install mdbook
-        run: (test -x $HOME/.cargo/bin/mdbook || cargo install --vers "^0.4.35" mdbook)
+        run: (test -x $HOME/.cargo/bin/mdbook || cargo install --vers "^0.4.33" mdbook)
      - name: Install mdbook plugins
        run: |
          cargo install --vers "=0.2.2" mdbook-variables && cargo install \
-            --vers "^1.8.0" mdbook-admonish --force && cargo install --vers \
+            --vers "^1.8.0" mdbook-admonish && cargo install --vers \
            "^0.1.2" mdbook-last-changed && cargo install --vers "^0.1.2" mdbook-theme \
-            && cargo install --vers "^0.7.7" mdbook-linkcheck \
-            # && cd documentation \
-            # && mdbook-admonish install dev-portal \
-            # && mdbook-admonish install docs \
-            # && mdbook-admonish install operators
-
+            && cargo install --vers "^0.7.7" mdbook-linkcheck
      - name: Build all projects in documentation/ & move to ~/dist/docs/
-        run: cd documentation && ./build_all_to_dist.sh 
+        run: cd documentation && ./build_all_to_dist.sh
        continue-on-error: false
      - name: Deploy branch to CI www
        continue-on-error: true
@@ -1,6 +1,15 @@
 name: ci-lint-typescript

 on:
+  push:
+    paths:
+      - "ts-packages/**"
+      - "sdk/typescript/**"
+      - "nym-connect/desktop/src/**"
+      - "nym-connect/desktop/package.json"
+      - "nym-wallet/src/**"
+      - "nym-wallet/package.json"
+      - "explorer/**"
  pull_request:
    paths:
      - "ts-packages/**"
@@ -13,7 +22,7 @@ on:

 jobs:
  build:
-    runs-on: ubuntu-20.04-16-core
+    runs-on: custom-runner-linux
    steps:
      - uses: actions/checkout@v2
      - uses: rlespinasse/github-slug-action@v3.x
@@ -28,15 +37,9 @@ jobs:
        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 wasm-opt
-        uses: ./.github/actions/install-wasm-opt
-        with:
-          version: '116'
-
      - name: Set up Go
        uses: actions/setup-go@v4
        with:
@@ -46,7 +49,7 @@ jobs:
        run: yarn

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

      - name: Lint
        run: yarn lint
@@ -1,6 +1,16 @@
 name: ci-nym-connect-desktop-rust

 on:
+  push:
+    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/**"
  pull_request:
    paths:
      - "nym-connect/desktop/src-tauri/**"
@@ -17,6 +27,8 @@ jobs:
    runs-on: [self-hosted, custom-linux]
    env:
      CARGO_TERM_COLOR: always
+    # env:
+    #   RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache
    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
@@ -33,12 +45,6 @@ jobs:
          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:
@@ -51,6 +57,12 @@ jobs:
          command: test
          args: --manifest-path nym-connect/desktop/Cargo.toml --workspace

+      - name: Check formatting
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --manifest-path nym-connect/desktop/Cargo.toml --all -- --check
+
      - uses: actions-rs/clippy-check@v1
        name: Clippy checks
        continue-on-error: true
@@ -1,7 +1,7 @@
 name: ci-nym-connect-desktop

 on:
-  pull_request:
+  push:
    paths:
      - 'nym-connect/desktop/**'

@@ -11,7 +11,7 @@ defaults:

 jobs:
  build:
-    runs-on: custom-linux
+    runs-on: custom-runner-linux
    steps:
    - uses: actions/checkout@v2
    - name: Install rsync
@@ -12,7 +12,7 @@ defaults:

 jobs:
  build:
-    runs-on: custom-linux
+    runs-on: custom-runner-linux
    steps:
    - uses: actions/checkout@v2
    - name: Install rsync
@@ -1,40 +0,0 @@
-name: ci-nym-vpn-ui-js
-
-on:
-  workflow_dispatch:
-  pull_request:
-    paths:
-      - 'nym-vpn/ui/src/**'
-      - 'nym-vpn/ui/package.json'
-      - 'nym-vpn/ui/index.html'
-
-jobs:
-  check:
-    runs-on: custom-linux
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Install Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-      - name: Install Yarn
-        run: npm install -g yarn
-      - name: Install dependencies
-        working-directory: nym-vpn/ui
-        run: yarn
-      - name: Type-check
-        working-directory: nym-vpn/ui
-        run: yarn typecheck
-      - name: Check lint
-        working-directory: nym-vpn/ui
-        run: yarn lint
-      - name: Check formatting
-        working-directory: nym-vpn/ui
-        run: yarn fmt:check
-#      - name: Run tests
-#        working-directory: nym-vpn/ui
-#        run: yarn test
-      - name: Check build
-        working-directory: nym-vpn/ui
-        run: yarn build
@@ -1,63 +0,0 @@
-name: ci-nym-vpn-ui-rust
-
-on:
-  workflow_dispatch:
-  pull_request:
-    paths:
-      - 'nym-vpn/ui/src-tauri/**'
-
-jobs:
-  build:
-    runs-on: custom-linux
-    env:
-      CARGO_TERM_COLOR: always
-      CARGOTOML_PATH: ./nym-vpn/ui/src-tauri/Cargo.toml
-    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: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-          components: rustfmt, clippy
-
-      - name: Prepare build
-        run: mkdir nym-vpn/ui/dist
-
-      - name: Build
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --manifest-path ${{ env.CARGOTOML_PATH }} --features custom-protocol
-
-#      - name: Run all tests
-#        uses: actions-rs/cargo@v1
-#        with:
-#          command: test
-#          args: --manifest-path ${{ env.CARGOTOML_PATH }}
-
-      - name: Check formatting
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --manifest-path ${{ env.CARGOTOML_PATH }} --all -- --check
-
-      - name: Annotate with clippy checks
-        uses: actions-rs/clippy-check@v1
-        continue-on-error: true
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --manifest-path ${{ env.CARGOTOML_PATH }} --all-features
-
-      - name: Clippy
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --manifest-path ${{ env.CARGOTOML_PATH }} --all-features --all-targets -- -D warnings
@@ -19,6 +19,8 @@ jobs:
    runs-on: [ self-hosted, custom-linux ]
    env:
      CARGO_TERM_COLOR: always
+    # env:
+    #   RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache
    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
@@ -1,44 +1,35 @@
-name: ci-nym-wallet-storybook
+name: Nym Wallet Storybook

 on:
-  pull_request:
+  push:
    paths:
      - 'nym-wallet/**'

 jobs:
  build:
-    runs-on: custom-linux
+    runs-on: custom-runner-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: Setup 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
-
+      run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh      
    - name: Build dependencies
      run: yarn && yarn build
-
    - name: Build storybook
      run: yarn storybook:build
      working-directory: ./nym-wallet
-
    - name: Deploy branch to CI www (storybook)
      continue-on-error: true
      uses: easingthemes/ssh-deploy@main
@@ -50,11 +41,9 @@ jobs:
        REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
        TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/wallet-${{ 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-wallet
@@ -1,6 +1,10 @@
 name: ci-sdk-docs-typescript

 on:
+  push:
+    paths:
+      - "sdk/typescript/**"
+      - "wasm/**"
  pull_request:
    paths:
      - "sdk/typescript/**"
@@ -8,7 +12,7 @@ on:

 jobs:
  build:
-    runs-on: custom-linux
+    runs-on: custom-runner-linux
    steps:
      - uses: actions/checkout@v2
      - name: Install rsync
@@ -30,14 +34,6 @@ jobs:
        with:
          go-version: '1.20'

-      - name: Install wasm-pack
-        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-
-      - name: Install wasm-opt
-        uses: ./.github/actions/install-wasm-opt
-        with:
-          version: '116'
-
      - name: Build branch WASM packages
        run: make sdk-wasm-build

@@ -9,7 +9,7 @@ on:

 jobs:
  wasm:
-    runs-on: [custom-linux]
+    runs-on: [custom-runner-linux]
    env:
      CARGO_TERM_COLOR: always
    steps:
@@ -18,7 +18,7 @@ jobs:
      - uses: actions/setup-node@v3
        with:
          node-version: 18
-
+          
      - uses: actions-rs/toolchain@v1
        with:
          profile: minimal
@@ -32,13 +32,12 @@ jobs:
        with:
          go-version: '1.20'

+
      - name: Install wasm-pack
        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh

      - name: Install wasm-opt
-        uses: ./.github/actions/install-wasm-opt
-        with:
-          version: '116'
+        run: cargo install wasm-opt

      - name: Install wasm-bindgen-cli
        run: cargo install wasm-bindgen-cli
@@ -1,43 +0,0 @@
-# Simple workflow for deploying static content to GitHub Pages
-name: Deploy static content to Pages
-
-on:
-  # Runs on pushes targeting the default branch
-  push:
-    branches: ["feature/ppa-repo"]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
-# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
-concurrency:
-  group: "pages"
-  cancel-in-progress: false
-
-jobs:
-  # Single deploy job since we're just deploying
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setup Pages
-        uses: actions/configure-pages@v3
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v2
-        with:
-          # Upload entire repository
-          path: './ppa'
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v2
@@ -1,4 +1,4 @@
-name: greetings
+name: Greetings

 on: [pull_request_target, issues]

@@ -4,25 +4,25 @@ on:
  workflow_dispatch:
  schedule:
    - cron: '14 1 * * *'
-
 jobs:
  build:
    strategy:
      fail-fast: false
      matrix:
        rust: [stable, beta]
-        os: [ubuntu-20.04, windows-latest, macos-latest]
+        os: [custom-linux, windows10, custom-runner-mac-m1]
    runs-on: ${{ matrix.os }}
    env:
      CARGO_TERM_COLOR: always
    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 build-essential curl wget libssl-dev libudev-dev squashfs-tools protobuf-compiler
-        if: matrix.os == 'ubuntu-20.04'
+        continue-on-error: true
+        if: matrix.os == 'custom-linux'
+
+      - name: Check out repository code
+        uses: actions/checkout@v3

      - name: Install Rust toolchain
        uses: actions-rs/toolchain@v1
@@ -32,12 +32,6 @@ jobs:
          override: true
          components: rustfmt, clippy

-      - name: Install Protoc
-        uses: arduino/setup-protoc@v2
-        if: matrix.os == 'macos-latest' || matrix.os == 'windows-latest'
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
      - name: Check formatting
        uses: actions-rs/cargo@v1
        with:
@@ -48,27 +42,13 @@ jobs:
        uses: actions-rs/cargo@v1
        with:
          command: build
-          args: --release --workspace
+          args: --workspace

      - name: Build examples
        uses: actions-rs/cargo@v1
        with:
          command: build
-          args: --release --workspace --examples
-
-      # To avoid running out of disk space, skip generating debug symbols
-      - name: Set debug to false (unix)
-        if: matrix.os == 'ubuntu-20.04' || matrix.os == 'macos-latest'
-        run: |
-          sed -i.bak 's/\[profile.dev\]/\[profile.dev\]\ndebug = false/' Cargo.toml
-          git diff
-
-      - name: Set debug to false (win)
-        if: matrix.os == 'windows-latest'
-        shell: pwsh
-        run: |
-          (Get-Content Cargo.toml) -replace '\[profile.dev\]', "`$&`ndebug = false" | Set-Content Cargo.toml
-          git diff
+          args: --workspace --examples

      - name: Run unit tests
        uses: actions-rs/cargo@v1
@@ -82,11 +62,6 @@ jobs:
          command: test
          args: --workspace -- --ignored

-      - name: Clean
-        uses: actions-rs/cargo@v1
-        with:
-          command: clean
-
      - name: Clippy
        uses: actions-rs/cargo@v1
        with:
@@ -95,7 +70,7 @@ jobs:

  notification:
    needs: build
-    runs-on: custom-linux
+    runs-on: custom-runner-linux
    steps:
      - name: Collect jobs status
        uses: technote-space/workflow-conclusion-action@v2
@@ -1,92 +0,0 @@
-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
@@ -5,24 +5,27 @@ on:
  schedule:
    - cron: '14 1 * * *'

+defaults:
+  run:
+    working-directory: nym-wallet
+
 jobs:
  build:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-20.04, macos-latest, windows-latest]
+        os: [custom-ubuntu-20.04, macos-latest, windows10]
    runs-on: ${{ matrix.os }}
    env:
      CARGO_TERM_COLOR: always
-      MANIFEST_PATH: --manifest-path nym-wallet/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'
+        run: sudo apt-get update && sudo apt-get install -y libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools protobuf-compiler
+        if: matrix.os == 'custom-linux'

      - name: Install rust toolchain
        uses: actions-rs/toolchain@v1
@@ -36,29 +39,36 @@ jobs:
        uses: actions-rs/cargo@v1
        with:
          command: fmt
-          args: ${{ env.MANIFEST_PATH }} --all -- --check
+          args: --all -- --check

      - name: Build
        uses: actions-rs/cargo@v1
        with:
          command: build
-          args: ${{ env.MANIFEST_PATH }} --release --workspace
+          args: --workspace

      - name: Unit tests
        uses: actions-rs/cargo@v1
        with:
          command: test
-          args: ${{ env.MANIFEST_PATH }} --workspace
+          args: --workspace
+
+      - name: Annotate with clippy warnings
+        uses: actions-rs/clippy-check@v1
+        continue-on-error: true
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --workspace

      - name: Clippy
        uses: actions-rs/cargo@v1
        with:
          command: clippy
-          args: ${{ env.MANIFEST_PATH }} --workspace --all-targets -- -D warnings
+          args: --workspace --all-targets -- -D warnings

  notification:
    needs: build
-    runs-on: custom-linux
+    runs-on: custom-runner-linux
    steps:
      - name: Collect jobs status
        uses: technote-space/workflow-conclusion-action@v2
@@ -1,4 +1,4 @@
-name: nightly-security-audit
+name: Daily security audit

 on:
  schedule:
@@ -26,7 +26,7 @@ jobs:
          path: .github/workflows/support-files/notifications/deny.message
  notification:
    needs: cargo-deny
-    runs-on: custom-linux
+    runs-on: custom-runner-linux
    steps:
      - name: Check out repository code
        uses: actions/checkout@v2
@@ -14,7 +14,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        platform: [macos-12-large]
+        platform: [macos-latest]
    runs-on: ${{ matrix.platform }}

    outputs:
@@ -14,13 +14,13 @@ jobs:
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
-          toolchain: stable
+          toolchain: 1.69.0
          target: wasm32-unknown-unknown
          override: true
          components: rustfmt, clippy

      - name: Install wasm-opt
-        run: cargo install --version 0.114.0 wasm-opt
+        run: cargo install --version 0.112.0 wasm-opt

      - name: Build release contracts
        run: make contracts
@@ -14,7 +14,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        platform: [macos-12-large]
+        platform: [macos-latest]
    runs-on: ${{ matrix.platform }}

    outputs:
@@ -39,7 +39,6 @@ jobs:
        env:
          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
        run: |
          # create variables
@@ -74,7 +73,6 @@ jobs:
          ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
          APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_IDENTITY_ID }}
          APPLE_ID: ${{ secrets.APPLE_ID }}
          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
@@ -1,4 +1,4 @@
-name: publish-nyms5-android-apk
+name: Nyms5 Android
 # unsigned APKs only, supported archs:
 # - arm64-v8a (arm64)
 # - x86_64
@@ -94,7 +94,7 @@ jobs:
  gh-release:
    name: Publish APK (GH release)
    needs: build
-    runs-on: custom-linux
+    runs-on: custom-runner-linux
    steps:
      - name: Checkout
        uses: actions/checkout@v3
@@ -4,7 +4,7 @@ on:

 jobs:
  publish:
-    runs-on: ubuntu-20.04-16-core
+    runs-on: [custom-ubuntu-20.04]
    steps:
      - uses: actions/checkout@v2

@@ -12,7 +12,7 @@ jobs:
        uses: actions/setup-node@v3
        with:
          node-version: 18
-          registry-url: "https://registry.npmjs.org"
+          registry-url: 'https://registry.npmjs.org'

      - name: Setup yarn
        run: npm install -g yarn
@@ -25,19 +25,6 @@ jobs:
      - name: Install wasm-pack
        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh

-      - name: Install wasm-opt
-        run: cargo install wasm-opt
-
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: "1.20"
-
-      - name: Install TinyGo
-        uses: acifani/setup-tinygo@v1
-        with:
-          tinygo-version: "0.27.0"
-
      - name: Install dependencies
        run: yarn

@@ -1,4 +1,4 @@
-name: ci-nym-api-tests
+name: CI for Nym API Tests

 on:
  workflow_dispatch:
@@ -16,10 +16,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
-
+      
      - name: Install npm
        run: npm install
-
+        
      - name: Node v18
        uses: actions/setup-node@v3
        with:
@@ -45,6 +45,4 @@ envs/qwerty.env
 cpu-cycles/libcpucycles/build
 foxyfox.env

-.next
-ppa-private-key.b64
-ppa-private-key.asc
+.next
@@ -3,50 +3,9 @@
 Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

 ## [Unreleased]
-
-## [2023.nyxd-upgrade] (2023-11-22)
-
- Chore/nyxd 043 upgrade ([#3968])
-
-[#3968]: https://github.com/nymtech/nym/pull/3968
-
-## [2023.4-galaxy] (2023-11-07)
-
- DRY up client cli ([#4077])
- [mixnode] replace rocket with axum ([#4071])
- incorporate the nym node HTTP api into the mixnode ([#4070])
- replaced '--disable-sign-ext' with '--signext-lowering' when running wasm-opt ([#3896])
- Added PPA repo hosting support and nym-mixnode package with tooling for publishing ([#4165])
-
-[#4077]: https://github.com/nymtech/nym/pull/4077
-[#4071]: https://github.com/nymtech/nym/pull/4071
-[#4070]: https://github.com/nymtech/nym/issues/4070
-[#3896]: https://github.com/nymtech/nym/pull/3896
-[#4165]: https://github.com/nymtech/nym/pull/4165
-
-## [2023.3-kinder] (2023-10-31)
-
- suppress error output ([#4056])
- Update frontend type for current vesting period ([#4042])
- re-exported additional types for tx queries ([#4036])
- fixed fmt::Display impl for GatewayNetworkRequesterDetails ([#4033])
- Add exit node policy from TorNull and Tor Exit Node Policy ([#4024])
- basic self-described api for gateways to dynamically announce its details + nym-api aggregation ([#4017])
- use saturating sub in case outfox is not enabled ([#3986])
- Fix sorting for mixnodes and gateways ([#3985])
- Gateway client registry and api routes ([#3955])
- Feature/configurable socks5 bind address ([#3992])
-
-[#4056]: https://github.com/nymtech/nym/pull/4056
-[#4042]: https://github.com/nymtech/nym/pull/4042
-[#4036]: https://github.com/nymtech/nym/pull/4036
-[#4033]: https://github.com/nymtech/nym/pull/4033
-[#4024]: https://github.com/nymtech/nym/issues/4024
-[#4017]: https://github.com/nymtech/nym/issues/4017
-[#3986]: https://github.com/nymtech/nym/pull/3986
-[#3985]: https://github.com/nymtech/nym/pull/3985
-[#3955]: https://github.com/nymtech/nym/pull/3955
-[#3992]: https://github.com/nymtech/nym/pull/3992
+- add client registry to Gateway ([#3955])
+- add HTTP API to Gateway ([#3955])
+- add `/client/<pub-key>`, `clients` and `register` routes to the gateway ([#3955])

 ## [2023.1-milka] (2023-09-24)

@@ -46,10 +46,8 @@ members = [
    "common/crypto",
    "common/dkg",
    "common/execute",
-    "common/exit-policy",
-    "common/http-api-client",
+    "common/http-requests",
    "common/inclusion-probability",
-    "common/ip-packet-requests",
    "common/ledger",
    "common/mixnode-common",
    "common/network-defaults",
@@ -75,13 +73,11 @@ members = [
    "common/store-cipher",
    "common/task",
    "common/topology",
-    "common/tun",
    "common/types",
    "common/wasm/client-core",
    "common/wasm/storage",
    "common/wasm/utils",
    "common/wireguard",
-    "common/wireguard-types",
    "explorer-api",
    "explorer-api/explorer-api-requests",
    "explorer-api/explorer-client",
@@ -92,14 +88,11 @@ members = [
    "sdk/lib/socks5-listener",
    "sdk/rust/nym-sdk",
    "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",
-    "nym-node",
-    "nym-node/nym-node-requests",
    "nym-outfox",
    "tools/internal/ssl-inject",
    "tools/internal/sdk-version-bump",
@@ -107,7 +100,7 @@ members = [
    "tools/nym-nr-query",
    "tools/ts-rs-cli",
    "wasm/client",
-#    "wasm/full-nym-wasm",
+    "wasm/full-nym-wasm",
    "wasm/mix-fetch",
    "wasm/node-tester",
 ]
@@ -123,7 +116,7 @@ default-members = [
    "explorer-api",
 ]

-exclude = ["explorer", "contracts", "nym-wallet", "nym-connect/mobile/src-tauri", "nym-connect/desktop", "nym-vpn/ui/src-tauri", "cpu-cycles"]
+exclude = ["explorer", "contracts", "nym-wallet", "nym-connect/mobile/src-tauri", "nym-connect/desktop", "cpu-cycles"]

 [workspace.package]
 authors = ["Nym Technologies SA"]
@@ -136,41 +129,8 @@ license = "Apache-2.0"
 [workspace.dependencies]
 anyhow = "1.0.71"
 async-trait = "0.1.68"
-axum = "0.6.20"
-base64 = "0.21.4"
 bip39 = { version = "2.0.0", features = ["zeroize"] }
-boringtun = { git = "https://github.com/cloudflare/boringtun", rev = "e1d6360d6ab4529fc942a078e4c54df107abe2ba" }
-clap = "4.4.7"
 cfg-if = "1.0.0"
-dashmap = "5.5.3"
-dotenvy = "0.15.6"
-futures = "0.3.28"
-generic-array = "0.14.7"
-getrandom = "0.2.10"
-hyper = "0.14.27"
-k256 = "0.13"
-lazy_static = "1.4.0"
-log = "0.4"
-once_cell = "1.7.2"
-parking_lot = "0.12.1"
-rand = "0.8.5"
-reqwest = "0.11.22"
-schemars = "0.8.1"
-serde = "1.0.152"
-serde_json = "1.0.91"
-tap = "1.0.1"
-thiserror = "1.0.48"
-tokio = "1.24.1"
-tokio-tungstenite = "0.20.1"
-tracing = "0.1.37"
-tungstenite = { version = "0.20.1", default-features = false }
-ts-rs = "7.0.0"
-utoipa = "3.5.0"
-utoipa-swagger-ui = "3.1.5"
-url = "2.4"
-zeroize = "1.6.0"
-
-# cosmwasm-related
 cosmwasm-derive = "=1.3.0"
 cosmwasm-schema = "=1.3.0"
 cosmwasm-std = "=1.3.0"
@@ -178,19 +138,37 @@ cosmwasm-std = "=1.3.0"
 # (and ideally we don't want to pull the same dependency twice)
 serde-json-wasm = "=0.5.0"
 cosmwasm-storage = "=1.3.0"
-# same version as used by cosmwasm
+cosmrs = "=0.14.0"
+# same version as used by cosmrs
 cw-utils = "=1.0.1"
 cw-storage-plus = "=1.1.0"
 cw2 = { version = "=1.1.0" }
 cw3 = { version = "=1.1.0" }
 cw4 = { version = "=1.1.0" }
 cw-controllers = { version = "=1.1.0" }
-
-# cosmrs-related
-bip32 = "0.5.1"
-cosmrs = "=0.15.0"
-tendermint-rpc = "0.34" # same version as used by cosmrs
-prost = "0.12"
+dashmap = "5.5.3"
+dotenvy = "0.15.6"
+futures = "0.3.28"
+generic-array = "0.14.7"
+getrandom = "0.2.10"
+k256 = "0.13"
+lazy_static = "1.4.0"
+log = "0.4"
+once_cell = "1.7.2"
+parking_lot = "0.12.1"
+rand = "0.8.5"
+reqwest = "0.11.18"
+serde = "1.0.152"
+serde_json = "1.0.91"
+tap = "1.0.1"
+tendermint-rpc = "0.32" # same version as used by cosmrs
+thiserror = "1.0.38"
+tokio = "1.24.1"
+tokio-tungstenite = "0.20.1"
+tungstenite = { version = "0.20.1", default-features = false }
+ts-rs = "7.0.0"
+url = "2.4"
+zeroize = "1.6.0"

 # wasm-related dependencies
 gloo-utils = "0.1.7"
@@ -93,6 +93,10 @@ $(eval $(call add_cargo_workspace,contracts,contracts,--lib --target wasm32-unkn
 $(eval $(call add_cargo_workspace,wallet,nym-wallet))
 $(eval $(call add_cargo_workspace,connect,nym-connect/desktop))

+# OVERRIDE: wasm-opt fails if the binary has been built with the latest rustc.
+# Pin to the last working version.
+contracts_BUILD_RELEASE_TOOLCHAIN := +1.69.0
+
 # -----------------------------------------------------------------------------
 # SDK
 # -----------------------------------------------------------------------------
@@ -104,7 +108,7 @@ sdk-wasm-build:
 	$(MAKE) -C wasm/client
 	$(MAKE) -C wasm/node-tester
 	$(MAKE) -C wasm/mix-fetch
-	#$(MAKE) -C wasm/full-nym-wasm
+	$(MAKE) -C wasm/full-nym-wasm

 # run this from npm/yarn to ensure tools are in the path, e.g. yarn build:sdk from root of repo
 sdk-typescript-build:
@@ -114,7 +118,7 @@ sdk-typescript-build:
 	yarn --cwd sdk/typescript/codegen/contract-clients build

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

 sdk-wasm-test:
 	#cargo test $(addprefix -p , $(WASM_CRATES)) --target wasm32-unknown-unknown -- -Dwarnings
@@ -140,7 +144,7 @@ contracts: build-release-contracts wasm-opt-contracts

 wasm-opt-contracts:
 	for contract in $(CONTRACTS_WASM); do \
-	  wasm-opt --signext-lowering -Os $(CONTRACTS_OUT_DIR)/$$contract -o $(CONTRACTS_OUT_DIR)/$$contract; \
+	  wasm-opt --disable-sign-ext -Os $(CONTRACTS_OUT_DIR)/$$contract -o $(CONTRACTS_OUT_DIR)/$$contract; \
 	done

 # Consider adding 's' to make plural consistent (beware: used in github workflow)
@@ -168,7 +172,3 @@ generate-typescript:
 run-api-tests:
 	cd nym-api/tests/functional_test && yarn test:qa

-# Build debian package, and update PPA
-# Requires base64 encode GPG key to be set up in environment PPA_SIGNING_KEY
-deb:
-	scripts/ppa.sh
@@ -15,6 +15,7 @@ The platform is composed of multiple Rust crates. Top-level executable binary cr
 * 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.

+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg?style=for-the-badge)](https://opensource.org/licenses/Apache-2.0)
 [![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)


@@ -49,10 +50,10 @@ Node, node operator and delegator rewards are determined according to the princi
 |<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=\alpha#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\alpha#gh-dark-mode-only">|Sybil attack resistance parameter - the higher this parameter is set the stronger the reduction in competitiveness gets 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% in.
 |<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.
+|<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 NYMT.

 Node reward for node `i` is determined as:

@@ -82,11 +83,4 @@ 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
-
-Again, for accurate information, please check individual files.
+This program is available as open source under the terms of the Apache 2.0 license. However, some elements are being licensed under CC0-1.0 and MIT. For accurate information, please check individual files.
@@ -1,90 +1,10 @@
 Critical bug or security issue 💥

-If you're here because you're trying to figure out how to notify us of a security issue, send us a PGP encrypted email to:
+If you're here because you're trying to figure out how to notify us of a security issue, go to Discord, and alert the core engineers:

-```
-security@nymte.ch
-```
-
-Encrypted with our public key which is available below in plain text and also on keyservers:
-
-```
-pub   rsa4096 2023-10-30 [SC] [expire : 2026-10-29]
-      24B2592E801A5AAA8666C8BA7C3C727F05090550
-uid          [  ultime ] Security Nym Technologies <security@nymte.ch>
-sub   rsa4096 2023-10-30 [E] [expire : 2026-10-29]
-
-```
-
-The fingerprint of the key is on the second line above.
-
-If you need to chat __urgently__ to our team for a __critical__ security issue:
-
-go to Matrix, and alert the core engineers with a private direct message:
-
-    Jedrzej Stuczynski @jstuczyn:nymtech.chat
-    Mark Sinclair @mark:nymtech.chat
-    Raphaël Walther @raphael:nymtech.chat
+    Dave Hrycyszyn futurechimp#5430
+    Jedrzej Stuczynski "Jedrzej | Nym#5666"
+    Fran Arbanas | franarbanas#0995
+    Mark Sinclair | marknym#8088 

 Please avoid opening public issues on GitHub that contain information about a potential security vulnerability as this makes it difficult to reduce the impact and harm of valid security issues.
-
-If you don't know what Matrix is, you can follow this documentation to create an account on this federation of instant messaging servers:
-
-[Matrix for Instant Messaging](https://matrix.org/docs/chat_basics/matrix-for-im/)
-
-
-
-```
-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGU/XpcBEAC+ykz0yxn8FferjEBooptXlOH/v/28aa0Nv8DfImTgj9BNY5cR
-UdLk+Wa3CSXQVE7PIsi0egEjAMfyxPEywbvPlgklW4XAKDVUCf3gxpQNN47VuVgV
-VwrN0VBurhhIKoEw9daO6A0P44+6nmXGIfUulCr4fMxYq82SOooog/j5w0/LfITu
-rQXxVABLkXHGN/NGf4BE52QI/ppeXWoshlNVU1wdZIIYWwte+9ukikWpN+LYfJUR
-ybtyCjQ4Gdf8ap1GmkKHmAru24wbUuFsBWGVgHsXAwYlKxyiNGR9YwgAxmFk6vNf
-1PqKGO3i4erx5X/+mzylzNbFlCqFuksZRyUSDZvQ8fxkm8ra1zWbO38eOTp8Vhgg
-SKfRTzOKeZYURZicJPxmEIfA88U4tx+YWJ54YWT/gERZkjIJL5mzIuY9UulVvKUM
-vMFUIzBMHOPXH16036zGyFMC1esRd2qqil4b9KtLgCOkrD1VgpjcveoA0VyMJCN6
-LmKTrVjwjjDMxby+d49BolRWGnCofXozXwvNQx+CYv8M2WPErTpyYoofYFtpqr7A
-fIufc/e0+um3zoGIbHejrhsbuH9Qf+MKsI+Ng93bdDtjeHz6MEgAlsTm0qeizYpj
-IyKZIObPmfvrAm08hFZ8JnGk+XuooF36XWbJYjCCy0bOyMw1r7ZG99TcSwARAQAB
-tC1TZWN1cml0eSBOeW0gVGVjaG5vbG9naWVzIDxzZWN1cml0eUBueW10ZS5jaD6J
-AlQEEwEKAD4WIQQkslkugBpaqoZmyLp8PHJ/BQkFUAUCZT9elwIbAwUJBaOagAUL
-CQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRB8PHJ/BQkFUL7dD/9zO73uI5VR+SWx
-PFmJW+9QsPiQbVRvGwNZurctmQ2s2Pe0vHRELFeqD5oYvSx2Lequ3Ir+zn/C3kDM
-kNs40obSL6jCBiLPkxEY0JqzPM9jZr7EjvlibWV3f6DxooRIqEyfN57I3OBGlqZE
-0Mx7sQuCcgau8C70DF952QhKUwXC2cmpmDKHVEEoio1xGSD4dQhGapCB32RQGtna
-OGfAO9celNMvSq0Lp+aJxeACmWFY5T4/y79JPcT5vSs/yEIRmaH/fn2piwaFBsIq
-gHJJMxO3740P1hF8j7KWUoUofuFaEALHBpEpjWTOj8ej1wmFlu+5F+jSVoc781Wb
-ZZXu04cOBXnGTogzSxMpBe9TtLb28zd6WzFotC25KTI3pngMzXsQGLJLOwvoZKiS
-LFjPRjg1rwobmB3Q3J2W5GYSveia0CDsZGP+g87GVVf/oD2Djpa68xyVYwIYeA6T
-3DNdS77qHiRuGiS4kWXyVjDqOICboR4uCvt09zlkBuLDdTWqWYARUvZjtjs4w/Ol
-rdrBI3A88ti8fRldYaNpu17ME1ilpN44yKoJtqiWc3Tisk8eYLfx6c7FQF3PrRva
-mr7FZvhFsYML5CeNFHTEzN6Y3jjKN/60DvCfodWnWFK47Txkl8UAXGY2W9B0fWqQ
-wUVr8uLuMyyMiKbeoufi7rGOj6AMErkCDQRlP16XARAA8FGmD5J3tM1BOM1niJxZ
-JTdCauzEtxEoBL0RuqGBkR8U29sRM6DwuzjU7PwscFnBaGyU+eU73GwGkH3ozFfF
-tllYhQrhP/kkN+0rEO5Xi+nR+4JCFRqrf3nJXAAPfiksURMp8er1dUOY2/e1ZSoL
-tS+nzUivV8CfE+pgj/5YtGwPC+KYHLATkKkMELCrbW4UO06VWOqQsvr6kivXuJQQ
-LdEAMpBlADmXFG45DmPKQzsBWUgvTwyGy3LX0nys8cgpex9BH8hhr01QmGyP469s
-N3cNrtFuu8U6RAsiCD/8mlBuD3EQEU5SF0lc7kCICAZk+wElmXnimEi0TOYsbz6k
-90lteicX70rA9GNeyI76H+VSOYvWpkRwaJAgUdzrAM1o9SHASq+cZ6nD85OZioQk
-DWM6+Q+sf2oen0qJnnGmUr93kJIC0PIdgrXRrtiNfeRa1Z/H0LmREyyEMoFiVivn
-z1vVk85Oq6Sf3ltUwvmDzuuJOtsp2Qp6+x6Snn/yKauI4uf4Cf/wKUch4r6Bwgg5
-Dw49ky7lwlnALio4GIVoGLpLef93wWoDmp4Klyh3ZPf2nB0U91u3bHRUo7m+D7QJ
-98cyKtqLLzjg7szGf60pIWNWRsadYQT3bSncynqknAjOV3BCvx6/ivsnpj//QjYR
-HtviUAcQ1DBB6UC6q23FIs0AEQEAAYkCPAQYAQoAJhYhBCSyWS6AGlqqhmbIunw8
-cn8FCQVQBQJlP16XAhsMBQkFo5qAAAoJEHw8cn8FCQVQzukP/iLxjOxT+UpPR//c
-prDVSLkP4pF5bmw36U07jvqpS+/KTXsxiiQleffRabOpNLcd+K1ueavyt9nnIwHH
-tHS9kM9A7DBw3LnpEbXki46QDCCI6niGijlLOEeAWqnocwMNTT05wVVgCtO3DQP2
-MoSCcqHpXDChvOyr5d5xjYLVJhlctIMSomcVzGryjknPu0Yj/TkC/4c+m86ZWQUD
-HqMHQIuiEenvb62/F4c5OJIRZPEn70wdddkgJuJU3eHdHrnuhCkjCC93GQGbGj03
-Zqos6699y6hmPeD3U5IUv8ujwZYVCCuDm8gJfrp3R6WLfeZeK9WmTVBpCzsDg3fV
-hSwmOk6pp8DAq1/Dev3yRkFggCEyGK6c9b+a0CRBncl8e5Q0QQIzNiS/uExQP3h+
-ELJs3P0MLP+6FWhNUry09n3lnWkr1hY+v1M0GAxbfdv/tsCN1Pq/VQEz+CTqXqya
-ftWldOHWw6Hh+gtwxcHjG4MBOrO5oICQ3lh2hGwQ58cDgZYSK/OGgJ9BggFl1CcM
-0uGC0/TRCI1zt/4y+7efSZQMZkHo7VC/3MFbp2hcNejpW+BxVuwKTunFvWK3TLhq
-sSlQ5yyhqchooepsFHq9bosKFjLJC01uprBv1rinoNduOy43FbyS7JPRRspANN0R
-iC2pMbWdE0ZTQaFq6tPIg058pjqi
-=nqgX
-----END PGP PUBLIC KEY BLOCK-----
-```
@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.31"
+version = "1.1.30"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"
@@ -20,7 +20,7 @@ futures = { workspace = true } # bunch of futures stuff, however, now that I thi
 # and the single instance of abortable we have should really be refactored anyway
 url = { workspace = true }

-clap = { workspace = true, features = ["cargo", "derive"] }
+clap = { version = "4.0", features = ["cargo", "derive"] }
 dirs = "4.0"
 lazy_static = "1.4.0"
 log = { workspace = true } # self explanatory
@@ -36,7 +36,7 @@ tokio-tungstenite = { workspace = true }
 ## internal
 nym-bandwidth-controller = { path = "../../common/bandwidth-controller" }
 nym-bin-common = { path = "../../common/bin-common", features = ["output_format"] }
-nym-client-core = { path = "../../common/client-core", features = ["fs-surb-storage", "cli"] }
+nym-client-core = { path = "../../common/client-core", features = ["fs-surb-storage"] }
 nym-coconut-interface = { path = "../../common/coconut-interface" }
 nym-config = { path = "../../common/config" }
 nym-credential-storage = { path = "../../common/credential-storage" }
@@ -4,8 +4,6 @@
 use crate::client::config::persistence::ClientPaths;
 use crate::client::config::template::CONFIG_TEMPLATE;
 use nym_bin_common::logging::LoggingSettings;
-use nym_client_core::cli_helpers::client_init::ClientConfig;
-use nym_client_core::config::disk_persistence::CommonClientPaths;
 use nym_config::defaults::DEFAULT_WEBSOCKET_LISTENING_PORT;
 use nym_config::{
    must_get_home, read_config_from_toml_file, save_formatted_config_to_file, NymConfigTemplate,
@@ -74,24 +72,6 @@ impl NymConfigTemplate for Config {
    }
 }

-impl ClientConfig for Config {
-    fn common_paths(&self) -> &CommonClientPaths {
-        &self.storage_paths.common_paths
-    }
-
-    fn core_config(&self) -> &BaseClientConfig {
-        &self.base
-    }
-
-    fn default_store_location(&self) -> PathBuf {
-        self.default_location()
-    }
-
-    fn save_to<P: AsRef<Path>>(&self, path: P) -> io::Result<()> {
-        save_formatted_config_to_file(self, path)
-    }
-}
-
 impl Config {
    pub fn new<S: AsRef<str>>(id: S) -> Self {
        Config {
@@ -11,7 +11,6 @@ use crate::{
 use nym_bin_common::logging::LoggingSettings;
 use nym_client_core::config::disk_persistence::old_v1_1_20_2::CommonClientPathsV1_1_20_2;
 use nym_client_core::config::old_config_v1_1_20_2::ConfigV1_1_20_2 as BaseConfigV1_1_20_2;
-use nym_client_core::config::old_config_v1_1_30::ConfigV1_1_30 as BaseConfigV1_1_30;
 use nym_client_core::config::GatewayEndpointConfig;
 use nym_config::read_config_from_toml_file;
 use nym_network_defaults::DEFAULT_WEBSOCKET_LISTENING_PORT;
@@ -52,7 +51,7 @@ impl ConfigV1_1_20_2 {
    pub fn upgrade(self) -> Result<(Config, GatewayEndpointConfig), ClientError> {
        let gateway_details = self.base.client.gateway_endpoint.clone().into();
        let config = Config {
-            base: BaseConfigV1_1_30::from(self.base).into(),
+            base: self.base.into(),
            socket: self.socket.into(),
            storage_paths: ClientPaths {
                common_paths: self.storage_paths.common_paths.upgrade_default()?,
@@ -12,49 +12,55 @@ use crate::{
 };
 use clap::Args;
 use nym_bin_common::output_format::OutputFormat;
-use nym_client_core::cli_helpers::client_init::{
-    initialise_client, CommonClientInitArgs, InitResultsWithConfig, InitialisableClient,
-};
+use nym_client_core::client::base_client::storage::gateway_details::OnDiskGatewayDetails;
+use nym_client_core::client::key_manager::persistence::OnDiskKeys;
+use nym_client_core::config::GatewayEndpointConfig;
+use nym_client_core::error::ClientCoreError;
+use nym_client_core::init::helpers::current_gateways;
+use nym_client_core::init::types::{GatewayDetails, GatewaySelectionSpecification, GatewaySetup};
+use nym_crypto::asymmetric::identity;
+use nym_sphinx::addressing::clients::Recipient;
+use nym_topology::NymTopology;
 use serde::Serialize;
 use std::fmt::Display;
-use std::fs;
 use std::net::IpAddr;
 use std::path::PathBuf;
-
-struct NativeClientInit;
-
-impl InitialisableClient for NativeClientInit {
-    const NAME: &'static str = "native";
-    type Error = ClientError;
-    type InitArgs = Init;
-    type Config = Config;
-
-    fn try_upgrade_outdated_config(id: &str) -> Result<(), Self::Error> {
-        try_upgrade_config(id)
-    }
-
-    fn initialise_storage_paths(id: &str) -> Result<(), Self::Error> {
-        fs::create_dir_all(default_data_directory(id))?;
-        fs::create_dir_all(default_config_directory(id))?;
-        Ok(())
-    }
-
-    fn default_config_path(id: &str) -> PathBuf {
-        default_config_filepath(id)
-    }
-
-    fn construct_config(init_args: &Self::InitArgs) -> Self::Config {
-        override_config(
-            Config::new(&init_args.common_args.id),
-            OverrideConfig::from(init_args.clone()),
-        )
-    }
-}
+use std::{fs, io};
+use tap::TapFallible;

 #[derive(Args, Clone)]
 pub(crate) struct Init {
-    #[command(flatten)]
-    common_args: CommonClientInitArgs,
+    /// Id of the nym-mixnet-client we want to create config for.
+    #[clap(long)]
+    id: String,
+
+    /// Id of the gateway we are going to connect to.
+    #[clap(long)]
+    gateway: Option<identity::PublicKey>,
+
+    /// Specifies whether the new gateway should be determined based by latency as opposed to being chosen
+    /// uniformly.
+    #[clap(long, conflicts_with = "gateway")]
+    latency_based_selection: bool,
+
+    /// Force register gateway. WARNING: this will overwrite any existing keys for the given id,
+    /// potentially causing loss of access.
+    #[clap(long)]
+    force_register_gateway: bool,
+
+    /// Comma separated list of rest endpoints of the nyxd validators
+    #[clap(long, alias = "nyxd_validators", value_delimiter = ',', hide = true)]
+    nyxd_urls: Option<Vec<url::Url>>,
+
+    /// Comma separated list of rest endpoints of the API validators
+    #[clap(
+        long,
+        alias = "api_validators",
+        value_delimiter = ',',
+        group = "network"
+    )]
+    // the alias here is included for backwards compatibility (1.1.4 and before)
+    nym_apis: Option<Vec<url::Url>>,

    /// Whether to not start the websocket
    #[clap(long)]
@@ -68,28 +74,40 @@ pub(crate) struct Init {
    #[clap(long)]
    host: Option<IpAddr>,

+    /// Path to .json file containing custom network specification.
+    #[clap(long, group = "network", hide = true)]
+    custom_mixnet: Option<PathBuf>,
+
+    /// Mostly debug-related option to increase default traffic rate so that you would not need to
+    /// modify config post init
+    #[clap(long, hide = true)]
+    fastmode: bool,
+
+    /// Disable loop cover traffic and the Poisson rate limiter (for debugging only)
+    #[clap(long, hide = true)]
+    no_cover: bool,
+
+    /// Set this client to work in a enabled credentials mode that would attempt to use gateway
+    /// with bandwidth credential requirement.
+    #[clap(long, hide = true)]
+    enabled_credentials_mode: Option<bool>,
+
    #[clap(short, long, default_value_t = OutputFormat::default())]
    output: OutputFormat,
 }

-impl AsRef<CommonClientInitArgs> for Init {
-    fn as_ref(&self) -> &CommonClientInitArgs {
-        &self.common_args
-    }
-}
-
 impl From<Init> for OverrideConfig {
    fn from(init_config: Init) -> Self {
        OverrideConfig {
-            nym_apis: init_config.common_args.nym_apis,
+            nym_apis: init_config.nym_apis,
            disable_socket: init_config.disable_socket,
            port: init_config.port,
            host: init_config.host,
-            fastmode: init_config.common_args.fastmode,
-            no_cover: init_config.common_args.no_cover,
+            fastmode: init_config.fastmode,
+            no_cover: init_config.no_cover,

-            nyxd_urls: init_config.common_args.nyxd_urls,
-            enabled_credentials_mode: init_config.common_args.enabled_credentials_mode,
+            nyxd_urls: init_config.nyxd_urls,
+            enabled_credentials_mode: init_config.enabled_credentials_mode,
        }
    }
 }
@@ -103,11 +121,15 @@ pub struct InitResults {
 }

 impl InitResults {
-    fn new(res: InitResultsWithConfig<Config>) -> Self {
+    fn new(config: &Config, address: &Recipient, gateway: &GatewayEndpointConfig) -> Self {
        Self {
-            client_address: res.init_results.address.to_string(),
-            client_core: res.init_results,
-            client_listening_port: res.config.socket.listening_port,
+            client_core: nym_client_core::init::types::InitResults::new(
+                &config.base,
+                address,
+                gateway,
+            ),
+            client_listening_port: config.socket.listening_port,
+            client_address: address.to_string(),
        }
    }
 }
@@ -120,14 +142,97 @@ impl Display for InitResults {
    }
 }

+fn init_paths(id: &str) -> io::Result<()> {
+    fs::create_dir_all(default_data_directory(id))?;
+    fs::create_dir_all(default_config_directory(id))
+}
+
 pub(crate) async fn execute(args: Init) -> Result<(), ClientError> {
    eprintln!("Initialising client...");

-    let output = args.output;
-    let res = initialise_client::<NativeClientInit>(args).await?;
+    let id = &args.id;

-    let init_results = InitResults::new(res);
-    println!("{}", output.format(&init_results));
+    let already_init = if default_config_filepath(id).exists() {
+        // in case we're using old config, try to upgrade it
+        // (if we're using the current version, it's a no-op)
+        try_upgrade_config(id)?;
+        eprintln!("Client \"{id}\" was already initialised before");
+        true
+    } else {
+        init_paths(id)?;
+        false
+    };
+
+    // Usually you only register with the gateway on the first init, however you can force
+    // re-registering if wanted.
+    let user_wants_force_register = args.force_register_gateway;
+    if user_wants_force_register {
+        eprintln!("Instructed to force registering gateway. This will overwrite keys!");
+    }
+
+    // If the client was already initialized, don't generate new keys and don't re-register with
+    // the gateway (because this would create a new shared key).
+    // Unless the user really wants to.
+    let register_gateway = !already_init || user_wants_force_register;
+
+    // Attempt to use a user-provided gateway, if possible
+    let user_chosen_gateway_id = args.gateway;
+    let selection_spec = GatewaySelectionSpecification::new(
+        user_chosen_gateway_id.map(|id| id.to_base58_string()),
+        Some(args.latency_based_selection),
+        false,
+    );
+
+    // Load and potentially override config
+    let config = override_config(Config::new(id), OverrideConfig::from(args.clone()));
+
+    // Setup gateway by either registering a new one, or creating a new config from the selected
+    // one but with keys kept, or reusing the gateway configuration.
+    let key_store = OnDiskKeys::new(config.storage_paths.common_paths.keys.clone());
+    let details_store =
+        OnDiskGatewayDetails::new(&config.storage_paths.common_paths.gateway_details);
+
+    let available_gateways = if let Some(hardcoded_topology) = args
+        .custom_mixnet
+        .map(NymTopology::new_from_file)
+        .transpose()?
+    {
+        // hardcoded_topology
+        hardcoded_topology.get_gateways()
+    } else {
+        let mut rng = rand::thread_rng();
+        current_gateways(&mut rng, &config.base.client.nym_api_urls).await?
+    };
+
+    let gateway_setup = GatewaySetup::New {
+        specification: selection_spec,
+        available_gateways,
+        overwrite_data: register_gateway,
+    };
+
+    let init_details =
+        nym_client_core::init::setup_gateway(gateway_setup, &key_store, &details_store)
+            .await
+            .tap_err(|err| eprintln!("Failed to setup gateway\nError: {err}"))?;
+
+    let config_save_location = config.default_location();
+    config.save_to_default_location().tap_err(|_| {
+        log::error!("Failed to save the config file");
+    })?;
+    eprintln!(
+        "Saved configuration file to {}",
+        config_save_location.display()
+    );
+
+    let address = init_details.client_address()?;
+
+    eprintln!("Client configuration completed.\n");
+
+    let GatewayDetails::Configured(gateway_details) = init_details.gateway_details else {
+        return Err(ClientCoreError::UnexpectedPersistedCustomGatewayDetails)?;
+    };
+    let init_results = InitResults::new(&config, &address, &gateway_details);
+    println!("{}", args.output.format(&init_results));

    Ok(())
 }
@@ -10,14 +10,35 @@ use crate::{
 use clap::Args;
 use log::*;
 use nym_bin_common::version_checker::is_minor_version_compatible;
-use nym_client_core::cli_helpers::client_run::CommonClientRunArgs;
+use nym_crypto::asymmetric::identity;
 use std::error::Error;
 use std::net::IpAddr;
+use std::path::PathBuf;

 #[derive(Args, Clone)]
 pub(crate) struct Run {
-    #[command(flatten)]
-    common_args: CommonClientRunArgs,
+    /// Id of the nym-mixnet-client we want to run.
+    #[clap(long)]
+    id: String,
+
+    /// Comma separated list of rest endpoints of the nyxd validators
+    #[clap(long, alias = "nyxd_validators", value_delimiter = ',', hide = true)]
+    nyxd_urls: Option<Vec<url::Url>>,
+
+    /// Comma separated list of rest endpoints of the API validators
+    #[clap(
+        long,
+        alias = "api_validators",
+        value_delimiter = ',',
+        group = "network"
+    )]
+    // the alias here is included for backwards compatibility (1.1.4 and before)
+    nym_apis: Option<Vec<url::Url>>,
+
+    /// Id of the gateway we want to connect to. If overridden, it is user's responsibility to
+    /// ensure prior registration happened
+    #[clap(long)]
+    gateway: Option<identity::PublicKey>,

    /// Whether to not start the websocket
    #[clap(long)]
@@ -30,19 +51,37 @@ pub(crate) struct Run {
    /// Ip for the socket (if applicable) to listen for requests.
    #[clap(long)]
    host: Option<IpAddr>,
+
+    /// Path to .json file containing custom network specification.
+    #[clap(long, group = "network", hide = true)]
+    custom_mixnet: Option<PathBuf>,
+
+    /// Mostly debug-related option to increase default traffic rate so that you would not need to
+    /// modify config post init
+    #[clap(long, hide = true)]
+    fastmode: bool,
+
+    /// Disable loop cover traffic and the Poisson rate limiter (for debugging only)
+    #[clap(long, hide = true)]
+    no_cover: bool,
+
+    /// Set this client to work in a enabled credentials mode that would attempt to use gateway
+    /// with bandwidth credential requirement.
+    #[clap(long, hide = true)]
+    enabled_credentials_mode: Option<bool>,
 }

 impl From<Run> for OverrideConfig {
    fn from(run_config: Run) -> Self {
        OverrideConfig {
-            nym_apis: run_config.common_args.nym_apis,
+            nym_apis: run_config.nym_apis,
            disable_socket: run_config.disable_socket,
            port: run_config.port,
            host: run_config.host,
-            fastmode: run_config.common_args.fastmode,
-            no_cover: run_config.common_args.no_cover,
-            nyxd_urls: run_config.common_args.nyxd_urls,
-            enabled_credentials_mode: run_config.common_args.enabled_credentials_mode,
+            fastmode: run_config.fastmode,
+            no_cover: run_config.no_cover,
+            nyxd_urls: run_config.nyxd_urls,
+            enabled_credentials_mode: run_config.enabled_credentials_mode,
        }
    }
 }
@@ -67,9 +106,9 @@ fn version_check(cfg: &Config) -> bool {
 }

 pub(crate) async fn execute(args: Run) -> Result<(), Box<dyn Error + Send + Sync>> {
-    eprintln!("Starting client {}...", args.common_args.id);
+    eprintln!("Starting client {}...", args.id);

-    let mut config = try_load_current_config(&args.common_args.id)?;
+    let mut config = try_load_current_config(&args.id)?;
    config = override_config(config, OverrideConfig::from(args.clone()));

    if !version_check(&config) {
@@ -77,7 +116,7 @@ pub(crate) async fn execute(args: Run) -> Result<(), Box<dyn Error + Send + Sync
        return Err(Box::new(ClientError::FailedLocalVersionCheck));
    }

-    SocketClient::new(config, args.common_args.custom_mixnet)
+    SocketClient::new(config, args.custom_mixnet)
        .run_socket_forever()
        .await
 }
@@ -22,10 +22,5 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
    }
    setup_logging();

-    if let Err(err) = commands::execute(args).await {
-        log::error!("{err}");
-        println!("An error occurred: {err}");
-        std::process::exit(1);
-    }
-    Ok(())
+    commands::execute(args).await
 }
@@ -1,13 +1,13 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.31"
+version = "1.1.30"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
 edition = "2021"
 rust-version = "1.56"

 [dependencies]
-clap = { workspace = true, features = ["cargo", "derive"] }
+clap = { version = "4.0", features = ["cargo", "derive"] }
 lazy_static = "1.4.0"
 log = { workspace = true }
 pretty_env_logger = "0.4"
@@ -21,7 +21,7 @@ url = { workspace = true }

 # internal
 nym-bin-common = { path = "../../common/bin-common", features = ["output_format"] }
-nym-client-core = { path = "../../common/client-core", features = ["fs-surb-storage", "cli"] }
+nym-client-core = { path = "../../common/client-core", features = ["fs-surb-storage"] }
 nym-coconut-interface = { path = "../../common/coconut-interface" }
 nym-config = { path = "../../common/config" }
 nym-credentials = { path = "../../common/credentials" }
@@ -11,50 +11,26 @@ use crate::{
 };
 use clap::Args;
 use nym_bin_common::output_format::OutputFormat;
-use nym_client_core::cli_helpers::client_init::{
-    initialise_client, CommonClientInitArgs, InitResultsWithConfig, InitialisableClient,
-};
+use nym_client_core::client::base_client::storage::gateway_details::OnDiskGatewayDetails;
+use nym_client_core::client::key_manager::persistence::OnDiskKeys;
+use nym_client_core::config::GatewayEndpointConfig;
+use nym_client_core::error::ClientCoreError;
+use nym_client_core::init::helpers::current_gateways;
+use nym_client_core::init::types::{GatewayDetails, GatewaySelectionSpecification, GatewaySetup};
+use nym_crypto::asymmetric::identity;
 use nym_sphinx::addressing::clients::Recipient;
+use nym_topology::NymTopology;
 use serde::Serialize;
 use std::fmt::Display;
-use std::fs;
-use std::net::{IpAddr, SocketAddr};
 use std::path::PathBuf;
-
-struct Socks5ClientInit;
-
-impl InitialisableClient for Socks5ClientInit {
-    const NAME: &'static str = "socks5";
-    type Error = Socks5ClientError;
-    type InitArgs = Init;
-    type Config = Config;
-
-    fn try_upgrade_outdated_config(id: &str) -> Result<(), Self::Error> {
-        try_upgrade_config(id)
-    }
-
-    fn initialise_storage_paths(id: &str) -> Result<(), Self::Error> {
-        fs::create_dir_all(default_data_directory(id))?;
-        fs::create_dir_all(default_config_directory(id))?;
-        Ok(())
-    }
-
-    fn default_config_path(id: &str) -> PathBuf {
-        default_config_filepath(id)
-    }
-
-    fn construct_config(init_args: &Self::InitArgs) -> Self::Config {
-        override_config(
-            Config::new(&init_args.common_args.id, &init_args.provider.to_string()),
-            OverrideConfig::from(init_args.clone()),
-        )
-    }
-}
+use std::{fs, io};
+use tap::TapFallible;

 #[derive(Args, Clone)]
 pub(crate) struct Init {
-    #[command(flatten)]
-    common_args: CommonClientInitArgs,
+    /// Id of the nym-mixnet-client we want to create config for.
+    #[clap(long)]
+    id: String,

    /// Address of the socks5 provider to send messages to.
    #[clap(long)]
@@ -69,37 +45,72 @@ pub(crate) struct Init {
    #[clap(long, alias = "use_anonymous_sender_tag")]
    use_reply_surbs: Option<bool>,

+    /// Id of the gateway we are going to connect to.
+    #[clap(long)]
+    gateway: Option<identity::PublicKey>,
+
+    /// Specifies whether the new gateway should be determined based by latency as opposed to being chosen
+    /// uniformly.
+    #[clap(long, conflicts_with = "gateway")]
+    latency_based_selection: bool,
+
+    /// Force register gateway. WARNING: this will overwrite any existing keys for the given id,
+    /// potentially causing loss of access.
+    #[clap(long)]
+    force_register_gateway: bool,
+
+    /// Comma separated list of rest endpoints of the nyxd validators
+    #[clap(long, alias = "nyxd_validators", value_delimiter = ',', hide = true)]
+    nyxd_urls: Option<Vec<url::Url>>,
+
+    /// Comma separated list of rest endpoints of the API validators
+    #[clap(
+        long,
+        alias = "api_validators",
+        value_delimiter = ',',
+        group = "network"
+    )]
+    // the alias here is included for backwards compatibility (1.1.4 and before)
+    nym_apis: Option<Vec<url::Url>>,
+
    /// Port for the socket to listen on in all subsequent runs
    #[clap(short, long)]
    port: Option<u16>,

-    /// The custom host on which the socks5 client will be listening for requests
-    #[clap(long)]
-    host: Option<IpAddr>,
+    /// Path to .json file containing custom network specification.
+    #[clap(long, group = "network", hide = true)]
+    custom_mixnet: Option<PathBuf>,
+
+    /// Mostly debug-related option to increase default traffic rate so that you would not need to
+    /// modify config post init
+    #[clap(long, hide = true)]
+    fastmode: bool,
+
+    /// Disable loop cover traffic and the Poisson rate limiter (for debugging only)
+    #[clap(long, hide = true)]
+    no_cover: bool,
+
+    /// Set this client to work in a enabled credentials mode that would attempt to use gateway
+    /// with bandwidth credential requirement.
+    #[clap(long, hide = true)]
+    enabled_credentials_mode: Option<bool>,

    #[clap(short, long, default_value_t = OutputFormat::default())]
    output: OutputFormat,
 }

-impl AsRef<CommonClientInitArgs> for Init {
-    fn as_ref(&self) -> &CommonClientInitArgs {
-        &self.common_args
-    }
-}
-
 impl From<Init> for OverrideConfig {
    fn from(init_config: Init) -> Self {
        OverrideConfig {
-            nym_apis: init_config.common_args.nym_apis,
-            ip: init_config.host,
+            nym_apis: init_config.nym_apis,
            port: init_config.port,
            use_anonymous_replies: init_config.use_reply_surbs,
-            fastmode: init_config.common_args.fastmode,
-            no_cover: init_config.common_args.no_cover,
+            fastmode: init_config.fastmode,
+            no_cover: init_config.no_cover,
            geo_routing: None,
            medium_toggle: false,
-            nyxd_urls: init_config.common_args.nyxd_urls,
-            enabled_credentials_mode: init_config.common_args.enabled_credentials_mode,
+            nyxd_urls: init_config.nyxd_urls,
+            enabled_credentials_mode: init_config.enabled_credentials_mode,
            outfox: false,
        }
    }
@@ -109,16 +120,20 @@ impl From<Init> for OverrideConfig {
 pub struct InitResults {
    #[serde(flatten)]
    client_core: nym_client_core::init::types::InitResults,
-    socks5_listening_address: SocketAddr,
+    socks5_listening_port: u16,
    client_address: String,
 }

 impl InitResults {
-    fn new(res: InitResultsWithConfig<Config>) -> Self {
+    fn new(config: &Config, address: &Recipient, gateway: &GatewayEndpointConfig) -> Self {
        Self {
-            client_address: res.init_results.address.to_string(),
-            client_core: res.init_results,
-            socks5_listening_address: res.config.core.socks5.bind_adddress,
+            client_core: nym_client_core::init::types::InitResults::new(
+                &config.core.base,
+                address,
+                gateway,
+            ),
+            socks5_listening_port: config.core.socks5.listening_port,
+            client_address: address.to_string(),
        }
    }
 }
@@ -126,23 +141,106 @@ impl InitResults {
 impl Display for InitResults {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        writeln!(f, "{}", self.client_core)?;
-        writeln!(
-            f,
-            "SOCKS5 listening address: {}",
-            self.socks5_listening_address
-        )?;
+        writeln!(f, "SOCKS5 listening port: {}", self.socks5_listening_port)?;
        write!(f, "Address of this client: {}", self.client_address)
    }
 }

+fn init_paths(id: &str) -> io::Result<()> {
+    fs::create_dir_all(default_data_directory(id))?;
+    fs::create_dir_all(default_config_directory(id))
+}
+
 pub(crate) async fn execute(args: Init) -> Result<(), Socks5ClientError> {
    eprintln!("Initialising client...");

-    let output = args.output;
-    let res = initialise_client::<Socks5ClientInit>(args).await?;
+    let id = &args.id;
+    let provider_address = &args.provider;

-    let init_results = InitResults::new(res);
-    println!("{}", output.format(&init_results));
+    let already_init = if default_config_filepath(id).exists() {
+        // in case we're using old config, try to upgrade it
+        // (if we're using the current version, it's a no-op)
+        try_upgrade_config(id)?;
+        eprintln!("SOCKS5 client \"{id}\" was already initialised before");
+        true
+    } else {
+        init_paths(id)?;
+        false
+    };
+
+    // Usually you only register with the gateway on the first init, however you can force
+    // re-registering if wanted.
+    let user_wants_force_register = args.force_register_gateway;
+    if user_wants_force_register {
+        eprintln!("Instructed to force registering gateway. This might overwrite keys!");
+    }
+
+    // If the client was already initialized, don't generate new keys and don't re-register with
+    // the gateway (because this would create a new shared key).
+    // Unless the user really wants to.
+    let register_gateway = !already_init || user_wants_force_register;
+
+    // Attempt to use a user-provided gateway, if possible
+    let user_chosen_gateway_id = args.gateway;
+    let selection_spec = GatewaySelectionSpecification::new(
+        user_chosen_gateway_id.map(|id| id.to_base58_string()),
+        Some(args.latency_based_selection),
+        false,
+    );
+
+    // Load and potentially override config
+    let config = override_config(
+        Config::new(id, &provider_address.to_string()),
+        OverrideConfig::from(args.clone()),
+    );
+
+    // Setup gateway by either registering a new one, or creating a new config from the selected
+    // one but with keys kept, or reusing the gateway configuration.
+    let key_store = OnDiskKeys::new(config.storage_paths.common_paths.keys.clone());
+    let details_store =
+        OnDiskGatewayDetails::new(&config.storage_paths.common_paths.gateway_details);
+
+    let available_gateways = if let Some(hardcoded_topology) = args
+        .custom_mixnet
+        .map(NymTopology::new_from_file)
+        .transpose()?
+    {
+        // hardcoded_topology
+        hardcoded_topology.get_gateways()
+    } else {
+        let mut rng = rand::thread_rng();
+        current_gateways(&mut rng, &config.core.base.client.nym_api_urls).await?
+    };
+
+    let gateway_setup = GatewaySetup::New {
+        specification: selection_spec,
+        available_gateways,
+        overwrite_data: register_gateway,
+    };
+
+    let init_details =
+        nym_client_core::init::setup_gateway(gateway_setup, &key_store, &details_store)
+            .await
+            .tap_err(|err| eprintln!("Failed to setup gateway\nError: {err}"))?;
+
+    // TODO: ask the service provider we specified for its interface version and set it in the config
+
+    let config_save_location = config.default_location();
+    config.save_to_default_location().tap_err(|_| {
+        log::error!("Failed to save the config file");
+    })?;
+    eprintln!(
+        "Saved configuration file to {}",
+        config_save_location.display()
+    );
+
+    let address = init_details.client_address()?;
+
+    let GatewayDetails::Configured(gateway_details) = init_details.gateway_details else {
+        return Err(ClientCoreError::UnexpectedPersistedCustomGatewayDetails)?;
+    };
+    let init_results = InitResults::new(&config, &address, &gateway_details);
+    println!("{}", args.output.format(&init_results));

    Ok(())
 }
@@ -4,8 +4,7 @@
 use crate::config::old_config_v1_1_13::OldConfigV1_1_13;
 use crate::config::old_config_v1_1_20::ConfigV1_1_20;
 use crate::config::old_config_v1_1_20_2::ConfigV1_1_20_2;
-use crate::config::old_config_v1_1_30::ConfigV1_1_30;
-use crate::config::{BaseClientConfig, Config, SocksClientPaths};
+use crate::config::{BaseClientConfig, Config};
 use crate::error::Socks5ClientError;
 use clap::CommandFactory;
 use clap::{Parser, Subcommand};
@@ -23,7 +22,6 @@ use nym_client_core::error::ClientCoreError;
 use nym_config::OptionalSet;
 use nym_sphinx::params::{PacketSize, PacketType};
 use std::error::Error;
-use std::net::IpAddr;

 pub(crate) mod build_info;
 pub mod init;
@@ -74,7 +72,6 @@ pub(crate) enum Commands {
 // Configuration that can be overridden.
 pub(crate) struct OverrideConfig {
    nym_apis: Option<Vec<url::Url>>,
-    ip: Option<IpAddr>,
    port: Option<u16>,
    use_anonymous_replies: Option<bool>,
    fastmode: bool,
@@ -148,7 +145,6 @@ pub(crate) fn override_config(config: Config, args: OverrideConfig) -> Config {
        )
        .with_optional(Config::with_anonymous_replies, args.use_anonymous_replies)
        .with_optional(Config::with_port, args.port)
-        .with_optional(Config::with_ip, args.ip)
        .with_optional_base_custom_env(
            BaseClientConfig::with_custom_nym_apis,
            args.nym_apis,
@@ -168,11 +164,12 @@ pub(crate) fn override_config(config: Config, args: OverrideConfig) -> Config {
 }

 fn persist_gateway_details(
-    storage_paths: &SocksClientPaths,
+    config: &Config,
    details: GatewayEndpointConfig,
 ) -> Result<(), Socks5ClientError> {
-    let details_store = OnDiskGatewayDetails::new(&storage_paths.common_paths.gateway_details);
-    let keys_store = OnDiskKeys::new(storage_paths.common_paths.keys.clone());
+    let details_store =
+        OnDiskGatewayDetails::new(&config.storage_paths.common_paths.gateway_details);
+    let keys_store = OnDiskKeys::new(config.storage_paths.common_paths.keys.clone());
    let shared_keys = keys_store.ephemeral_load_gateway_keys().map_err(|source| {
        Socks5ClientError::ClientCoreError(ClientCoreError::KeyStoreError {
            source: Box::new(source),
@@ -202,10 +199,9 @@ fn try_upgrade_v1_1_13_config(id: &str) -> Result<bool, Socks5ClientError> {

    let updated_step1: ConfigV1_1_20 = old_config.into();
    let updated_step2: ConfigV1_1_20_2 = updated_step1.into();
-    let (updated_step3, gateway_config) = updated_step2.upgrade()?;
-    persist_gateway_details(&updated_step3.storage_paths, gateway_config)?;
+    let (updated, gateway_config) = updated_step2.upgrade()?;
+    persist_gateway_details(&updated, gateway_config)?;

-    let updated: Config = updated_step3.into();
    updated.save_to_default_location()?;
    Ok(true)
 }
@@ -223,10 +219,9 @@ fn try_upgrade_v1_1_20_config(id: &str) -> Result<bool, Socks5ClientError> {
    info!("It is going to get updated to the current specification.");

    let updated_step1: ConfigV1_1_20_2 = old_config.into();
-    let (updated_step2, gateway_config) = updated_step1.upgrade()?;
-    persist_gateway_details(&updated_step2.storage_paths, gateway_config)?;
+    let (updated, gateway_config) = updated_step1.upgrade()?;
+    persist_gateway_details(&updated, gateway_config)?;

-    let updated: Config = updated_step2.into();
    updated.save_to_default_location()?;
    Ok(true)
 }
@@ -241,25 +236,9 @@ fn try_upgrade_v1_1_20_2_config(id: &str) -> Result<bool, Socks5ClientError> {
    info!("It seems the client is using <= v1.1.20_2 config template.");
    info!("It is going to get updated to the current specification.");

-    let (updated_step1, gateway_config) = old_config.upgrade()?;
-    persist_gateway_details(&updated_step1.storage_paths, gateway_config)?;
+    let (updated, gateway_config) = old_config.upgrade()?;
+    persist_gateway_details(&updated, gateway_config)?;

-    let updated: Config = updated_step1.into();
-    updated.save_to_default_location()?;
-    Ok(true)
-}
-
-fn try_upgrade_v1_1_30_config(id: &str) -> Result<bool, Socks5ClientError> {
-    // explicitly load it as v1.1.30 (which is incompatible with the current one, i.e. +1.1.31)
-    let Ok(old_config) = ConfigV1_1_30::read_from_default_path(id) else {
-        // if we failed to load it, there might have been nothing to upgrade
-        // or maybe it was an even older file. in either way. just ignore it and carry on with our day
-        return Ok(false);
-    };
-    info!("It seems the client is using <= v1.1.30 config template.");
-    info!("It is going to get updated to the current specification.");
-
-    let updated: Config = old_config.into();
    updated.save_to_default_location()?;
    Ok(true)
 }
@@ -274,9 +253,6 @@ fn try_upgrade_config(id: &str) -> Result<(), Socks5ClientError> {
    if try_upgrade_v1_1_20_2_config(id)? {
        return Ok(());
    }
-    if try_upgrade_v1_1_30_config(id)? {
-        return Ok(());
-    }

    Ok(())
 }
@@ -10,17 +10,18 @@ use crate::{
 use clap::Args;
 use log::*;
 use nym_bin_common::version_checker::is_minor_version_compatible;
-use nym_client_core::cli_helpers::client_run::CommonClientRunArgs;
 use nym_client_core::client::base_client::storage::OnDiskPersistent;
 use nym_client_core::client::topology_control::geo_aware_provider::CountryGroup;
+use nym_crypto::asymmetric::identity;
 use nym_socks5_client_core::NymClient;
 use nym_sphinx::addressing::clients::Recipient;
-use std::net::IpAddr;
+use std::path::PathBuf;

 #[derive(Args, Clone)]
 pub(crate) struct Run {
-    #[command(flatten)]
-    common_args: CommonClientRunArgs,
+    /// Id of the nym-mixnet-client we want to run.
+    #[clap(long)]
+    id: String,

    /// Specifies whether this client is going to use an anonymous sender tag for communication with the service provider.
    /// While this is going to hide its actual address information, it will make the actual communication
@@ -35,13 +36,35 @@ pub(crate) struct Run {
    #[clap(long)]
    provider: Option<Recipient>,

+    /// Id of the gateway we want to connect to. If overridden, it is user's responsibility to
+    /// ensure prior registration happened
+    #[clap(long)]
+    gateway: Option<identity::PublicKey>,
+
+    /// Comma separated list of rest endpoints of the nyxd validators
+    #[clap(long, alias = "nyxd_validators", value_delimiter = ',', hide = true)]
+    nyxd_urls: Option<Vec<url::Url>>,
+
+    /// Comma separated list of rest endpoints of the Nym APIs
+    #[clap(long, value_delimiter = ',', group = "network")]
+    nym_apis: Option<Vec<url::Url>>,
+
    /// Port for the socket to listen on
    #[clap(short, long)]
    port: Option<u16>,

-    /// The custom host on which the socks5 client will be listening for requests
-    #[clap(long)]
-    host: Option<IpAddr>,
+    /// Path to .json file containing custom network specification.
+    #[clap(long, group = "network", group = "routing", hide = true)]
+    custom_mixnet: Option<PathBuf>,
+
+    /// Mostly debug-related option to increase default traffic rate so that you would not need to
+    /// modify config post init
+    #[clap(long, hide = true)]
+    fastmode: bool,
+
+    /// Disable loop cover traffic and the Poisson rate limiter (for debugging only)
+    #[clap(long, hide = true)]
+    no_cover: bool,

    /// Set geo-aware mixnode selection when sending mixnet traffic, for experiments only.
    #[clap(long, hide = true, value_parser = validate_country_group, group="routing")]
@@ -52,6 +75,11 @@ pub(crate) struct Run {
    #[clap(long, hide = true)]
    medium_toggle: bool,

+    /// Set this client to work in a enabled credentials mode that would attempt to use gateway
+    /// with bandwidth credential requirement.
+    #[clap(long, hide = true)]
+    enabled_credentials_mode: Option<bool>,
+
    #[clap(long, hide = true, action)]
    outfox: bool,
 }
@@ -59,16 +87,15 @@ pub(crate) struct Run {
 impl From<Run> for OverrideConfig {
    fn from(run_config: Run) -> Self {
        OverrideConfig {
-            nym_apis: run_config.common_args.nym_apis,
-            ip: run_config.host,
+            nym_apis: run_config.nym_apis,
            port: run_config.port,
            use_anonymous_replies: run_config.use_anonymous_replies,
-            fastmode: run_config.common_args.fastmode,
-            no_cover: run_config.common_args.no_cover,
+            fastmode: run_config.fastmode,
+            no_cover: run_config.no_cover,
            geo_routing: run_config.geo_routing,
            medium_toggle: run_config.medium_toggle,
-            nyxd_urls: run_config.common_args.nyxd_urls,
-            enabled_credentials_mode: run_config.common_args.enabled_credentials_mode,
+            nyxd_urls: run_config.nyxd_urls,
+            enabled_credentials_mode: run_config.enabled_credentials_mode,
            outfox: run_config.outfox,
        }
    }
@@ -103,9 +130,9 @@ fn version_check(cfg: &Config) -> bool {
 }

 pub(crate) async fn execute(args: Run) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-    eprintln!("Starting client {}...", args.common_args.id);
+    eprintln!("Starting client {}...", args.id);

-    let mut config = try_load_current_config(&args.common_args.id)?;
+    let mut config = try_load_current_config(&args.id)?;
    config = override_config(config, OverrideConfig::from(args.clone()));

    if !version_check(&config) {
@@ -116,7 +143,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?;
-    NymClient::new(config.core, storage, args.common_args.custom_mixnet)
+    NymClient::new(config.core, storage, args.custom_mixnet)
        .run_forever()
        .await
 }
@@ -1,10 +1,9 @@
 // Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

+use crate::config::persistence::SocksClientPaths;
 use crate::config::template::CONFIG_TEMPLATE;
 use nym_bin_common::logging::LoggingSettings;
-use nym_client_core::cli_helpers::client_init::ClientConfig;
-use nym_client_core::config::disk_persistence::CommonClientPaths;
 use nym_config::{
    must_get_home, read_config_from_toml_file, save_formatted_config_to_file, NymConfigTemplate,
    DEFAULT_CONFIG_DIR, DEFAULT_CONFIG_FILENAME, DEFAULT_DATA_DIR, NYM_DIR,
@@ -12,18 +11,15 @@ use nym_config::{
 use serde::{Deserialize, Serialize};
 use std::fmt::Debug;
 use std::io;
-use std::net::IpAddr;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;

-pub use crate::config::persistence::SocksClientPaths;
 pub use nym_client_core::config::Config as BaseClientConfig;
 pub use nym_socks5_client_core::config::Config as CoreConfig;

 pub mod old_config_v1_1_13;
 pub mod old_config_v1_1_20;
 pub mod old_config_v1_1_20_2;
-pub mod old_config_v1_1_30;
 mod persistence;
 mod template;

@@ -71,24 +67,6 @@ impl NymConfigTemplate for Config {
    }
 }

-impl ClientConfig for Config {
-    fn common_paths(&self) -> &CommonClientPaths {
-        &self.storage_paths.common_paths
-    }
-
-    fn core_config(&self) -> &BaseClientConfig {
-        &self.core.base
-    }
-
-    fn default_store_location(&self) -> PathBuf {
-        self.default_location()
-    }
-
-    fn save_to<P: AsRef<Path>>(&self, path: P) -> io::Result<()> {
-        save_formatted_config_to_file(self, path)
-    }
-}
-
 impl Config {
    pub fn new<S: AsRef<str>>(id: S, provider_mix_address: S) -> Self {
        Config {
@@ -124,15 +102,8 @@ impl Config {
        self.core.validate()
    }

-    #[must_use]
    pub fn with_port(mut self, port: u16) -> Self {
-        self.core = self.core.with_port(port);
-        self
-    }
-
-    #[must_use]
-    pub fn with_ip(mut self, ip: IpAddr) -> Self {
-        self.core = self.core.with_ip(ip);
+        self.core.socks5.listening_port = port;
        self
    }

@@ -1,11 +1,11 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::config::old_config_v1_1_30::ConfigV1_1_30;
 use crate::{
-    config::{default_config_filepath, persistence::SocksClientPaths},
+    config::{default_config_filepath, persistence::SocksClientPaths, Config},
    error::Socks5ClientError,
 };
+
 use nym_bin_common::logging::LoggingSettings;
 use nym_client_core::config::disk_persistence::old_v1_1_20_2::CommonClientPathsV1_1_20_2;
 use nym_client_core::config::GatewayEndpointConfig;
@@ -43,9 +43,9 @@ impl ConfigV1_1_20_2 {

    // in this upgrade, gateway endpoint configuration was moved out of the config file,
    // so its returned to be stored elsewhere.
-    pub fn upgrade(self) -> Result<(ConfigV1_1_30, GatewayEndpointConfig), Socks5ClientError> {
+    pub fn upgrade(self) -> Result<(Config, GatewayEndpointConfig), Socks5ClientError> {
        let gateway_details = self.core.base.client.gateway_endpoint.clone().into();
-        let config = ConfigV1_1_30 {
+        let config = Config {
            core: self.core.into(),
            storage_paths: SocksClientPaths {
                common_paths: self.storage_paths.common_paths.upgrade_default()?,
@@ -1,44 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::config::persistence::SocksClientPaths;
-use crate::config::{default_config_filepath, Config};
-use nym_bin_common::logging::LoggingSettings;
-use nym_config::read_config_from_toml_file;
-use nym_socks5_client_core::config::old_config_v1_1_30::ConfigV1_1_30 as CoreConfigV1_1_30;
-use serde::{Deserialize, Serialize};
-use std::io;
-use std::path::Path;
-
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct ConfigV1_1_30 {
-    pub core: CoreConfigV1_1_30,
-
-    // I'm leaving a landmine here for when the paths actually do change the next time,
-    // but propagating the change right now (in ALL clients) would be such a hassle...,
-    // so sorry for the next person looking at it : )
-    pub storage_paths: SocksClientPaths,
-
-    pub logging: LoggingSettings,
-}
-
-impl From<ConfigV1_1_30> for Config {
-    fn from(value: ConfigV1_1_30) -> Self {
-        Config {
-            core: value.core.into(),
-            storage_paths: value.storage_paths,
-            logging: LoggingSettings::default(),
-        }
-    }
-}
-
-impl ConfigV1_1_30 {
-    pub fn read_from_toml_file<P: AsRef<Path>>(path: P) -> io::Result<Self> {
-        read_config_from_toml_file(path)
-    }
-
-    pub fn read_from_default_path<P: AsRef<Path>>(id: P) -> io::Result<Self> {
-        Self::read_from_toml_file(default_config_filepath(id))
-    }
-}
@@ -75,9 +75,8 @@ gateway_details = '{{ storage_paths.gateway_details }}'
 # The mix address of the provider to which all requests are going to be sent.
 provider_mix_address = '{{ core.socks5.provider_mix_address }}'

-# The address on which the client will be listening for incoming requests
-# (default: 127.0.0.1:1080)
-bind_adddress = '{{ core.socks5.bind_adddress }}'
+# The port on which the client will be listening for incoming requests
+listening_port = {{ core.socks5.listening_port }}

 # Specifies whether this client is going to use an anonymous sender tag for communication with the service provider.
 # While this is going to hide its actual address information, it will make the actual communication
@@ -21,10 +21,5 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
    }
    setup_logging();

-    if let Err(err) = commands::execute(args).await {
-        log::error!("{err}");
-        println!("An error occurred: {err}");
-        std::process::exit(1);
-    }
-    Ok(())
+    commands::execute(args).await
 }
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 bip39 = { workspace = true }
 rand = "0.7.3"
-thiserror = { workspace = true }
+thiserror = "1.0"
 url = { workspace = true }

 nym-coconut-interface = { path = "../coconut-interface" }
@@ -9,13 +9,12 @@ repository = { workspace = true }

 [dependencies]
 atty = "0.2"
-clap = { workspace = true, features = ["derive"] }
+clap = { version = "4.0", features = ["derive"] }
 clap_complete = "4.0"
 clap_complete_fig = "4.0"
 log = { workspace = true }
 pretty_env_logger = "0.4.0"
 semver = "0.11"
-schemars = { workspace = true, features = ["preserve_order"], optional = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, optional = true }

@@ -30,7 +29,6 @@ opentelemetry-jaeger = { version = "0.18.0", optional = true, features = [
    "isahc_collector_client",
 ] }
 tracing-opentelemetry = { version = "0.19.0", optional = true }
-utoipa = { workspace = true, optional = true }
 opentelemetry = { version = "0.19.0", optional = true, features = ["rt-tokio"] }


@@ -44,9 +42,7 @@ vergen = { version = "=7.4.3", default-features = false, features = [

 [features]
 default = []
-openapi = ["utoipa"]
 output_format = ["serde_json"]
-bin_info_schema = ["schemars"]
 tracing = [
    "tracing-subscriber",
    "tracing-tree",
@@ -81,8 +81,6 @@ impl BinaryBuildInformation {
 }

 #[derive(Clone, Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))]
-#[cfg_attr(feature = "bin_info_schema", derive(schemars::JsonSchema))]
 pub struct BinaryBuildInformationOwned {
    /// Provides the name of the binary, i.e. the content of `CARGO_PKG_NAME` environmental variable.
    pub binary_name: String,
@@ -11,7 +11,6 @@ rust-version = "1.66"
 async-trait = { workspace = true }
 base64 = "0.21.2"
 cfg-if = "1.0.0"
-clap = { workspace = true, optional = true }
 dashmap = { workspace = true }
 dirs = "4.0"
 futures = { workspace = true }
@@ -93,7 +92,6 @@ sqlx = { version = "0.6.2", features = ["runtime-tokio-rustls", "sqlite", "macro

 [features]
 default = []
-cli = ["clap"]
 fs-surb-storage = ["sqlx"]
 wasm = ["nym-gateway-client/wasm"]

@@ -1,210 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::config::disk_persistence::CommonClientPaths;
-use crate::error::ClientCoreError;
-use crate::{
-    client::{
-        base_client::storage::gateway_details::OnDiskGatewayDetails,
-        key_manager::persistence::OnDiskKeys,
-    },
-    init::types::{GatewayDetails, GatewaySelectionSpecification, GatewaySetup, InitResults},
-};
-use log::info;
-use nym_crypto::asymmetric::identity;
-use nym_topology::NymTopology;
-use std::path::{Path, PathBuf};
-
-pub trait InitialisableClient {
-    const NAME: &'static str;
-    type Error: From<ClientCoreError>;
-    type InitArgs: AsRef<CommonClientInitArgs>;
-    type Config: ClientConfig;
-
-    fn try_upgrade_outdated_config(id: &str) -> Result<(), Self::Error>;
-
-    fn initialise_storage_paths(id: &str) -> Result<(), Self::Error>;
-
-    fn default_config_path(id: &str) -> PathBuf;
-
-    fn construct_config(init_args: &Self::InitArgs) -> Self::Config;
-}
-
-pub trait ClientConfig {
-    fn common_paths(&self) -> &CommonClientPaths;
-
-    fn core_config(&self) -> &crate::config::Config;
-
-    fn default_store_location(&self) -> PathBuf;
-
-    fn save_to<P: AsRef<Path>>(&self, path: P) -> std::io::Result<()>;
-}
-
-#[cfg_attr(feature = "cli", derive(clap::Args))]
-#[derive(Debug, Clone)]
-pub struct CommonClientInitArgs {
-    /// Id of client we want to create config for.
-    #[cfg_attr(feature = "cli", clap(long))]
-    pub id: String,
-
-    /// Id of the gateway we are going to connect to.
-    #[cfg_attr(feature = "cli", clap(long))]
-    pub gateway: Option<identity::PublicKey>,
-
-    /// Specifies whether the new gateway should be determined based by latency as opposed to being chosen
-    /// uniformly.
-    #[cfg_attr(feature = "cli", clap(long, conflicts_with = "gateway"))]
-    pub latency_based_selection: bool,
-
-    /// Force register gateway. WARNING: this will overwrite any existing keys for the given id,
-    /// potentially causing loss of access.
-    #[cfg_attr(feature = "cli", clap(long))]
-    pub force_register_gateway: bool,
-
-    /// Comma separated list of rest endpoints of the nyxd validators
-    #[cfg_attr(
-        feature = "cli",
-        clap(long, alias = "nyxd_validators", value_delimiter = ',', hide = true)
-    )]
-    pub nyxd_urls: Option<Vec<url::Url>>,
-
-    /// Comma separated list of rest endpoints of the API validators
-    #[cfg_attr(
-        feature = "cli",
-        clap(
-            long,
-            alias = "api_validators",
-            value_delimiter = ',',
-            group = "network"
-        )
-    )]
-    pub nym_apis: Option<Vec<url::Url>>,
-
-    /// Path to .json file containing custom network specification.
-    #[cfg_attr(feature = "cli", clap(long, group = "network", hide = true))]
-    pub custom_mixnet: Option<PathBuf>,
-
-    /// Set this client to work in a enabled credentials mode that would attempt to use gateway
-    /// with bandwidth credential requirement.
-    #[cfg_attr(feature = "cli", clap(long, hide = true))]
-    pub enabled_credentials_mode: Option<bool>,
-
-    /// Mostly debug-related option to increase default traffic rate so that you would not need to
-    /// modify config post init
-    #[cfg_attr(feature = "cli", clap(long, hide = true))]
-    pub fastmode: bool,
-
-    /// Disable loop cover traffic and the Poisson rate limiter (for debugging only)
-    #[cfg_attr(feature = "cli", clap(long, hide = true))]
-    pub no_cover: bool,
-}
-
-pub struct InitResultsWithConfig<T> {
-    pub config: T,
-    pub init_results: InitResults,
-}
-
-pub async fn initialise_client<C>(
-    init_args: C::InitArgs,
-) -> Result<InitResultsWithConfig<C::Config>, C::Error>
-where
-    C: InitialisableClient,
-{
-    info!("initialising {} client", C::NAME);
-
-    let common_args = init_args.as_ref();
-    let id = &common_args.id;
-
-    let already_init = if C::default_config_path(id).exists() {
-        // in case we're using old config, try to upgrade it
-        // (if we're using the current version, it's a no-op)
-        C::try_upgrade_outdated_config(id)?;
-        eprintln!("{} client \"{id}\" was already initialised before", C::NAME);
-        true
-    } else {
-        C::initialise_storage_paths(id)?;
-        false
-    };
-
-    // Usually you only register with the gateway on the first init, however you can force
-    // re-registering if wanted.
-    let user_wants_force_register = common_args.force_register_gateway;
-    if user_wants_force_register {
-        eprintln!("Instructed to force registering gateway. This might overwrite keys!");
-    }
-
-    // If the client was already initialized, don't generate new keys and don't re-register with
-    // the gateway (because this would create a new shared key).
-    // Unless the user really wants to.
-    let register_gateway = !already_init || user_wants_force_register;
-
-    // Attempt to use a user-provided gateway, if possible
-    let user_chosen_gateway_id = common_args.gateway;
-    let selection_spec = GatewaySelectionSpecification::new(
-        user_chosen_gateway_id.map(|id| id.to_base58_string()),
-        Some(common_args.latency_based_selection),
-        false,
-    );
-
-    // Load and potentially override config
-    let config = C::construct_config(&init_args);
-    let paths = config.common_paths();
-    let core = config.core_config();
-
-    // Setup gateway by either registering a new one, or creating a new config from the selected
-    // one but with keys kept, or reusing the gateway configuration.
-    let key_store = OnDiskKeys::new(paths.keys.clone());
-    let details_store = OnDiskGatewayDetails::new(&paths.gateway_details);
-
-    let available_gateways = if let Some(custom_mixnet) = common_args.custom_mixnet.as_ref() {
-        let hardcoded_topology = NymTopology::new_from_file(custom_mixnet).map_err(|source| {
-            ClientCoreError::CustomTopologyLoadFailure {
-                file_path: custom_mixnet.clone(),
-                source,
-            }
-        })?;
-        hardcoded_topology.get_gateways()
-    } else {
-        let mut rng = rand::thread_rng();
-        crate::init::helpers::current_gateways(&mut rng, &core.client.nym_api_urls).await?
-    };
-
-    let gateway_setup = GatewaySetup::New {
-        specification: selection_spec,
-        available_gateways,
-        overwrite_data: register_gateway,
-    };
-
-    let init_details =
-        crate::init::setup_gateway(gateway_setup, &key_store, &details_store).await?;
-
-    // TODO: ask the service provider we specified for its interface version and set it in the config
-
-    let config_save_location = config.default_store_location();
-    if let Err(err) = config.save_to(&config_save_location) {
-        return Err(ClientCoreError::ConfigSaveFailure {
-            typ: C::NAME.to_string(),
-            id: id.to_string(),
-            path: config_save_location,
-            source: err,
-        }
-        .into());
-    }
-
-    eprintln!(
-        "Saved configuration file to {}",
-        config_save_location.display()
-    );
-
-    let address = init_details.client_address()?;
-
-    let GatewayDetails::Configured(gateway_details) = init_details.gateway_details else {
-        return Err(ClientCoreError::UnexpectedPersistedCustomGatewayDetails)?;
-    };
-    let init_results = InitResults::new(config.core_config(), address, &gateway_details);
-
-    Ok(InitResultsWithConfig {
-        config,
-        init_results,
-    })
-}
@@ -1,59 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use nym_crypto::asymmetric::identity;
-use std::path::PathBuf;
-
-#[cfg_attr(feature = "cli", derive(clap::Args))]
-#[derive(Debug, Clone)]
-pub struct CommonClientRunArgs {
-    /// Id of client we want to create config for.
-    #[cfg_attr(feature = "cli", clap(long))]
-    pub id: String,
-
-    /// Id of the gateway we want to connect to. If overridden, it is user's responsibility to
-    /// ensure prior registration happened
-    #[cfg_attr(feature = "cli", clap(long))]
-    pub gateway: Option<identity::PublicKey>,
-
-    /// Comma separated list of rest endpoints of the nyxd validators
-    #[cfg_attr(
-        feature = "cli",
-        clap(long, alias = "nyxd_validators", value_delimiter = ',', hide = true)
-    )]
-    pub nyxd_urls: Option<Vec<url::Url>>,
-
-    /// Comma separated list of rest endpoints of the API validators
-    #[cfg_attr(
-        feature = "cli",
-        clap(
-            long,
-            alias = "api_validators",
-            value_delimiter = ',',
-            group = "network"
-        )
-    )]
-    pub nym_apis: Option<Vec<url::Url>>,
-
-    /// Path to .json file containing custom network specification.
-    #[cfg_attr(feature = "cli", clap(long, group = "network", hide = true))]
-    pub custom_mixnet: Option<PathBuf>,
-
-    /// Set this client to work in a enabled credentials mode that would attempt to use gateway
-    /// with bandwidth credential requirement.
-    #[cfg_attr(feature = "cli", clap(long, hide = true))]
-    pub enabled_credentials_mode: Option<bool>,
-
-    /// Mostly debug-related option to increase default traffic rate so that you would not need to
-    /// modify config post init
-    // note: we removed the 'conflicts_with = medium_toggle', but that's fine since NR
-    // has defined the conflict on that field itself
-    #[cfg_attr(feature = "cli", clap(long, hide = true))]
-    pub fastmode: bool,
-
-    /// Disable loop cover traffic and the Poisson rate limiter (for debugging only)
-    // note: we removed the 'conflicts_with = medium_toggle', but that's fine since NR
-    // has defined the conflict on that field itself
-    #[cfg_attr(feature = "cli", clap(long, hide = true))]
-    pub no_cover: bool,
-}
@@ -1,5 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-pub mod client_init;
-pub mod client_run;
@@ -77,7 +77,7 @@ pub struct PersistedGatewayConfig {
    key_hash: Vec<u8>,

    /// Actual gateway details being persisted.
-    pub details: GatewayEndpointConfig,
+    pub(crate) details: GatewayEndpointConfig,
 }

 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -263,7 +263,7 @@ impl ActionController {
    pub(super) async fn run_with_shutdown(&mut self, mut shutdown: nym_task::TaskClient) {
        debug!("Started ActionController with graceful shutdown support");

-        loop {
+        while !shutdown.is_shutdown() {
            tokio::select! {
                action = self.incoming_actions.next() => match action {
                    Some(action) => self.process_action(action),
@@ -283,7 +283,6 @@ impl ActionController {
                },
                _ = shutdown.recv_with_delay() => {
                    log::trace!("ActionController: Received shutdown");
-                    break;
                }
            }
        }
@@ -40,7 +40,7 @@ impl SentNotificationListener {
    pub(super) async fn run_with_shutdown(&mut self, mut shutdown: nym_task::TaskClient) {
        debug!("Started SentNotificationListener with graceful shutdown support");

-        loop {
+        while !shutdown.is_shutdown() {
            tokio::select! {
                frag_id = self.sent_notifier.next() => match frag_id {
                    Some(frag_id) => {
@@ -53,7 +53,6 @@ impl SentNotificationListener {
                },
                _ = shutdown.recv_with_delay() => {
                    log::trace!("SentNotificationListener: Received shutdown");
-                    break;
                }
            }
        }
@@ -500,12 +500,11 @@ where
        {
            let mut status_timer = tokio::time::interval(Duration::from_secs(5));

-            loop {
+            while !shutdown.is_shutdown() {
                tokio::select! {
                    biased;
                    _ = shutdown.recv_with_delay() => {
                        log::trace!("OutQueueControl: Received shutdown");
-                        break;
                    }
                    _ = status_timer.tick() => {
                        self.log_status(&mut shutdown);
@@ -39,7 +39,7 @@ where
        mem_state: CombinedReplyStorage,
        mut shutdown: nym_task::TaskClient,
    ) {
-        use log::{debug, error, info};
+        use log::{debug, error, info, warn};

        debug!("Started PersistentReplyStorage");
        if let Err(err) = self.backend.start_storage_session().await {
@@ -50,7 +50,7 @@ where
        shutdown.recv().await;

        info!("PersistentReplyStorage is flushing all reply-related data to underlying storage");
-        info!("you MUST NOT forcefully shutdown now or you risk data corruption!");
+        warn!("you MUST NOT forcefully shutdown now or you risk data corruption!");
        if let Err(err) = self.backend.flush_surb_storage(&mem_state).await {
            error!("failed to flush our reply-related data to the persistent storage: {err}")
        } else {
@@ -69,7 +69,7 @@ impl NymApiTopologyProvider {
            Ok(mixes) => mixes,
        };

-        let gateways = match self.validator_client.get_cached_described_gateways().await {
+        let gateways = match self.validator_client.get_cached_gateways().await {
            Err(err) => {
                error!("failed to get network gateways - {err}");
                return None;
@@ -1,7 +1,6 @@
 // Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::{client::topology_control::geo_aware_provider::CountryGroup, error::ClientCoreError};
 use nym_config::defaults::NymNetworkDetails;
 use nym_crypto::asymmetric::identity;
 use nym_gateway_client::client::GatewayConfig;
@@ -13,6 +12,7 @@ use serde::{Deserialize, Serialize};
 use std::time::Duration;
 use url::Url;

+use crate::{client::topology_control::geo_aware_provider::CountryGroup, error::ClientCoreError};
 #[cfg(target_arch = "wasm32")]
 use wasm_bindgen::prelude::*;

@@ -20,7 +20,6 @@ pub mod disk_persistence;
 pub mod old_config_v1_1_13;
 pub mod old_config_v1_1_20;
 pub mod old_config_v1_1_20_2;
-pub mod old_config_v1_1_30;

 // 'DEBUG'
 const DEFAULT_ACK_WAIT_MULTIPLIER: f64 = 1.5;
@@ -281,24 +280,29 @@ impl GatewayEndpointConfig {
            .map_err(ClientCoreError::UnableToCreatePublicKeyFromGatewayId)
    }

-    pub fn from_node(
-        node: nym_topology::gateway::Node,
-        must_use_tls: bool,
-    ) -> Result<Self, ClientCoreError> {
-        let gateway_listener = if must_use_tls {
-            node.clients_address_tls()
-                .ok_or(ClientCoreError::UnsupportedWssProtocol {
-                    gateway: node.identity_key.to_base58_string(),
-                })?
+    pub fn from_node(node: nym_topology::gateway::Node, use_tls: bool) -> Self {
+        // TODO: in the future this shall return a Result and explicit `use_tls` will be removed in favour of the tls info being available on the struct
+        if use_tls {
+            Self::from_topology_node_tls(node)
        } else {
-            node.clients_address()
-        };
+            Self::from_topology_node_no_tls(node)
+        }
+    }

-        Ok(GatewayEndpointConfig {
+    pub fn from_topology_node_no_tls(node: nym_topology::gateway::Node) -> Self {
+        GatewayEndpointConfig {
            gateway_id: node.identity_key.to_base58_string(),
-            gateway_listener,
+            gateway_listener: node.clients_address(),
            gateway_owner: node.owner,
-        })
+        }
+    }
+
+    pub fn from_topology_node_tls(node: nym_topology::gateway::Node) -> Self {
+        GatewayEndpointConfig {
+            gateway_id: node.identity_key.to_base58_string(),
+            gateway_listener: node.clients_address_tls(),
+            gateway_owner: node.owner,
+        }
    }
 }

@@ -1,11 +1,10 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::config::old_config_v1_1_30::{
-    AcknowledgementsV1_1_30, ClientV1_1_30, ConfigV1_1_30, CoverTrafficV1_1_30, DebugConfigV1_1_30,
-    GatewayConnectionV1_1_30, ReplySurbsV1_1_30, TopologyV1_1_30, TrafficV1_1_30,
+use crate::config::{
+    Acknowledgements, Client, Config, CoverTraffic, DebugConfig, GatewayConnection,
+    GatewayEndpointConfig, ReplySurbs, Topology, Traffic,
 };
-use crate::config::GatewayEndpointConfig;
 use nym_sphinx::params::{PacketSize, PacketType};
 use serde::{Deserialize, Serialize};
 use std::time::Duration;
@@ -59,9 +58,9 @@ pub struct ConfigV1_1_20_2 {
    pub debug: DebugConfigV1_1_20_2,
 }

-impl From<ConfigV1_1_20_2> for ConfigV1_1_30 {
+impl From<ConfigV1_1_20_2> for Config {
    fn from(value: ConfigV1_1_20_2) -> Self {
-        ConfigV1_1_30 {
+        Config {
            client: value.client.into(),
            debug: value.debug.into(),
        }
@@ -108,9 +107,9 @@ pub struct ClientV1_1_20_2 {
    pub gateway_endpoint: GatewayEndpointConfigV1_1_20_2,
 }

-impl From<ClientV1_1_20_2> for ClientV1_1_30 {
+impl From<ClientV1_1_20_2> for Client {
    fn from(value: ClientV1_1_20_2) -> Self {
-        ClientV1_1_30 {
+        Client {
            version: value.version,
            id: value.id,
            disabled_credentials_mode: value.disabled_credentials_mode,
@@ -133,9 +132,9 @@ pub struct TrafficV1_1_20_2 {
    pub packet_type: PacketType,
 }

-impl From<TrafficV1_1_20_2> for TrafficV1_1_30 {
+impl From<TrafficV1_1_20_2> for Traffic {
    fn from(value: TrafficV1_1_20_2) -> Self {
-        TrafficV1_1_30 {
+        Traffic {
            average_packet_delay: value.average_packet_delay,
            message_sending_average_delay: value.message_sending_average_delay,
            disable_main_poisson_packet_distribution: value
@@ -169,9 +168,9 @@ pub struct CoverTrafficV1_1_20_2 {
    pub disable_loop_cover_traffic_stream: bool,
 }

-impl From<CoverTrafficV1_1_20_2> for CoverTrafficV1_1_30 {
+impl From<CoverTrafficV1_1_20_2> for CoverTraffic {
    fn from(value: CoverTrafficV1_1_20_2) -> Self {
-        CoverTrafficV1_1_30 {
+        CoverTraffic {
            loop_cover_traffic_average_delay: value.loop_cover_traffic_average_delay,
            cover_traffic_primary_size_ratio: value.cover_traffic_primary_size_ratio,
            disable_loop_cover_traffic_stream: value.disable_loop_cover_traffic_stream,
@@ -196,9 +195,9 @@ pub struct GatewayConnectionV1_1_20_2 {
    pub gateway_response_timeout: Duration,
 }

-impl From<GatewayConnectionV1_1_20_2> for GatewayConnectionV1_1_30 {
+impl From<GatewayConnectionV1_1_20_2> for GatewayConnection {
    fn from(value: GatewayConnectionV1_1_20_2) -> Self {
-        GatewayConnectionV1_1_30 {
+        GatewayConnection {
            gateway_response_timeout: value.gateway_response_timeout,
        }
    }
@@ -222,9 +221,9 @@ pub struct AcknowledgementsV1_1_20_2 {
    pub ack_wait_addition: Duration,
 }

-impl From<AcknowledgementsV1_1_20_2> for AcknowledgementsV1_1_30 {
+impl From<AcknowledgementsV1_1_20_2> for Acknowledgements {
    fn from(value: AcknowledgementsV1_1_20_2) -> Self {
-        AcknowledgementsV1_1_30 {
+        Acknowledgements {
            average_ack_delay: value.average_ack_delay,
            ack_wait_multiplier: value.ack_wait_multiplier,
            ack_wait_addition: value.ack_wait_addition,
@@ -262,9 +261,9 @@ impl Default for TopologyV1_1_20_2 {
    }
 }

-impl From<TopologyV1_1_20_2> for TopologyV1_1_30 {
+impl From<TopologyV1_1_20_2> for Topology {
    fn from(value: TopologyV1_1_20_2) -> Self {
-        TopologyV1_1_30 {
+        Topology {
            topology_refresh_rate: value.topology_refresh_rate,
            topology_resolution_timeout: value.topology_resolution_timeout,
            disable_refreshing: value.disable_refreshing,
@@ -308,9 +307,9 @@ impl Default for ReplySurbsV1_1_20_2 {
    }
 }

-impl From<ReplySurbsV1_1_20_2> for ReplySurbsV1_1_30 {
+impl From<ReplySurbsV1_1_20_2> for ReplySurbs {
    fn from(value: ReplySurbsV1_1_20_2) -> Self {
-        ReplySurbsV1_1_30 {
+        ReplySurbs {
            minimum_reply_surb_storage_threshold: value.minimum_reply_surb_storage_threshold,
            maximum_reply_surb_storage_threshold: value.maximum_reply_surb_storage_threshold,
            minimum_reply_surb_request_size: value.minimum_reply_surb_request_size,
@@ -336,9 +335,9 @@ pub struct DebugConfigV1_1_20_2 {
    pub reply_surbs: ReplySurbsV1_1_20_2,
 }

-impl From<DebugConfigV1_1_20_2> for DebugConfigV1_1_30 {
+impl From<DebugConfigV1_1_20_2> for DebugConfig {
    fn from(value: DebugConfigV1_1_20_2) -> Self {
-        DebugConfigV1_1_30 {
+        DebugConfig {
            traffic: value.traffic.into(),
            cover_traffic: value.cover_traffic.into(),
            gateway_connection: value.gateway_connection.into(),
@@ -1,472 +0,0 @@
-// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::client::topology_control::geo_aware_provider::CountryGroup;
-use crate::config::{
-    Acknowledgements, Client, Config, CoverTraffic, DebugConfig, GatewayConnection, GroupBy,
-    ReplySurbs, Topology, TopologyStructure, Traffic,
-};
-use nym_sphinx::{
-    addressing::clients::Recipient,
-    params::{PacketSize, PacketType},
-};
-use serde::{Deserialize, Serialize};
-use std::time::Duration;
-use url::Url;
-
-// 'DEBUG'
-const DEFAULT_ACK_WAIT_MULTIPLIER: f64 = 1.5;
-
-const DEFAULT_ACK_WAIT_ADDITION: Duration = Duration::from_millis(1_500);
-const DEFAULT_LOOP_COVER_STREAM_AVERAGE_DELAY: Duration = Duration::from_millis(200);
-const DEFAULT_MESSAGE_STREAM_AVERAGE_DELAY: Duration = Duration::from_millis(20);
-const DEFAULT_AVERAGE_PACKET_DELAY: Duration = Duration::from_millis(50);
-const DEFAULT_TOPOLOGY_REFRESH_RATE: Duration = Duration::from_secs(5 * 60); // every 5min
-const DEFAULT_TOPOLOGY_RESOLUTION_TIMEOUT: Duration = Duration::from_millis(5_000);
-const DEFAULT_MAX_STARTUP_GATEWAY_WAITING_PERIOD: Duration = Duration::from_secs(70 * 60); // 70min -> full epoch (1h) + a bit of overhead
-
-// Set this to a high value for now, so that we don't risk sporadic timeouts that might cause
-// bought bandwidth tokens to not have time to be spent; Once we remove the gateway from the
-// bandwidth bridging protocol, we can come back to a smaller timeout value
-const DEFAULT_GATEWAY_RESPONSE_TIMEOUT: Duration = Duration::from_secs(5 * 60);
-
-const DEFAULT_COVER_TRAFFIC_PRIMARY_SIZE_RATIO: f64 = 0.70;
-
-// reply-surbs related:
-
-// define when to request
-// clients/client-core/src/client/replies/reply_storage/surb_storage.rs
-const DEFAULT_MINIMUM_REPLY_SURB_STORAGE_THRESHOLD: usize = 10;
-const DEFAULT_MAXIMUM_REPLY_SURB_STORAGE_THRESHOLD: usize = 200;
-
-// define how much to request at once
-// clients/client-core/src/client/replies/reply_controller.rs
-const DEFAULT_MINIMUM_REPLY_SURB_REQUEST_SIZE: u32 = 10;
-const DEFAULT_MAXIMUM_REPLY_SURB_REQUEST_SIZE: u32 = 100;
-
-const DEFAULT_MAXIMUM_ALLOWED_SURB_REQUEST_SIZE: u32 = 500;
-
-const DEFAULT_MAXIMUM_REPLY_SURB_REREQUEST_WAITING_PERIOD: Duration = Duration::from_secs(10);
-const DEFAULT_MAXIMUM_REPLY_SURB_DROP_WAITING_PERIOD: Duration = Duration::from_secs(5 * 60);
-
-// 12 hours
-const DEFAULT_MAXIMUM_REPLY_SURB_AGE: Duration = Duration::from_secs(12 * 60 * 60);
-
-// 24 hours
-const DEFAULT_MAXIMUM_REPLY_KEY_AGE: Duration = Duration::from_secs(24 * 60 * 60);
-
-#[derive(Debug, Clone, Deserialize, PartialEq, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct ConfigV1_1_30 {
-    pub client: ClientV1_1_30,
-
-    #[serde(default)]
-    pub debug: DebugConfigV1_1_30,
-}
-
-impl From<ConfigV1_1_30> for Config {
-    fn from(value: ConfigV1_1_30) -> Self {
-        Config {
-            client: Client {
-                version: value.client.version,
-                id: value.client.id,
-                disabled_credentials_mode: value.client.disabled_credentials_mode,
-                nyxd_urls: value.client.nyxd_urls,
-                nym_api_urls: value.client.nym_api_urls,
-            },
-            debug: DebugConfig {
-                traffic: Traffic {
-                    average_packet_delay: value.debug.traffic.average_packet_delay,
-                    message_sending_average_delay: value
-                        .debug
-                        .traffic
-                        .message_sending_average_delay,
-                    disable_main_poisson_packet_distribution: value
-                        .debug
-                        .traffic
-                        .disable_main_poisson_packet_distribution,
-                    primary_packet_size: value.debug.traffic.primary_packet_size,
-                    secondary_packet_size: value.debug.traffic.secondary_packet_size,
-                    packet_type: value.debug.traffic.packet_type,
-                },
-                cover_traffic: CoverTraffic {
-                    loop_cover_traffic_average_delay: value
-                        .debug
-                        .cover_traffic
-                        .loop_cover_traffic_average_delay,
-                    cover_traffic_primary_size_ratio: value
-                        .debug
-                        .cover_traffic
-                        .cover_traffic_primary_size_ratio,
-                    disable_loop_cover_traffic_stream: value
-                        .debug
-                        .cover_traffic
-                        .disable_loop_cover_traffic_stream,
-                },
-                gateway_connection: GatewayConnection {
-                    gateway_response_timeout: value
-                        .debug
-                        .gateway_connection
-                        .gateway_response_timeout,
-                },
-                acknowledgements: Acknowledgements {
-                    average_ack_delay: value.debug.acknowledgements.average_ack_delay,
-                    ack_wait_multiplier: value.debug.acknowledgements.ack_wait_multiplier,
-                    ack_wait_addition: value.debug.acknowledgements.ack_wait_addition,
-                },
-                topology: Topology {
-                    topology_refresh_rate: value.debug.topology.topology_refresh_rate,
-                    topology_resolution_timeout: value.debug.topology.topology_resolution_timeout,
-                    disable_refreshing: value.debug.topology.disable_refreshing,
-                    max_startup_gateway_waiting_period: value
-                        .debug
-                        .topology
-                        .max_startup_gateway_waiting_period,
-                    topology_structure: value.debug.topology.topology_structure.into(),
-                },
-                reply_surbs: ReplySurbs {
-                    minimum_reply_surb_storage_threshold: value
-                        .debug
-                        .reply_surbs
-                        .minimum_reply_surb_storage_threshold,
-                    maximum_reply_surb_storage_threshold: value
-                        .debug
-                        .reply_surbs
-                        .maximum_reply_surb_storage_threshold,
-                    minimum_reply_surb_request_size: value
-                        .debug
-                        .reply_surbs
-                        .minimum_reply_surb_request_size,
-                    maximum_reply_surb_request_size: value
-                        .debug
-                        .reply_surbs
-                        .maximum_reply_surb_request_size,
-                    maximum_allowed_reply_surb_request_size: value
-                        .debug
-                        .reply_surbs
-                        .maximum_allowed_reply_surb_request_size,
-                    maximum_reply_surb_rerequest_waiting_period: value
-                        .debug
-                        .reply_surbs
-                        .maximum_reply_surb_rerequest_waiting_period,
-                    maximum_reply_surb_drop_waiting_period: value
-                        .debug
-                        .reply_surbs
-                        .maximum_reply_surb_drop_waiting_period,
-                    maximum_reply_surb_age: value.debug.reply_surbs.maximum_reply_surb_age,
-                    maximum_reply_key_age: value.debug.reply_surbs.maximum_reply_key_age,
-                },
-            },
-        }
-    }
-}
-
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq, Serialize)]
-// note: the deny_unknown_fields is VITAL here to allow upgrades from v1.1.20_2
-#[serde(deny_unknown_fields)]
-pub struct ClientV1_1_30 {
-    /// Version of the client for which this configuration was created.
-    pub version: String,
-
-    /// ID specifies the human readable ID of this particular client.
-    pub id: String,
-
-    /// Indicates whether this client is running in a disabled credentials mode, thus attempting
-    /// to claim bandwidth without presenting bandwidth credentials.
-    // TODO: this should be moved to `debug.gateway_connection`
-    #[serde(default)]
-    pub disabled_credentials_mode: bool,
-
-    /// Addresses to nyxd validators via which the client can communicate with the chain.
-    #[serde(alias = "validator_urls")]
-    pub nyxd_urls: Vec<Url>,
-
-    /// Addresses to APIs running on validator from which the client gets the view of the network.
-    #[serde(alias = "validator_api_urls")]
-    pub nym_api_urls: Vec<Url>,
-}
-
-#[derive(Debug, Clone, Copy, Deserialize, PartialEq, Serialize)]
-#[serde(default, deny_unknown_fields)]
-pub struct TrafficV1_1_30 {
-    /// The parameter of Poisson distribution determining how long, on average,
-    /// sent packet is going to be delayed at any given mix node.
-    /// So for a packet going through three mix nodes, on average, it will take three times this value
-    /// until the packet reaches its destination.
-    #[serde(with = "humantime_serde")]
-    pub average_packet_delay: Duration,
-
-    /// The parameter of Poisson distribution determining how long, on average,
-    /// it is going to take another 'real traffic stream' message to be sent.
-    /// If no real packets are available and cover traffic is enabled,
-    /// a loop cover message is sent instead in order to preserve the rate.
-    #[serde(with = "humantime_serde")]
-    pub message_sending_average_delay: Duration,
-
-    /// Controls whether the main packet stream constantly produces packets according to the predefined
-    /// poisson distribution.
-    pub disable_main_poisson_packet_distribution: bool,
-
-    /// Specifies the packet size used for sent messages.
-    /// Do not override it unless you understand the consequences of that change.
-    pub primary_packet_size: PacketSize,
-
-    /// Specifies the optional auxiliary packet size for optimizing message streams.
-    /// Note that its use decreases overall anonymity.
-    /// Do not set it it unless you understand the consequences of that change.
-    pub secondary_packet_size: Option<PacketSize>,
-
-    pub packet_type: PacketType,
-}
-
-impl Default for TrafficV1_1_30 {
-    fn default() -> Self {
-        TrafficV1_1_30 {
-            average_packet_delay: DEFAULT_AVERAGE_PACKET_DELAY,
-            message_sending_average_delay: DEFAULT_MESSAGE_STREAM_AVERAGE_DELAY,
-            disable_main_poisson_packet_distribution: false,
-            primary_packet_size: PacketSize::RegularPacket,
-            secondary_packet_size: None,
-            packet_type: PacketType::Mix,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, Deserialize, PartialEq, Serialize)]
-#[serde(default, deny_unknown_fields)]
-pub struct CoverTrafficV1_1_30 {
-    /// The parameter of Poisson distribution determining how long, on average,
-    /// it is going to take for another loop cover traffic message to be sent.
-    #[serde(with = "humantime_serde")]
-    pub loop_cover_traffic_average_delay: Duration,
-
-    /// Specifies the ratio of `primary_packet_size` to `secondary_packet_size` used in cover traffic.
-    /// Only applicable if `secondary_packet_size` is enabled.
-    pub cover_traffic_primary_size_ratio: f64,
-
-    /// Controls whether the dedicated loop cover traffic stream should be enabled.
-    /// (and sending packets, on average, every [Self::loop_cover_traffic_average_delay])
-    pub disable_loop_cover_traffic_stream: bool,
-}
-
-impl Default for CoverTrafficV1_1_30 {
-    fn default() -> Self {
-        CoverTrafficV1_1_30 {
-            loop_cover_traffic_average_delay: DEFAULT_LOOP_COVER_STREAM_AVERAGE_DELAY,
-            cover_traffic_primary_size_ratio: DEFAULT_COVER_TRAFFIC_PRIMARY_SIZE_RATIO,
-            disable_loop_cover_traffic_stream: false,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, Deserialize, PartialEq, Serialize)]
-#[serde(default, deny_unknown_fields)]
-pub struct GatewayConnectionV1_1_30 {
-    /// How long we're willing to wait for a response to a message sent to the gateway,
-    /// before giving up on it.
-    #[serde(with = "humantime_serde")]
-    pub gateway_response_timeout: Duration,
-}
-
-impl Default for GatewayConnectionV1_1_30 {
-    fn default() -> Self {
-        GatewayConnectionV1_1_30 {
-            gateway_response_timeout: DEFAULT_GATEWAY_RESPONSE_TIMEOUT,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, Deserialize, PartialEq, Serialize)]
-#[serde(default, deny_unknown_fields)]
-pub struct AcknowledgementsV1_1_30 {
-    /// The parameter of Poisson distribution determining how long, on average,
-    /// sent acknowledgement is going to be delayed at any given mix node.
-    /// So for an ack going through three mix nodes, on average, it will take three times this value
-    /// until the packet reaches its destination.
-    #[serde(with = "humantime_serde")]
-    pub average_ack_delay: Duration,
-
-    /// Value multiplied with the expected round trip time of an acknowledgement packet before
-    /// it is assumed it was lost and retransmission of the data packet happens.
-    /// In an ideal network with 0 latency, this value would have been 1.
-    pub ack_wait_multiplier: f64,
-
-    /// Value added to the expected round trip time of an acknowledgement packet before
-    /// it is assumed it was lost and retransmission of the data packet happens.
-    /// In an ideal network with 0 latency, this value would have been 0.
-    #[serde(with = "humantime_serde")]
-    pub ack_wait_addition: Duration,
-}
-
-impl Default for AcknowledgementsV1_1_30 {
-    fn default() -> Self {
-        AcknowledgementsV1_1_30 {
-            average_ack_delay: DEFAULT_AVERAGE_PACKET_DELAY,
-            ack_wait_multiplier: DEFAULT_ACK_WAIT_MULTIPLIER,
-            ack_wait_addition: DEFAULT_ACK_WAIT_ADDITION,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, Deserialize, PartialEq, Serialize)]
-#[serde(default, deny_unknown_fields)]
-pub struct TopologyV1_1_30 {
-    /// The uniform delay every which clients are querying the directory server
-    /// to try to obtain a compatible network topology to send sphinx packets through.
-    #[serde(with = "humantime_serde")]
-    pub topology_refresh_rate: Duration,
-
-    /// During topology refresh, test packets are sent through every single possible network
-    /// path. This timeout determines waiting period until it is decided that the packet
-    /// did not reach its destination.
-    #[serde(with = "humantime_serde")]
-    pub topology_resolution_timeout: Duration,
-
-    /// Specifies whether the client should not refresh the network topology after obtaining
-    /// the first valid instance.
-    /// Supersedes `topology_refresh_rate_ms`.
-    pub disable_refreshing: bool,
-
-    /// Defines how long the client is going to wait on startup for its gateway to come online,
-    /// before abandoning the procedure.
-    #[serde(with = "humantime_serde")]
-    pub max_startup_gateway_waiting_period: Duration,
-
-    /// Specifies the mixnode topology to be used for sending packets.
-    pub topology_structure: TopologyStructureV1_1_30,
-}
-
-#[allow(clippy::large_enum_variant)]
-#[derive(Default, Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub enum TopologyStructureV1_1_30 {
-    #[default]
-    NymApi,
-    GeoAware(GroupByV1_1_30),
-}
-
-impl From<TopologyStructureV1_1_30> for TopologyStructure {
-    fn from(value: TopologyStructureV1_1_30) -> Self {
-        match value {
-            TopologyStructureV1_1_30::NymApi => TopologyStructure::NymApi,
-            TopologyStructureV1_1_30::GeoAware(group_by) => {
-                TopologyStructure::GeoAware(group_by.into())
-            }
-        }
-    }
-}
-
-#[allow(clippy::large_enum_variant)]
-#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub enum GroupByV1_1_30 {
-    CountryGroup(CountryGroup),
-    NymAddress(Recipient),
-}
-
-impl From<GroupByV1_1_30> for GroupBy {
-    fn from(value: GroupByV1_1_30) -> Self {
-        match value {
-            GroupByV1_1_30::CountryGroup(country) => GroupBy::CountryGroup(country),
-            GroupByV1_1_30::NymAddress(addr) => GroupBy::NymAddress(addr),
-        }
-    }
-}
-
-impl std::fmt::Display for GroupByV1_1_30 {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            GroupByV1_1_30::CountryGroup(group) => write!(f, "group: {}", group),
-            GroupByV1_1_30::NymAddress(address) => write!(f, "address: {}", address),
-        }
-    }
-}
-
-impl Default for TopologyV1_1_30 {
-    fn default() -> Self {
-        TopologyV1_1_30 {
-            topology_refresh_rate: DEFAULT_TOPOLOGY_REFRESH_RATE,
-            topology_resolution_timeout: DEFAULT_TOPOLOGY_RESOLUTION_TIMEOUT,
-            disable_refreshing: false,
-            max_startup_gateway_waiting_period: DEFAULT_MAX_STARTUP_GATEWAY_WAITING_PERIOD,
-            topology_structure: TopologyStructureV1_1_30::default(),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, Deserialize, PartialEq, Serialize)]
-#[serde(default, deny_unknown_fields)]
-pub struct ReplySurbsV1_1_30 {
-    /// Defines the minimum number of reply surbs the client wants to keep in its storage at all times.
-    /// It can only allow to go below that value if its to request additional reply surbs.
-    pub minimum_reply_surb_storage_threshold: usize,
-
-    /// Defines the maximum number of reply surbs the client wants to keep in its storage at any times.
-    pub maximum_reply_surb_storage_threshold: usize,
-
-    /// Defines the minimum number of reply surbs the client would request.
-    pub minimum_reply_surb_request_size: u32,
-
-    /// Defines the maximum number of reply surbs the client would request.
-    pub maximum_reply_surb_request_size: u32,
-
-    /// Defines the maximum number of reply surbs a remote party is allowed to request from this client at once.
-    pub maximum_allowed_reply_surb_request_size: u32,
-
-    /// Defines maximum amount of time the client is going to wait for reply surbs before explicitly asking
-    /// for more even though in theory they wouldn't need to.
-    #[serde(with = "humantime_serde")]
-    pub maximum_reply_surb_rerequest_waiting_period: Duration,
-
-    /// Defines maximum amount of time the client is going to wait for reply surbs before
-    /// deciding it's never going to get them and would drop all pending messages
-    #[serde(with = "humantime_serde")]
-    pub maximum_reply_surb_drop_waiting_period: Duration,
-
-    /// Defines maximum amount of time given reply surb is going to be valid for.
-    /// This is going to be superseded by key rotation once implemented.
-    #[serde(with = "humantime_serde")]
-    pub maximum_reply_surb_age: Duration,
-
-    /// Defines maximum amount of time given reply key is going to be valid for.
-    /// This is going to be superseded by key rotation once implemented.
-    #[serde(with = "humantime_serde")]
-    pub maximum_reply_key_age: Duration,
-}
-
-impl Default for ReplySurbsV1_1_30 {
-    fn default() -> Self {
-        ReplySurbsV1_1_30 {
-            minimum_reply_surb_storage_threshold: DEFAULT_MINIMUM_REPLY_SURB_STORAGE_THRESHOLD,
-            maximum_reply_surb_storage_threshold: DEFAULT_MAXIMUM_REPLY_SURB_STORAGE_THRESHOLD,
-            minimum_reply_surb_request_size: DEFAULT_MINIMUM_REPLY_SURB_REQUEST_SIZE,
-            maximum_reply_surb_request_size: DEFAULT_MAXIMUM_REPLY_SURB_REQUEST_SIZE,
-            maximum_allowed_reply_surb_request_size: DEFAULT_MAXIMUM_ALLOWED_SURB_REQUEST_SIZE,
-            maximum_reply_surb_rerequest_waiting_period:
-                DEFAULT_MAXIMUM_REPLY_SURB_REREQUEST_WAITING_PERIOD,
-            maximum_reply_surb_drop_waiting_period: DEFAULT_MAXIMUM_REPLY_SURB_DROP_WAITING_PERIOD,
-            maximum_reply_surb_age: DEFAULT_MAXIMUM_REPLY_SURB_AGE,
-            maximum_reply_key_age: DEFAULT_MAXIMUM_REPLY_KEY_AGE,
-        }
-    }
-}
-
-#[derive(Debug, Default, Clone, Copy, Deserialize, PartialEq, Serialize)]
-#[serde(default, deny_unknown_fields)]
-pub struct DebugConfigV1_1_30 {
-    /// Defines all configuration options related to traffic streams.
-    pub traffic: TrafficV1_1_30,
-
-    /// Defines all configuration options related to cover traffic stream(s).
-    pub cover_traffic: CoverTrafficV1_1_30,
-
-    /// Defines all configuration options related to the gateway connection.
-    pub gateway_connection: GatewayConnectionV1_1_30,
-
-    /// Defines all configuration options related to acknowledgements, such as delays or wait timeouts.
-    pub acknowledgements: AcknowledgementsV1_1_30,
-
-    /// Defines all configuration options related topology, such as refresh rates or timeouts.
-    pub topology: TopologyV1_1_30,
-
-    /// Defines all configuration options related to reply SURBs.
-    pub reply_surbs: ReplySurbsV1_1_30,
-}
@@ -8,41 +8,40 @@ use nym_topology::gateway::GatewayConversionError;
 use nym_topology::NymTopologyError;
 use nym_validator_client::ValidatorClientError;
 use std::error::Error;
-use std::path::PathBuf;

 #[derive(thiserror::Error, Debug)]
 pub enum ClientCoreError {
    #[error("I/O error: {0}")]
    IoError(#[from] std::io::Error),

-    #[error("gateway client error ({gateway_id}): {source}")]
+    #[error("Gateway client error ({gateway_id}): {source}")]
    GatewayClientError {
        gateway_id: String,
        source: GatewayClientError,
    },

-    #[error("custom gateway client error: {source}")]
+    #[error("Custom gateway client error: {source}")]
    ErasedGatewayClientError {
        #[from]
        source: ErasedGatewayError,
    },

-    #[error("ed25519 error: {0}")]
+    #[error("Ed25519 error: {0}")]
    Ed25519RecoveryError(#[from] Ed25519RecoveryError),

-    #[error("validator client error: {0}")]
+    #[error("Validator client error: {0}")]
    ValidatorClientError(#[from] ValidatorClientError),

-    #[error("no gateway with id: {0}")]
+    #[error("No gateway with id: {0}")]
    NoGatewayWithId(String),

-    #[error("no gateways on network")]
+    #[error("No gateways on network")]
    NoGatewaysOnNetwork,

-    #[error("list of nym apis is empty")]
+    #[error("List of nym apis is empty")]
    ListOfNymApisIsEmpty,

-    #[error("the current network topology seem to be insufficient to route any packets through")]
+    #[error("The current network topology seem to be insufficient to route any packets through")]
    InsufficientNetworkTopology(#[from] NymTopologyError),

    #[error("experienced a failure with our reply surb persistent storage: {source}")]
@@ -60,7 +59,7 @@ pub enum ClientCoreError {
        source: Box<dyn Error + Send + Sync>,
    },

-    #[error("the gateway id is invalid - {0}")]
+    #[error("The gateway id is invalid - {0}")]
    UnableToCreatePublicKeyFromGatewayId(Ed25519RecoveryError),

    #[error("The gateway is malformed: {source}")]
@@ -79,23 +78,23 @@ pub enum ClientCoreError {
    #[error("failed to establish gateway connection (wasm)")]
    GatewayJsConnectionFailure,

-    #[error("gateway connection was abruptly closed")]
+    #[error("Gateway connection was abruptly closed")]
    GatewayConnectionAbruptlyClosed,

-    #[error("timed out while trying to establish gateway connection")]
+    #[error("Timed out while trying to establish gateway connection")]
    GatewayConnectionTimeout,

-    #[error("no ping measurements for the gateway ({identity}) performed")]
+    #[error("No ping measurements for the gateway ({identity}) performed")]
    NoGatewayMeasurements { identity: String },

    #[error("failed to register receiver for reconstructed mixnet messages")]
    FailedToRegisterReceiver,

-    #[error("unexpected exit")]
+    #[error("Unexpected exit")]
    UnexpectedExit,

    #[error(
-        "this operation would have resulted in clients keys being overwritten without permission"
+        "This operation would have resulted in clients keys being overwritten without permission"
    )]
    ForbiddenKeyOverwrite,

@@ -127,32 +126,6 @@ pub enum ClientCoreError {

    #[error("this client has performed gateway initialisation in another session")]
    NoInitClientPresent,
-
-    #[error("there are no gateways supporting the wss protocol available")]
-    NoWssGateways,
-
-    #[error("the specified gateway '{gateway}' does not support the wss protocol")]
-    UnsupportedWssProtocol { gateway: String },
-
-    #[error(
-    "failed to load custom topology using path '{}'. detailed message: {source}", file_path.display()
-    )]
-    CustomTopologyLoadFailure {
-        file_path: PathBuf,
-        #[source]
-        source: std::io::Error,
-    },
-
-    #[error(
-    "failed to save config file for client-{typ} id {id} using path '{}'. detailed message: {source}", path.display()
-    )]
-    ConfigSaveFailure {
-        typ: String,
-        id: String,
-        path: PathBuf,
-        #[source]
-        source: std::io::Error,
-    },
 }

 /// Set of messages that the client can send to listeners via the task manager
@@ -67,24 +67,14 @@ pub async fn current_gateways<R: Rng>(

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

-    let gateways = client.get_cached_described_gateways().await?;
-    log::debug!("Found {} gateways", gateways.len());
-    log::trace!("Gateways: {:#?}", gateways);
-
+    let gateways = client.get_cached_gateways().await?;
    let valid_gateways = gateways
        .into_iter()
        .filter_map(|gateway| gateway.try_into().ok())
        .collect::<Vec<gateway::Node>>();
-    log::debug!("Ater checking validity: {}", valid_gateways.len());
-    log::trace!("Valid gateways: {:#?}", valid_gateways);

    // we were always filtering by version so I'm not removing that 'feature'
    let filtered_gateways = valid_gateways.filter_by_version(env!("CARGO_PKG_VERSION"));
-    log::debug!("After filtering for version: {}", filtered_gateways.len());
-    log::trace!("Filtered gateways: {:#?}", filtered_gateways);
-
-    log::info!("nym-api reports {} valid gateways", filtered_gateways.len());
-
    Ok(filtered_gateways)
 }

@@ -184,10 +174,7 @@ async fn measure_latency(gateway: &gateway::Node) -> Result<GatewayWithLatency,
 pub async fn choose_gateway_by_latency<R: Rng>(
    rng: &mut R,
    gateways: &[gateway::Node],
-    must_use_tls: bool,
 ) -> Result<gateway::Node, ClientCoreError> {
-    let gateways = filter_by_tls(gateways, must_use_tls)?;
-
    info!(
        "choosing gateway by latency, pinging {} gateways ...",
        gateways.len()
@@ -223,57 +210,28 @@ pub async fn choose_gateway_by_latency<R: Rng>(
    Ok(chosen.gateway.clone())
 }

-fn filter_by_tls(
-    gateways: &[gateway::Node],
-    must_use_tls: bool,
-) -> Result<Vec<&gateway::Node>, ClientCoreError> {
-    if must_use_tls {
-        let filtered = gateways
-            .iter()
-            .filter(|g| g.clients_wss_port.is_some())
-            .collect::<Vec<_>>();
-
-        if filtered.is_empty() {
-            return Err(ClientCoreError::NoWssGateways);
-        }
-
-        Ok(filtered)
-    } else {
-        Ok(gateways.iter().collect())
-    }
-}
-
 pub(super) fn uniformly_random_gateway<R: Rng>(
    rng: &mut R,
    gateways: &[gateway::Node],
-    must_use_tls: bool,
 ) -> Result<gateway::Node, ClientCoreError> {
-    filter_by_tls(gateways, must_use_tls)?
+    gateways
        .choose(rng)
        .ok_or(ClientCoreError::NoGatewaysOnNetwork)
-        .map(|&r| r.clone())
+        .cloned()
 }

 pub(super) fn get_specified_gateway(
    gateway_identity: IdentityKeyRef,
    gateways: &[gateway::Node],
-    must_use_tls: bool,
 ) -> Result<gateway::Node, ClientCoreError> {
    let user_gateway = identity::PublicKey::from_base58_string(gateway_identity)
        .map_err(ClientCoreError::UnableToCreatePublicKeyFromGatewayId)?;

-    let gateway = gateways
+    gateways
        .iter()
        .find(|gateway| gateway.identity_key == user_gateway)
-        .ok_or_else(|| ClientCoreError::NoGatewayWithId(gateway_identity.to_string()))?;
-
-    if must_use_tls && gateway.clients_wss_port.is_none() {
-        return Err(ClientCoreError::UnsupportedWssProtocol {
-            gateway: gateway_identity.to_string(),
-        });
-    }
-
-    Ok(gateway.clone())
+        .ok_or_else(|| ClientCoreError::NoGatewayWithId(gateway_identity.to_string()))
+        .cloned()
 }

 pub(super) async fn register_with_gateway(
@@ -94,8 +94,6 @@ where
    D::StorageError: Send + Sync + 'static,
    T: DeserializeOwned + Serialize + Send + Sync,
 {
-    log::trace!("Setting up new gateway");
-
    // if we're setting up new gateway, failing to load existing information is fine.
    // as a matter of fact, it's only potentially a problem if we DO succeed
    if _load_gateway_details(details_store).await.is_ok() && !overwrite_data {
@@ -110,20 +108,19 @@ where

    let gateway_details = match selection_specification {
        GatewaySelectionSpecification::UniformRemote { must_use_tls } => {
-            let gateway = uniformly_random_gateway(&mut rng, &available_gateways, must_use_tls)?;
-            GatewayDetails::Configured(GatewayEndpointConfig::from_node(gateway, must_use_tls)?)
+            let gateway = uniformly_random_gateway(&mut rng, &available_gateways)?;
+            GatewayDetails::Configured(GatewayEndpointConfig::from_node(gateway, must_use_tls))
        }
        GatewaySelectionSpecification::RemoteByLatency { must_use_tls } => {
-            let gateway =
-                choose_gateway_by_latency(&mut rng, &available_gateways, must_use_tls).await?;
-            GatewayDetails::Configured(GatewayEndpointConfig::from_node(gateway, must_use_tls)?)
+            let gateway = choose_gateway_by_latency(&mut rng, &available_gateways).await?;
+            GatewayDetails::Configured(GatewayEndpointConfig::from_node(gateway, must_use_tls))
        }
        GatewaySelectionSpecification::Specified {
            must_use_tls,
            identity,
        } => {
-            let gateway = get_specified_gateway(&identity, &available_gateways, must_use_tls)?;
-            GatewayDetails::Configured(GatewayEndpointConfig::from_node(gateway, must_use_tls)?)
+            let gateway = get_specified_gateway(&identity, &available_gateways)?;
+            GatewayDetails::Configured(GatewayEndpointConfig::from_node(gateway, must_use_tls))
        }
        GatewaySelectionSpecification::Custom {
            gateway_identity,
@@ -212,7 +209,6 @@ where
    D::StorageError: Send + Sync + 'static,
    T: DeserializeOwned + Serialize + Send + Sync,
 {
-    log::trace!("Setting up gateway");
    match setup {
        GatewaySetup::MustLoad => use_loaded_gateway_details(key_store, details_store).await,
        GatewaySetup::New {
@@ -296,17 +296,16 @@ impl<T> GatewaySetup<T> {
 /// Struct describing the results of the client initialization procedure.
 #[derive(Debug, Serialize)]
 pub struct InitResults {
-    pub version: String,
-    pub id: String,
-    pub identity_key: String,
-    pub encryption_key: String,
-    pub gateway_id: String,
-    pub gateway_listener: String,
-    pub address: Recipient,
+    version: String,
+    id: String,
+    identity_key: String,
+    encryption_key: String,
+    gateway_id: String,
+    gateway_listener: String,
 }

 impl InitResults {
-    pub fn new(config: &Config, address: Recipient, gateway: &GatewayEndpointConfig) -> Self {
+    pub fn new(config: &Config, address: &Recipient, gateway: &GatewayEndpointConfig) -> Self {
        Self {
            version: config.client.version.clone(),
            id: config.client.id.clone(),
@@ -314,7 +313,6 @@ impl InitResults {
            encryption_key: address.encryption_key().to_base58_string(),
            gateway_id: gateway.gateway_id.clone(),
            gateway_listener: gateway.gateway_listener.clone(),
-            address,
        }
    }
 }
@@ -1,7 +1,5 @@
 use std::future::Future;

-#[cfg(not(target_arch = "wasm32"))]
-pub mod cli_helpers;
 pub mod client;
 pub mod config;
 pub mod error;
@@ -45,9 +45,6 @@ features = ["net", "sync", "time"]

 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-tungstenite]
 workspace = true
-# the choice of this particular tls feature was arbitrary;
-# if you reckon a different one would be more appropriate, feel free to change it
-features = ["native-tls"]

 # wasm-only dependencies
 [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen]
@@ -74,7 +74,7 @@ impl PartiallyDelegated {

    fn route_socket_messages(
        ws_msgs: Vec<Message>,
-        packet_router: &PacketRouter,
+        packet_router: &mut PacketRouter,
        shared_key: &SharedKeys,
    ) -> Result<(), GatewayClientError> {
        let plaintexts = Self::recover_received_plaintexts(ws_msgs, shared_key);
@@ -97,6 +97,7 @@ impl PartiallyDelegated {
        let mixnet_receiver_future = async move {
            let mut notify_receiver = notify_receiver;
            let mut chunk_stream = (&mut stream).ready_chunks(8);
+            let mut packet_router = packet_router;

            let ret_err = loop {
                tokio::select! {
@@ -114,7 +115,7 @@ impl PartiallyDelegated {
                            Ok(msgs) => msgs
                        };

-                        if let Err(err) = Self::route_socket_messages(ws_msgs, &packet_router, shared_key.as_ref()) {
+                        if let Err(err) = Self::route_socket_messages(ws_msgs, &mut packet_router, shared_key.as_ref()) {
                            log::warn!("Route socket messages failed: {err}");
                        }
                    }
@@ -42,9 +42,7 @@ pub trait GatewayPacketRouter {
                }

                n if n
-                    == PacketSize::OutfoxRegularPacket
-                        .plaintext_size()
-                        .saturating_sub(outfox_ack_overhead) =>
+                    == PacketSize::OutfoxRegularPacket.plaintext_size() - outfox_ack_overhead =>
                {
                    trace!("received regular outfox packet");
                    received_messages.push(received_packet);
@@ -24,7 +24,6 @@ nym-service-provider-directory-common = { path = "../../cosmwasm-smart-contracts
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 reqwest = { workspace = true, features = ["json"] }
-http-api-client = { path = "../../../common/http-api-client"}
 thiserror = { workspace = true }
 log = { workspace = true }
 url = { workspace = true, features = ["serde"] }
@@ -45,17 +44,13 @@ cosmrs = { workspace = true, features = ["bip32", "cosmwasm"] }
 # import it just for the `Client` trait
 tendermint-rpc = { workspace = true }

-# this is an extremely nasty import. we're explicitly bringing in bip32 so that via the magic (or curse, pick your poison)
-# of cargo's feature unification we'd get `bip32/std` meaning we'd get `std::error::Error` for the re-exported (via cosmrs) bip32::Error type
-bip32 = { workspace = true, default-features = false, features = ["std"] }
-
 eyre = { version = "0.6" }
 cw-utils = { workspace = true }
 cw2 = { workspace = true }
 cw3 = { workspace = true }
 cw4 = { workspace = true }
 cw-controllers = { workspace = true }
-prost = { workspace = true, default-features = false }
+prost = { version = "0.11", default-features = false }
 flate2 = { version = "1.0.20" }
 sha2 = { version = "0.9.5" }
 itertools = { version = "0.10" }
@@ -9,7 +9,7 @@ use nym_validator_client::nyxd::contract_traits::{

 #[tokio::main]
 async fn main() {
-    setup_env(Some("../../../envs/qa.env"));
+    setup_env(Some("../../../envs/qa-qwerty.env"));
    let network_details = NymNetworkDetails::new_from_env();
    let config =
        nym_validator_client::Config::try_from_nym_network_details(&network_details).unwrap();
@@ -9,7 +9,7 @@ use nym_validator_client::nyxd::contract_traits::{

 #[tokio::main]
 async fn main() {
-    setup_env(Some("../../../envs/qa.env"));
+    setup_env(Some("../../../envs/qa-qwerty.env"));
    let network_details = NymNetworkDetails::new_from_env();
    let config =
        nym_validator_client::Config::try_from_nym_network_details(&network_details).unwrap();
@@ -11,7 +11,7 @@ use crate::{
 use nym_api_requests::coconut::{
    BlindSignRequestBody, BlindedSignatureResponse, VerifyCredentialBody, VerifyCredentialResponse,
 };
-use nym_api_requests::models::{DescribedGateway, MixNodeBondAnnotated};
+use nym_api_requests::models::MixNodeBondAnnotated;
 use nym_api_requests::models::{
    GatewayCoreStatusResponse, MixnodeCoreStatusResponse, MixnodeStatusResponse,
    RewardEstimationResponse, StakeSaturationResponse,
@@ -19,7 +19,6 @@ use nym_api_requests::models::{
 use nym_network_defaults::NymNetworkDetails;
 use url::Url;

-pub use crate::nym_api::NymApiClientExt;
 pub use nym_mixnet_contract_common::{
    mixnode::MixNodeDetails, GatewayBond, IdentityKey, IdentityKeyRef, MixId,
 };
@@ -148,7 +147,7 @@ impl Client<ReqwestRpcClient> {

 impl<C> Client<C> {
    pub fn new_with_rpc_client(config: Config, rpc_client: C) -> Self {
-        let nym_api_client = nym_api::Client::new(config.api_url.clone(), None);
+        let nym_api_client = nym_api::Client::new(config.api_url.clone());

        Client {
            nym_api: nym_api_client,
@@ -162,7 +161,7 @@ impl<C, S> Client<C, S> {
    where
        S: OfflineSigner,
    {
-        let nym_api_client = nym_api::Client::new(config.api_url.clone(), None);
+        let nym_api_client = nym_api::Client::new(config.api_url.clone());

        Client {
            nym_api: nym_api_client,
@@ -178,7 +177,7 @@ impl<C, S> Client<C, S> {
    }

    pub fn change_nym_api(&mut self, new_endpoint: Url) {
-        self.nym_api.change_base_url(new_endpoint)
+        self.nym_api.change_url(new_endpoint)
    }

    pub async fn get_cached_mixnodes(&self) -> Result<Vec<MixNodeDetails>, ValidatorClientError> {
@@ -242,7 +241,7 @@ pub struct NymApiClient {

 impl NymApiClient {
    pub fn new(api_url: Url) -> Self {
-        let nym_api = nym_api::Client::new(api_url, None);
+        let nym_api = nym_api::Client::new(api_url);

        NymApiClient { nym_api }
    }
@@ -252,7 +251,7 @@ impl NymApiClient {
    }

    pub fn change_nym_api(&mut self, new_endpoint: Url) {
-        self.nym_api.change_base_url(new_endpoint);
+        self.nym_api.change_url(new_endpoint);
    }

    pub async fn get_cached_active_mixnodes(
@@ -275,12 +274,6 @@ impl NymApiClient {
        Ok(self.nym_api.get_gateways().await?)
    }

-    pub async fn get_cached_described_gateways(
-        &self,
-    ) -> Result<Vec<DescribedGateway>, ValidatorClientError> {
-        Ok(self.nym_api.get_gateways_described().await?)
-    }
-
    pub async fn get_gateway_core_status_count(
        &self,
        identity: IdentityKeyRef<'_>,
@@ -1,7 +1,20 @@
-// Copyright 2022-2023 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use http_api_client::HttpClientError;
 use nym_api_requests::models::RequestError;
+use thiserror::Error;

-pub type NymAPIError = HttpClientError<RequestError>;
+#[derive(Error, Debug)]
+pub enum NymAPIError {
+    #[error("There was an issue with the REST request - {source}")]
+    ReqwestClientError {
+        #[from]
+        source: reqwest::Error,
+    },
+
+    #[error("Not found")]
+    NotFound,
+
+    #[error("Request failed with error message - {0}")]
+    GenericRequestFailure(String),
+
+    #[error("The nym API has failed to resolve our request. It returned status code {status} and additional error message: {}", error.message())]
+    ApiRequestFailure { status: u16, error: RequestError },
+}
@@ -3,38 +3,140 @@

 use crate::nym_api::error::NymAPIError;
 use crate::nym_api::routes::{CORE_STATUS_COUNT, SINCE_ARG};
-use async_trait::async_trait;
-use http_api_client::{ApiClient, NO_PARAMS};
 use nym_api_requests::coconut::{
    BlindSignRequestBody, BlindedSignatureResponse, VerifyCredentialBody, VerifyCredentialResponse,
 };
 use nym_api_requests::models::{
-    ComputeRewardEstParam, DescribedGateway, GatewayBondAnnotated, GatewayCoreStatusResponse,
+    ComputeRewardEstParam, GatewayBondAnnotated, GatewayCoreStatusResponse,
    GatewayStatusReportResponse, GatewayUptimeHistoryResponse, InclusionProbabilityResponse,
    MixNodeBondAnnotated, MixnodeCoreStatusResponse, MixnodeStatusReportResponse,
-    MixnodeStatusResponse, MixnodeUptimeHistoryResponse, RewardEstimationResponse,
+    MixnodeStatusResponse, MixnodeUptimeHistoryResponse, RequestError, RewardEstimationResponse,
    StakeSaturationResponse, UptimeResponse,
 };
 use nym_mixnet_contract_common::mixnode::MixNodeDetails;
 use nym_mixnet_contract_common::{GatewayBond, IdentityKeyRef, MixId};
 use nym_name_service_common::response::NamesListResponse;
 use nym_service_provider_directory_common::response::ServicesListResponse;
+use reqwest::{Response, StatusCode};
+use serde::{Deserialize, Serialize};
+use url::Url;

 pub mod error;
 pub mod routes;

-pub use http_api_client::Client;
+type PathSegments<'a> = &'a [&'a str];
+type Params<'a, K, V> = &'a [(K, V)];

-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-pub trait NymApiClientExt: ApiClient {
-    async fn get_mixnodes(&self) -> Result<Vec<MixNodeDetails>, NymAPIError> {
-        self.get_json(&[routes::API_VERSION, routes::MIXNODES], NO_PARAMS)
+const NO_PARAMS: Params<'_, &'_ str, &'_ str> = &[];
+
+#[derive(Clone)]
+pub struct Client {
+    url: Url,
+    reqwest_client: reqwest::Client,
+}
+
+impl Client {
+    pub fn new(url: Url) -> Self {
+        let reqwest_client = reqwest::Client::new();
+        Self {
+            url,
+            reqwest_client,
+        }
+    }
+
+    pub fn change_url(&mut self, new_url: Url) {
+        self.url = new_url
+    }
+
+    pub fn current_url(&self) -> &Url {
+        &self.url
+    }
+
+    async fn send_get_request<K, V>(
+        &self,
+        path: PathSegments<'_>,
+        params: Params<'_, K, V>,
+    ) -> Result<Response, NymAPIError>
+    where
+        K: AsRef<str>,
+        V: AsRef<str>,
+    {
+        let url = create_api_url(&self.url, path, params);
+        Ok(self.reqwest_client.get(url).send().await?)
+    }
+
+    async fn query_nym_api<T, K, V>(
+        &self,
+        path: PathSegments<'_>,
+        params: Params<'_, K, V>,
+    ) -> Result<T, NymAPIError>
+    where
+        for<'a> T: Deserialize<'a>,
+        K: AsRef<str>,
+        V: AsRef<str>,
+    {
+        let res = self.send_get_request(path, params).await?;
+        if res.status().is_success() {
+            Ok(res.json().await?)
+        } else if res.status() == StatusCode::NOT_FOUND {
+            Err(NymAPIError::NotFound)
+        } else {
+            Err(NymAPIError::GenericRequestFailure(res.text().await?))
+        }
+    }
+
+    // This works for endpoints returning Result<Json<T>, ErrorResponse>
+    async fn query_nym_api_fallible<T, K, V>(
+        &self,
+        path: PathSegments<'_>,
+        params: Params<'_, K, V>,
+    ) -> Result<T, NymAPIError>
+    where
+        for<'a> T: Deserialize<'a>,
+        K: AsRef<str>,
+        V: AsRef<str>,
+    {
+        let res = self.send_get_request(path, params).await?;
+        let status = res.status();
+        if res.status().is_success() {
+            Ok(res.json().await?)
+        } else {
+            let request_error: RequestError = res.json().await?;
+            Err(NymAPIError::ApiRequestFailure {
+                status: status.as_u16(),
+                error: request_error,
+            })
+        }
+    }
+
+    async fn post_nym_api<B, T, K, V>(
+        &self,
+        path: PathSegments<'_>,
+        params: Params<'_, K, V>,
+        json_body: &B,
+    ) -> Result<T, NymAPIError>
+    where
+        B: Serialize + ?Sized,
+        for<'a> T: Deserialize<'a>,
+        K: AsRef<str>,
+        V: AsRef<str>,
+    {
+        let url = create_api_url(&self.url, path, params);
+        let response = self.reqwest_client.post(url).json(json_body).send().await?;
+        if response.status().is_success() {
+            Ok(response.json().await?)
+        } else {
+            Err(NymAPIError::GenericRequestFailure(response.text().await?))
+        }
+    }
+
+    pub async fn get_mixnodes(&self) -> Result<Vec<MixNodeDetails>, NymAPIError> {
+        self.query_nym_api(&[routes::API_VERSION, routes::MIXNODES], NO_PARAMS)
            .await
    }

-    async fn get_mixnodes_detailed(&self) -> Result<Vec<MixNodeBondAnnotated>, NymAPIError> {
-        self.get_json(
+    pub async fn get_mixnodes_detailed(&self) -> Result<Vec<MixNodeBondAnnotated>, NymAPIError> {
+        self.query_nym_api(
            &[
                routes::API_VERSION,
                routes::STATUS,
@@ -46,8 +148,8 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn get_gateways_detailed(&self) -> Result<Vec<GatewayBondAnnotated>, NymAPIError> {
-        self.get_json(
+    pub async fn get_gateways_detailed(&self) -> Result<Vec<GatewayBondAnnotated>, NymAPIError> {
+        self.query_nym_api(
            &[
                routes::API_VERSION,
                routes::STATUS,
@@ -59,10 +161,10 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn get_mixnodes_detailed_unfiltered(
+    pub async fn get_mixnodes_detailed_unfiltered(
        &self,
    ) -> Result<Vec<MixNodeBondAnnotated>, NymAPIError> {
-        self.get_json(
+        self.query_nym_api(
            &[
                routes::API_VERSION,
                routes::STATUS,
@@ -74,29 +176,23 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn get_gateways(&self) -> Result<Vec<GatewayBond>, NymAPIError> {
-        self.get_json(&[routes::API_VERSION, routes::GATEWAYS], NO_PARAMS)
+    pub async fn get_gateways(&self) -> Result<Vec<GatewayBond>, NymAPIError> {
+        self.query_nym_api(&[routes::API_VERSION, routes::GATEWAYS], NO_PARAMS)
            .await
    }

-    async fn get_gateways_described(&self) -> Result<Vec<DescribedGateway>, NymAPIError> {
-        self.get_json(
-            &[routes::API_VERSION, routes::GATEWAYS, routes::DESCRIBED],
-            NO_PARAMS,
-        )
-        .await
-    }
-
-    async fn get_active_mixnodes(&self) -> Result<Vec<MixNodeDetails>, NymAPIError> {
-        self.get_json(
+    pub async fn get_active_mixnodes(&self) -> Result<Vec<MixNodeDetails>, NymAPIError> {
+        self.query_nym_api(
            &[routes::API_VERSION, routes::MIXNODES, routes::ACTIVE],
            NO_PARAMS,
        )
        .await
    }

-    async fn get_active_mixnodes_detailed(&self) -> Result<Vec<MixNodeBondAnnotated>, NymAPIError> {
-        self.get_json(
+    pub async fn get_active_mixnodes_detailed(
+        &self,
+    ) -> Result<Vec<MixNodeBondAnnotated>, NymAPIError> {
+        self.query_nym_api(
            &[
                routes::API_VERSION,
                routes::STATUS,
@@ -109,19 +205,19 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn get_rewarded_mixnodes(&self) -> Result<Vec<MixNodeDetails>, NymAPIError> {
-        self.get_json(
+    pub async fn get_rewarded_mixnodes(&self) -> Result<Vec<MixNodeDetails>, NymAPIError> {
+        self.query_nym_api(
            &[routes::API_VERSION, routes::MIXNODES, routes::REWARDED],
            NO_PARAMS,
        )
        .await
    }

-    async fn get_mixnode_report(
+    pub async fn get_mixnode_report(
        &self,
        mix_id: MixId,
    ) -> Result<MixnodeStatusReportResponse, NymAPIError> {
-        self.get_json(
+        self.query_nym_api(
            &[
                routes::API_VERSION,
                routes::STATUS,
@@ -134,11 +230,11 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn get_gateway_report(
+    pub async fn get_gateway_report(
        &self,
        identity: IdentityKeyRef<'_>,
    ) -> Result<GatewayStatusReportResponse, NymAPIError> {
-        self.get_json(
+        self.query_nym_api(
            &[
                routes::API_VERSION,
                routes::STATUS,
@@ -151,11 +247,11 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn get_mixnode_history(
+    pub async fn get_mixnode_history(
        &self,
        mix_id: MixId,
    ) -> Result<MixnodeUptimeHistoryResponse, NymAPIError> {
-        self.get_json(
+        self.query_nym_api(
            &[
                routes::API_VERSION,
                routes::STATUS,
@@ -168,11 +264,11 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn get_gateway_history(
+    pub async fn get_gateway_history(
        &self,
        identity: IdentityKeyRef<'_>,
    ) -> Result<GatewayUptimeHistoryResponse, NymAPIError> {
-        self.get_json(
+        self.query_nym_api(
            &[
                routes::API_VERSION,
                routes::STATUS,
@@ -185,10 +281,10 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn get_rewarded_mixnodes_detailed(
+    pub async fn get_rewarded_mixnodes_detailed(
        &self,
    ) -> Result<Vec<MixNodeBondAnnotated>, NymAPIError> {
-        self.get_json(
+        self.query_nym_api(
            &[
                routes::API_VERSION,
                routes::STATUS,
@@ -201,13 +297,13 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn get_gateway_core_status_count(
+    pub async fn get_gateway_core_status_count(
        &self,
        identity: IdentityKeyRef<'_>,
        since: Option<i64>,
    ) -> Result<GatewayCoreStatusResponse, NymAPIError> {
        if let Some(since) = since {
-            self.get_json(
+            self.query_nym_api(
                &[
                    routes::API_VERSION,
                    routes::STATUS_ROUTES,
@@ -219,7 +315,7 @@ pub trait NymApiClientExt: ApiClient {
            )
            .await
        } else {
-            self.get_json(
+            self.query_nym_api(
                &[
                    routes::API_VERSION,
                    routes::STATUS_ROUTES,
@@ -232,13 +328,13 @@ pub trait NymApiClientExt: ApiClient {
        }
    }

-    async fn get_mixnode_core_status_count(
+    pub async fn get_mixnode_core_status_count(
        &self,
        mix_id: MixId,
        since: Option<i64>,
    ) -> Result<MixnodeCoreStatusResponse, NymAPIError> {
        if let Some(since) = since {
-            self.get_json(
+            self.query_nym_api(
                &[
                    routes::API_VERSION,
                    routes::STATUS_ROUTES,
@@ -250,7 +346,7 @@ pub trait NymApiClientExt: ApiClient {
            )
            .await
        } else {
-            self.get_json(
+            self.query_nym_api(
                &[
                    routes::API_VERSION,
                    routes::STATUS_ROUTES,
@@ -264,11 +360,11 @@ pub trait NymApiClientExt: ApiClient {
        }
    }

-    async fn get_mixnode_status(
+    pub async fn get_mixnode_status(
        &self,
        mix_id: MixId,
    ) -> Result<MixnodeStatusResponse, NymAPIError> {
-        self.get_json(
+        self.query_nym_api(
            &[
                routes::API_VERSION,
                routes::STATUS_ROUTES,
@@ -281,11 +377,11 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn get_mixnode_reward_estimation(
+    pub async fn get_mixnode_reward_estimation(
        &self,
        mix_id: MixId,
    ) -> Result<RewardEstimationResponse, NymAPIError> {
-        self.get_json(
+        self.query_nym_api_fallible(
            &[
                routes::API_VERSION,
                routes::STATUS_ROUTES,
@@ -298,12 +394,12 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn compute_mixnode_reward_estimation(
+    pub async fn compute_mixnode_reward_estimation(
        &self,
        mix_id: MixId,
        request_body: &ComputeRewardEstParam,
    ) -> Result<RewardEstimationResponse, NymAPIError> {
-        self.post_json(
+        self.post_nym_api(
            &[
                routes::API_VERSION,
                routes::STATUS_ROUTES,
@@ -317,11 +413,11 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn get_mixnode_stake_saturation(
+    pub async fn get_mixnode_stake_saturation(
        &self,
        mix_id: MixId,
    ) -> Result<StakeSaturationResponse, NymAPIError> {
-        self.get_json(
+        self.query_nym_api_fallible(
            &[
                routes::API_VERSION,
                routes::STATUS_ROUTES,
@@ -334,11 +430,11 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn get_mixnode_inclusion_probability(
+    pub async fn get_mixnode_inclusion_probability(
        &self,
        mix_id: MixId,
    ) -> Result<InclusionProbabilityResponse, NymAPIError> {
-        self.get_json(
+        self.query_nym_api_fallible(
            &[
                routes::API_VERSION,
                routes::STATUS_ROUTES,
@@ -351,8 +447,11 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn get_mixnode_avg_uptime(&self, mix_id: MixId) -> Result<UptimeResponse, NymAPIError> {
-        self.get_json(
+    pub async fn get_mixnode_avg_uptime(
+        &self,
+        mix_id: MixId,
+    ) -> Result<UptimeResponse, NymAPIError> {
+        self.query_nym_api_fallible(
            &[
                routes::API_VERSION,
                routes::STATUS_ROUTES,
@@ -365,11 +464,11 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn blind_sign(
+    pub async fn blind_sign(
        &self,
        request_body: &BlindSignRequestBody,
    ) -> Result<BlindedSignatureResponse, NymAPIError> {
-        self.post_json(
+        self.post_nym_api(
            &[
                routes::API_VERSION,
                routes::COCONUT_ROUTES,
@@ -382,11 +481,11 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn verify_bandwidth_credential(
+    pub async fn verify_bandwidth_credential(
        &self,
        request_body: &VerifyCredentialBody,
    ) -> Result<VerifyCredentialResponse, NymAPIError> {
-        self.post_json(
+        self.post_nym_api(
            &[
                routes::API_VERSION,
                routes::COCONUT_ROUTES,
@@ -399,20 +498,118 @@ pub trait NymApiClientExt: ApiClient {
        .await
    }

-    async fn get_service_providers(&self) -> Result<ServicesListResponse, NymAPIError> {
+    pub async fn get_service_providers(&self) -> Result<ServicesListResponse, NymAPIError> {
        log::trace!("Getting service providers");
-        self.get_json(&[routes::API_VERSION, routes::SERVICE_PROVIDERS], NO_PARAMS)
+        self.query_nym_api(&[routes::API_VERSION, routes::SERVICE_PROVIDERS], NO_PARAMS)
            .await
    }

-    //async fn get_registered_names(&self) -> Result<Vec<NameEntry>, NymAPIError> {
-    async fn get_registered_names(&self) -> Result<NamesListResponse, NymAPIError> {
+    //pub async fn get_registered_names(&self) -> Result<Vec<NameEntry>, NymAPIError> {
+    pub async fn get_registered_names(&self) -> Result<NamesListResponse, NymAPIError> {
        log::trace!("Getting registered names");
-        self.get_json(&[routes::API_VERSION, routes::REGISTERED_NAMES], NO_PARAMS)
+        self.query_nym_api(&[routes::API_VERSION, routes::REGISTERED_NAMES], NO_PARAMS)
            .await
    }
 }

-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-impl NymApiClientExt for Client {}
+// utility function that should solve the double slash problem in validator API forever.
+fn create_api_url<K: AsRef<str>, V: AsRef<str>>(
+    base: &Url,
+    segments: PathSegments<'_>,
+    params: Params<'_, K, V>,
+) -> Url {
+    let mut url = base.clone();
+    let mut path_segments = url
+        .path_segments_mut()
+        .expect("provided validator url does not have a base!");
+    for segment in segments {
+        let segment = segment.strip_prefix('/').unwrap_or(segment);
+        let segment = segment.strip_suffix('/').unwrap_or(segment);
+
+        path_segments.push(segment);
+    }
+    // I don't understand why compiler couldn't figure out that it's no longer used
+    // and can be dropped
+    drop(path_segments);
+
+    if !params.is_empty() {
+        url.query_pairs_mut().extend_pairs(params);
+    }
+
+    url
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn creating_api_path() {
+        let base_url: Url = "http://foomp.com".parse().unwrap();
+
+        // works with 1 segment
+        assert_eq!(
+            "http://foomp.com/foo",
+            create_api_url(&base_url, &["foo"], NO_PARAMS).as_str()
+        );
+
+        // works with 2 segments
+        assert_eq!(
+            "http://foomp.com/foo/bar",
+            create_api_url(&base_url, &["foo", "bar"], NO_PARAMS).as_str()
+        );
+
+        // works with leading slash
+        assert_eq!(
+            "http://foomp.com/foo",
+            create_api_url(&base_url, &["/foo"], NO_PARAMS).as_str()
+        );
+        assert_eq!(
+            "http://foomp.com/foo/bar",
+            create_api_url(&base_url, &["/foo", "bar"], NO_PARAMS).as_str()
+        );
+        assert_eq!(
+            "http://foomp.com/foo/bar",
+            create_api_url(&base_url, &["foo", "/bar"], NO_PARAMS).as_str()
+        );
+
+        // works with trailing slash
+        assert_eq!(
+            "http://foomp.com/foo",
+            create_api_url(&base_url, &["foo/"], NO_PARAMS).as_str()
+        );
+        assert_eq!(
+            "http://foomp.com/foo/bar",
+            create_api_url(&base_url, &["foo/", "bar"], NO_PARAMS).as_str()
+        );
+        assert_eq!(
+            "http://foomp.com/foo/bar",
+            create_api_url(&base_url, &["foo", "bar/"], NO_PARAMS).as_str()
+        );
+
+        // works with both leading and trailing slash
+        assert_eq!(
+            "http://foomp.com/foo",
+            create_api_url(&base_url, &["/foo/"], NO_PARAMS).as_str()
+        );
+        assert_eq!(
+            "http://foomp.com/foo/bar",
+            create_api_url(&base_url, &["/foo/", "/bar/"], NO_PARAMS).as_str()
+        );
+
+        // adds params
+        assert_eq!(
+            "http://foomp.com/foo/bar?foomp=baz",
+            create_api_url(&base_url, &["foo", "bar"], &[("foomp", "baz")]).as_str()
+        );
+        assert_eq!(
+            "http://foomp.com/foo/bar?arg1=val1&arg2=val2",
+            create_api_url(
+                &base_url,
+                &["/foo/", "/bar/"],
+                &[("arg1", "val1"), ("arg2", "val2")]
+            )
+            .as_str()
+        );
+    }
+}
@@ -6,7 +6,6 @@ use nym_network_defaults::NYM_API_VERSION;
 pub const API_VERSION: &str = NYM_API_VERSION;
 pub const MIXNODES: &str = "mixnodes";
 pub const GATEWAYS: &str = "gateways";
-pub const DESCRIBED: &str = "described";

 pub const DETAILED: &str = "detailed";
 pub const DETAILED_UNFILTERED: &str = "detailed-unfiltered";
@@ -8,7 +8,6 @@ use crate::nyxd::cosmwasm_client::types::{
    Account, CodeDetails, Contract, ContractCodeId, SequenceResponse, SimulateResponse,
 };
 use crate::nyxd::error::NyxdError;
-use crate::nyxd::Query;
 use crate::rpc::TendermintRpcClient;
 use async_trait::async_trait;
 use cosmrs::cosmwasm::{CodeInfoResponse, ContractCodeHistoryEntry};
@@ -36,6 +35,7 @@ use std::convert::TryFrom;
 use std::time::Duration;
 use tendermint_rpc::{
    endpoint::{block::Response as BlockResponse, broadcast, tx::Response as TxResponse},
+    query::Query,
    Order,
 };

@@ -20,12 +20,12 @@ impl CheckResponse for broadcast::tx_commit::Response {
            });
        }

-        if self.tx_result.code.is_err() {
+        if self.deliver_tx.code.is_err() {
            return Err(NyxdError::BroadcastTxErrorDeliverTx {
                hash: self.hash,
                height: Some(self.height),
-                code: self.tx_result.code.value(),
-                raw_log: self.tx_result.log,
+                code: self.deliver_tx.code.value(),
+                raw_log: self.deliver_tx.log,
            });
        }

@@ -11,7 +11,7 @@ pub mod gas_price;

 pub type GasAdjustment = f32;

-pub const DEFAULT_SIMULATED_GAS_MULTIPLIER: GasAdjustment = 1.5;
+pub const DEFAULT_SIMULATED_GAS_MULTIPLIER: GasAdjustment = 1.3;

 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct AutoFeeGrant {
@@ -18,7 +18,7 @@ use crate::{DirectSigningReqwestRpcNyxdClient, QueryReqwestRpcNyxdClient, Reqwes
 use async_trait::async_trait;
 use cosmrs::cosmwasm;
 use cosmrs::tendermint::{abci, evidence::Evidence, Genesis};
-use cosmrs::tx::{Raw, SignDoc};
+use cosmrs::tx::{Msg, Raw, SignDoc};
 use cosmwasm_std::Addr;
 use nym_network_defaults::{ChainDetails, NymNetworkDetails};
 use serde::{de::DeserializeOwned, Serialize};
@@ -34,14 +34,11 @@ pub use crate::nyxd::fee::Fee;
 pub use crate::rpc::TendermintRpcClient;
 pub use coin::Coin;
 pub use cosmrs::bank::MsgSend;
-pub use cosmrs::tendermint::abci::{
-    response::DeliverTx, types::ExecTxResult, Event, EventAttribute,
-};
+pub use cosmrs::tendermint::abci::{response::DeliverTx, Event, EventAttribute};
 pub use cosmrs::tendermint::block::Height;
 pub use cosmrs::tendermint::hash::{self, Algorithm, Hash};
 pub use cosmrs::tendermint::validator::Info as TendermintValidatorInfo;
 pub use cosmrs::tendermint::Time as TendermintTime;
-pub use cosmrs::tx::Msg;
 pub use cosmrs::tx::{self};
 pub use cosmrs::Coin as CosmosCoin;
 pub use cosmrs::Gas;
@@ -50,7 +47,6 @@ pub use cosmwasm_std::Coin as CosmWasmCoin;
 pub use fee::{gas_price::GasPrice, GasAdjustable, GasAdjustment};
 pub use tendermint_rpc::{
    endpoint::{tx::Response as TxResponse, validators::Response as ValidatorResponse},
-    query::Query,
    Paging,
 };
 pub use tendermint_rpc::{Request, Response, SimpleRequest};
@@ -61,6 +57,7 @@ use crate::http_client;
 use crate::{DirectSigningHttpRpcNyxdClient, QueryHttpRpcNyxdClient};
 #[cfg(feature = "http-client")]
 use cosmrs::rpc::{HttpClient, HttpClientUrl};
+use tendermint_rpc::query::Query;

 pub mod coin;
 pub mod contract_traits;
@@ -28,7 +28,7 @@ where
    U: TryInto<HttpClientUrl, Error = Error>,
 {
    HttpRpcClient::builder(url.try_into()?)
-        .compat_mode(CompatMode::V0_37)
+        .compat_mode(CompatMode::V0_34)
        .build()
 }

@@ -36,8 +36,7 @@ pub struct ReqwestRpcClient {
 impl ReqwestRpcClient {
    pub fn new(url: Url) -> Self {
        ReqwestRpcClient {
-            // after updating to nyxd 0.42 and thus updating to cometbft, the compat mode changed
-            compat: CompatMode::V0_37,
+            compat: CompatMode::V0_34,
            inner: reqwest::Client::new(),
            url,
        }
@@ -8,6 +8,6 @@ description = "Crutch library until there is proper SerDe support for coconut st
 bs58 = "0.4.0"
 getset = "0.1.1"
 serde = { workspace = true, features = ["derive"] }
-thiserror = { workspace = true }
+thiserror = "1"

 nym-coconut = {path = "../nymcoconut" }
@@ -11,7 +11,7 @@ bip39 = { workspace = true }
 bs58 = "0.4"
 comfy-table = "6.0.0"
 cfg-if = "1.0.0"
-clap = { workspace = true, features = ["derive"] }
+clap = { version = "4.0", features = ["derive"] }
 cw-utils = { workspace = true }
 handlebars = "3.0.1"
 humantime-serde = "1.0"
@@ -60,7 +60,7 @@ pub async fn init(args: Args, client: SigningClient, network_details: &NymNetwor
    // by default we make ourselves an admin, let me know if you don't like that behaviour
    let opts = Some(InstantiateOptions {
        funds,
-        admin: Some(args.admin.unwrap_or_else(|| client.address())),
+        admin: Some(args.admin.unwrap_or_else(|| client.address().clone())),
    });

    let msg: serde_json::Value =
@@ -4,7 +4,6 @@
 use clap::{Args, Subcommand};

 pub mod update_config;
-pub mod update_cost_params;
 pub mod vesting_update_config;

 #[derive(Debug, Args)]
@@ -21,5 +20,7 @@ pub enum MixnetOperatorsMixnodeSettingsCommands {
    /// Update mixnode configuration for a mixnode bonded with locked tokens
    VestingUpdateConfig(vesting_update_config::Args),
    /// Update mixnode cost parameters
-    UpdateCostParameters(update_cost_params::Args),
+    UpdateCostParameters,
+    /// Update mixnode cost parameters for a mixnode bonded with locked tokens
+    VestingUpdateCostParameters,
 }
@@ -1,48 +0,0 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::context::SigningClient;
-use clap::Parser;
-use cosmwasm_std::Uint128;
-use log::info;
-use nym_mixnet_contract_common::{MixNodeCostParams, Percent};
-use nym_validator_client::nyxd::contract_traits::MixnetSigningClient;
-use nym_validator_client::nyxd::CosmWasmCoin;
-
-#[derive(Debug, Parser)]
-pub struct Args {
-    #[clap(
-        long,
-        help = "input your profit margin as follows; (so it would be 10, rather than 0.1)"
-    )]
-    pub profit_margin_percent: Option<u8>,
-
-    #[clap(
-        long,
-        help = "operating cost in current DENOMINATION (so it would be 'unym', rather than 'nym')"
-    )]
-    pub interval_operating_cost: Option<u128>,
-}
-
-pub async fn update_cost_params(args: Args, client: SigningClient) {
-    let denom = client.current_chain_details().mix_denom.base.as_str();
-
-    let cost_params = MixNodeCostParams {
-        profit_margin_percent: Percent::from_percentage_value(
-            args.profit_margin_percent.unwrap_or(10) as u64,
-        )
-        .unwrap(),
-        interval_operating_cost: CosmWasmCoin {
-            denom: denom.into(),
-            amount: Uint128::new(args.interval_operating_cost.unwrap_or(40_000_000)),
-        },
-    };
-
-    info!("Starting mixnode params updating!");
-    let res = client
-        .update_mixnode_cost_params(cost_params, None)
-        .await
-        .expect("failed to update cost params");
-
-    info!("Cost params result: {:?}", res)
-}
@@ -1,11 +1,11 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::context::QueryClientWithNyxd;
-use crate::utils::{pretty_cosmwasm_coin, show_error};
 use clap::Parser;
 use comfy_table::Table;
-use nym_validator_client::client::NymApiClientExt;
+
+use crate::context::QueryClientWithNyxd;
+use crate::utils::{pretty_cosmwasm_coin, show_error};

 #[derive(Debug, Parser)]
 pub struct Args {
@@ -1,11 +1,11 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::context::QueryClientWithNyxd;
-use crate::utils::{pretty_decimal_with_denom, show_error};
 use clap::Parser;
 use comfy_table::Table;
-use nym_validator_client::client::NymApiClientExt;
+
+use crate::context::QueryClientWithNyxd;
+use crate::utils::{pretty_decimal_with_denom, show_error};

 #[derive(Debug, Parser)]
 pub struct Args {
@@ -1,13 +1,13 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::context::QueryClientWithNyxd;
-use crate::utils::show_error;
 use clap::Parser;
 use comfy_table::Table;
-use nym_validator_client::client::NymApiClientExt;
 use nym_validator_client::nym_api::error::NymAPIError;

+use crate::context::QueryClientWithNyxd;
+use crate::utils::show_error;
+
 #[derive(Debug, Parser)]
 pub struct Args {
    #[clap(value_parser)]
@@ -1,13 +1,13 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::context::QueryClientWithNyxd;
-use crate::utils::show_error;
 use clap::Parser;
 use comfy_table::Table;
-use nym_validator_client::client::NymApiClientExt;
 use nym_validator_client::nym_api::error::NymAPIError;

+use crate::context::QueryClientWithNyxd;
+use crate::utils::show_error;
+
 #[derive(Debug, Parser)]
 pub struct Args {
    #[clap(value_parser)]
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
serinko	0cc8cf0846	update plugins	2023-10-16 14:04:22 +02:00
serinko	87b3b76854	update mdbook admonish	2023-10-16 13:46:16 +02:00