Update socket_state.rs

test fix
try disable disarm
2024-09-16 12:43:40 -04:00 · 2024-09-16 12:29:00 -04:00 · 2024-09-13 12:19:02 -04:00
429 changed files with 4908 additions and 15371 deletions
@@ -5,35 +5,5 @@ on:

 jobs:
  build:
-    runs-on: arc-ubuntu-22.04
-
    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      - name: Set up Build Environment
-        run: sudo apt-get update && sudo apt-get install -y make dpkg-dev
-
-      - name: Build Debian Packages
-        working-directory: ppa/packages
-        run: make
-
-      - name: Find .deb files
-        working-directory: ppa/packages
-        run: |
-          echo "file1=$(ls nym-repo-setup*.deb)" >> $GITHUB_ENV
-          echo "file2=$(ls nym-vpn*.deb)" >> $GITHUB_ENV
-
-      - name: Upload nym-repo-setup
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.file1 }}
-          path: ppa/packages/nym-repo-setup*.deb
-          retention-days: 10
-
-      - name: Upload nym-vpn
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.file2 }}
-          path: ppa/packages/nym-vpn*.deb
-          retention-days: 10
+      run: "echo hello"
@@ -13,7 +13,6 @@ on:
      - 'mixnode/**'
      - 'sdk/rust/nym-sdk/**'
      - 'service-providers/**'
-      - '.github/workflows/ci-binary-config-checker.yml'
  pull_request:
    paths:
      - 'clients/**'
@@ -23,7 +22,6 @@ on:
      - 'mixnode/**'
      - 'sdk/rust/nym-sdk/**'
      - 'service-providers/**'
-      - '.github/workflows/ci-binary-config-checker.yml'

 env:
  NETWORK: mainnet
@@ -33,7 +31,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        platform: [arc-ubuntu-20.04]
+        platform: [custom-linux]

    runs-on: ${{ matrix.platform }}
    steps:
@@ -5,7 +5,6 @@ on:
    paths:
      - "ts-packages/**"
      - "sdk/typescript/**"
-      - ".github/workflows/ci-build-ts.yml"

 jobs:
  build:
@@ -26,20 +26,18 @@ on:
      - "nym-api/**"
      - "nym-node/**"
      - "nym-outfox/**"
-      - 'nym-data-observatory/**'
      - "nym-validator-rewarder/**"
      - "sdk/rust/nym-sdk/**"
      - "service-providers/**"
      - "tools/**"
      - "nymvisor/**"
-      - ".github/workflows/ci-build-upload-binaries.yml"

 jobs:
  publish-nym:
    strategy:
      fail-fast: false
      matrix:
-        platform: [ arc-ubuntu-20.04 ]
+        platform: [ ubuntu-20.04 ]

    runs-on: ${{ matrix.platform }}
    env:
@@ -57,13 +55,17 @@ jobs:
          echo $OUTPUT_DIR

      - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get -y install libudev-dev
+        run: sudo apt update && sudo apt install libudev-dev

      - name: Sets env vars for tokio if set in manual dispatch inputs
        run: |
          echo 'RUSTFLAGS="--cfg tokio_unstable"' >> $GITHUB_ENV
        if: github.event_name == 'workflow_dispatch' && inputs.add_tokio_unstable == true

+      - name: Set CARGO_FEATURES
+        run: |
+          echo 'CARGO_FEATURES=--features wireguard' >> $GITHUB_ENV
+
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
@@ -97,7 +99,6 @@ jobs:
            target/release/nym-socks5-client
            target/release/nym-api
            target/release/nym-network-requester
-            target/release/nym-data-observatory
            target/release/nym-cli
            target/release/nymvisor
            target/release/nym-node
@@ -115,7 +116,6 @@ jobs:
          cp target/release/nym-socks5-client $OUTPUT_DIR
          cp target/release/nym-api $OUTPUT_DIR
          cp target/release/nym-network-requester $OUTPUT_DIR
-          cp target/release/nym-data-observatory $OUTPUT_DIR
          cp target/release/nymvisor $OUTPUT_DIR
          cp target/release/nym-node $OUTPUT_DIR
          cp target/release/nym-cli $OUTPUT_DIR
@@ -1,6 +1,23 @@
 name: ci-build

 on:
+  push:
+    paths:
+      - 'clients/**'
+      - 'common/**'
+      - 'explorer-api/**'
+      - 'gateway/**'
+      - 'integrations/**'
+      - 'mixnode/**'
+      - 'sdk/lib/socks5-listener/**'
+      - 'sdk/rust/nym-sdk/**'
+      - 'service-providers/**'
+      - 'nym-api/**'
+      - 'nym-outfox/**'
+      - 'tools/nym-cli/**'
+      - 'tools/nym-nr-query/**'
+      - 'tools/ts-rs-cli/**'
+      - 'Cargo.toml'
  pull_request:
    paths:
      - 'clients/**'
@@ -9,20 +26,15 @@ on:
      - 'gateway/**'
      - 'integrations/**'
      - 'mixnode/**'
-      - 'sdk/rust/**'
-      - 'sdk/lib/**'
+      - 'sdk/lib/socks5-listener/**'
+      - 'sdk/rust/nym-sdk/**'
      - 'service-providers/**'
-      - 'nym-network-monitor/**'
      - 'nym-api/**'
-      - 'nym-node/**'
      - 'nym-outfox/**'
-      - 'nym-data-observatory/**'
-      - 'nym-validator-rewarder/**'
-      - 'tools/**'
-      - 'wasm/**'
+      - 'tools/nym-cli/**'
+      - 'tools/nym-nr-query/**'
+      - 'tools/ts-rs-cli/**'
      - 'Cargo.toml'
-      - 'Cargo.lock'
-      - '.github/workflows/ci-build.yml'
  workflow_dispatch:

 jobs:
@@ -30,7 +42,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [arc-ubuntu-20.04, custom-runner-mac-m1]
+        os: [custom-linux, custom-runner-mac-m1]
    runs-on: ${{ matrix.os }}
    env:
      CARGO_TERM_COLOR: always
@@ -38,7 +50,7 @@ jobs:
      - name: Install Dependencies (Linux)
        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools protobuf-compiler
        continue-on-error: true
-        if: contains(matrix.os, 'ubuntu')
+        if: matrix.os == 'custom-linux'

      - name: Check out repository code
        uses: actions/checkout@v4
@@ -61,6 +73,8 @@ jobs:
        uses: actions-rs/cargo@v1
        with:
          command: build
+          # Enable wireguard by default on linux only
+          args: --workspace --features wireguard

      # while disabled by default, this build ensures nothing is broken within
      # `axum` feature
@@ -71,28 +85,36 @@ jobs:
          args: --features axum

      - name: Build all examples
-        if: contains(matrix.os, 'ubuntu')
+        if: matrix.os == 'custom-linux'
        uses: actions-rs/cargo@v1
        with:
          command: build
-          args: --workspace --examples
+          args: --workspace --examples --features wireguard

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

      - name: Run expensive tests
-        if: (github.ref == 'refs/heads/develop' || github.event.pull_request.base.ref == 'develop' || github.event.pull_request.base.ref == 'master') && contains(matrix.os, 'ubuntu')
+        if: (github.ref == 'refs/heads/develop' || github.event.pull_request.base.ref == 'develop' || github.event.pull_request.base.ref == 'master') && matrix.os == 'custom-linux'
        uses: actions-rs/cargo@v1
        with:
          command: test
-          args: --workspace -- --ignored
+          args: --workspace --features wireguard -- --ignored
+
+      - name: Annotate with clippy checks
+        if: matrix.os == 'custom-linux'
+        uses: actions-rs/clippy-check@v1
+        continue-on-error: true
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --workspace --features wireguard

      - name: Clippy
        uses: actions-rs/cargo@v1
        with:
          command: clippy
-          args: --workspace --all-targets --features axum -- -D warnings
+          args: --workspace --all-targets --features wireguard,axum -- -D warnings
@@ -2,14 +2,10 @@ name: ci-cargo-deny
 on:
  workflow_dispatch:
  pull_request:
-    paths:
-      - 'Cargo.toml'
-      - 'Cargo.lock'
-      - '.github/workflows/ci-cargo-deny.yml'

 jobs:
  cargo-deny:
-    runs-on: arc-ubuntu-22.04-dind
+    runs-on: ubuntu-22.04
    strategy:
      matrix:
        checks:
@@ -18,8 +14,8 @@ jobs:

    steps:
    - uses: actions/checkout@v4
-    - uses: EmbarkStudios/cargo-deny-action@v2
+    - uses: EmbarkStudios/cargo-deny-action@v1
      with:
        log-level: warn
        command: check ${{ matrix.checks }}
-        arguments: --all-features
+        argument: --all-features
@@ -6,12 +6,11 @@ on:
    paths:
      - 'contracts/**'
      - 'common/**'
-      - '.github/workflows/ci-contracts-schema.yml'

 jobs:
  check-schema:
    name: Generate and check schema
-    runs-on: arc-ubuntu-20.04
+    runs-on: custom-linux
    env:
      CARGO_TERM_COLOR: always
    steps:
@@ -6,7 +6,6 @@ on:
    paths:
      - 'common/**'
      - 'contracts/**'
-      - '.github/workflows/ci-contracts-upload-binaries.yml'

 env:
  NETWORK: mainnet
@@ -16,7 +15,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        platform: arc-ubuntu-20.04
+        platform: [ ubuntu-20.04 ]

    runs-on: ${{ matrix.platform }}
    env:
@@ -9,11 +9,10 @@ on:
    paths:
      - 'contracts/**'
      - 'common/**'
-      - '.github/workflows/ci-contracts.yml'

 jobs:
  matrix_prep:
-    runs-on: arc-ubuntu-20.04
+    runs-on: ubuntu-20.04
    outputs:
      matrix: ${{ steps.set-matrix.outputs.matrix }}
    steps:
@@ -6,7 +6,6 @@ on:
    branches-ignore: master
    paths:
      - 'documentation/docs/**'
-      - '.github/workflows/ci-docs.yml'

 jobs:
  build:
@@ -10,7 +10,6 @@ on:
      - "nym-wallet/src/**"
      - "nym-wallet/package.json"
      - "explorer/**"
-      - ".github/workflows/ci-lint-typescript.yml"

 jobs:
  build:
@@ -5,7 +5,6 @@ on:
  push:
    paths:
      - 'explorer/**'
-      - '.github/workflows/ci-nym-network-explorer.yml'

 defaults:
  run:
@@ -1,17 +1,22 @@
 name: ci-nym-wallet-rust

 on:
+  push:
+    paths:
+      - 'nym-wallet/**'
+      - 'common/**'
+      - 'contracts/vesting/**'
+      - 'nym-api/nym-api-requests/**'
  pull_request:
    paths:
      - 'nym-wallet/**'
      - 'common/**'
      - 'contracts/vesting/**'
      - 'nym-api/nym-api-requests/**'
-      - '.github/workflows/ci-nym-wallet-rust.yml'

 jobs:
  build:
-    runs-on: arc-ubuntu-20.04
+    runs-on: [ self-hosted, custom-linux ]
    env:
      CARGO_TERM_COLOR: always
    steps:
@@ -4,7 +4,6 @@ on:
  pull_request:
    paths:
      - 'nym-wallet/**'
-      - '.github/workflows/ci-nym-wallet-storybook.yml'

 jobs:
  build:
@@ -5,7 +5,6 @@ on:
    paths:
      - "sdk/typescript/**"
      - "wasm/**"
-      - '.github/workflows/ci-sdk-docs-typescript.yml'

 jobs:
  build:
@@ -6,11 +6,10 @@ on:
      - 'wasm/**'
      - 'clients/client-core/**'
      - 'common/**'
-      - '.github/workflows/ci-sdk-wasm.yml'

 jobs:
  wasm:
-    runs-on: arc-ubuntu-20.04
+    runs-on: [custom-linux]
    env:
      CARGO_TERM_COLOR: always
    steps:
@@ -51,6 +51,10 @@ jobs:
          echo 'RUSTFLAGS="--cfg tokio_unstable"' >> $GITHUB_ENV
        if: github.event_name == 'workflow_dispatch' && inputs.add_tokio_unstable == true

+      - name: Set CARGO_FEATURES
+        run: |
+          echo 'CARGO_FEATURES=--features wireguard' >> $GITHUB_ENV
+
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
@@ -1,4 +1,4 @@
-name: publish-nym-wallet-win11
+name: publish-nym-wallet-win10
 on:
  workflow_dispatch:
  release:
@@ -14,7 +14,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        platform: [custom-windows-11]
+        platform: [windows10]
    runs-on: ${{ matrix.platform }}

    outputs:
@@ -62,9 +62,6 @@ jobs:
          fileName: '.env'
          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}

-      - name: Install Yarn
-        run: npm install -g yarn
-
      - name: Install project dependencies
        shell: bash
        run: cd .. && yarn --network-timeout 100000
@@ -1,55 +0,0 @@
-name: Build and upload Network monitor container to harbor.nymte.ch
-on:
-  workflow_dispatch:
-
-env:
-  WORKING_DIRECTORY: "."
-  CONTAINER_NAME: "network-monitor"
-
-jobs:
-  build-container:
-    runs-on: arc-ubuntu-22.04-dind
-    steps:
-      - name: Login to Harbor
-        uses: docker/login-action@v3
-        with:
-          registry: harbor.nymte.ch
-          username: ${{ secrets.HARBOR_ROBOT_USERNAME }}
-          password: ${{ secrets.HARBOR_ROBOT_SECRET }}
-
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Configure git identity
-        run: |
-          git config --global user.email "lawrence@nymtech.net"
-          git config --global user.name "Lawrence Stalder"
-
-      - name: Get version from package.json
-        uses: sergeysova/jq-action@v2
-        id: get_version
-        with:
-          cmd: jq -r '.version' ${{ env.WORKING_DIRECTORY }}/package.json
-
-      - name: Check if tag exists
-        run: |
-          if git rev-parse ${{ steps.get_version.outputs.value }} >/dev/null 2>&1; then
-            echo "Tag ${{ steps.get_version.outputs.value }} already exists"
-          fi
-
-      - name: Remove existing tag if exists
-        run: |
-          if git rev-parse ${{ steps.get_version.outputs.value }} >/dev/null 2>&1; then
-            git push --delete origin ${{ steps.get_version.outputs.value }}
-            git tag -d ${{ steps.get_version.outputs.value }}
-          fi
-
-      - name: Create tag
-        run: |
-          git tag -a ${{ steps.get_version.outputs.value }} -m "Version ${{ steps.get_version.outputs.value }}"
-          git push origin ${{ steps.get_version.outputs.value }}
-
-      - name: BuildAndPushImageOnHarbor
-        run: |
-          docker build -f nym-network-monitor.dockerfile ${{ env.WORKING_DIRECTORY }} -t harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }}:${{ steps.get_version.outputs.value }} -t harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }}:latest
-          docker push harbor.nymte.ch/nym/${{ env.CONTAINER_NAME }} --all-tags
@@ -4,136 +4,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://

 ## [Unreleased]

-## [2024.11-wedel] (2024-09-23)
-
- Backport #4894 to fix ci ([#4899])
- Bugfix/ticketbook false double spending ([#4892])
- fix: allow updating globally stored signatures ([#4891])
- [DOCs/operators]: Document changelog for patch/2024.10-caramello ([#4886])
- [DOCs/operators]: Post release docs updates ([#4874])
- Bump defguard to github latest version ([#4872])
- chore: removed completed queued mixnet migration ([#4865])
- Disable push trigger and add missing paths in ci-build ([#4864])
- Fix linux conditional in ci-build.yml ([#4863])
- Remove golang workaround in ci-sdk-wasm ([#4858])
- Revert runner for ci-docs ([#4855])
- Move credential verification into common crate ([#4853])
- Fix test failure in ipr request size ([#4844])
- Start switching over jobs to arc-ubuntu-20.04 ([#4843])
- Use ecash credential type for bandwidth value ([#4840])
- Create nym-repo-setup debian package and nym-vpn meta package ([#4837])
- Remove serde_crate named import ([#4832])
- Run cargo autoinherit following last weeks dependabot updates ([#4831])
- revamped ticketbook serialisation and exposed additional cli methods ([#4827])
- Expose wireguard details on self described endpoint ([#4825])
- Remove unused wireguard flag from SDK ([#4823])
- Add `axum` server to `nym-api` ([#4803])
- Run cargo-autoinherit for a few new crates ([#4801])
- Update dependabot ([#4796])
- Fix clippy for unwrap_or_default ([#4783])
- Enable dependabot version upgrades for root rust workspace ([#4778])
- Persist used wireguard private IPs ([#4771])
- Avoid race on ip and registration structures ([#4766])
- docs/hotfix ([#4765])
- chore: remove repetitive words ([#4763])
- Make gateway latency check generic ([#4759])
- Remove duplicate stat count for retransmissions ([#4756])
- Update peer refresh value ([#4754])
- Remove deprecated mark_as_success and use new disarm ([#4751])
- Add get_mixnodes_described to validator_client ([#4725])
- New Network Monitor ([#4610])
-
-[#4899]: https://github.com/nymtech/nym/pull/4899
-[#4892]: https://github.com/nymtech/nym/pull/4892
-[#4891]: https://github.com/nymtech/nym/pull/4891
-[#4886]: https://github.com/nymtech/nym/pull/4886
-[#4874]: https://github.com/nymtech/nym/pull/4874
-[#4872]: https://github.com/nymtech/nym/pull/4872
-[#4865]: https://github.com/nymtech/nym/pull/4865
-[#4864]: https://github.com/nymtech/nym/pull/4864
-[#4863]: https://github.com/nymtech/nym/pull/4863
-[#4858]: https://github.com/nymtech/nym/pull/4858
-[#4855]: https://github.com/nymtech/nym/pull/4855
-[#4853]: https://github.com/nymtech/nym/pull/4853
-[#4844]: https://github.com/nymtech/nym/pull/4844
-[#4843]: https://github.com/nymtech/nym/pull/4843
-[#4840]: https://github.com/nymtech/nym/pull/4840
-[#4837]: https://github.com/nymtech/nym/pull/4837
-[#4832]: https://github.com/nymtech/nym/pull/4832
-[#4831]: https://github.com/nymtech/nym/pull/4831
-[#4827]: https://github.com/nymtech/nym/pull/4827
-[#4825]: https://github.com/nymtech/nym/pull/4825
-[#4823]: https://github.com/nymtech/nym/pull/4823
-[#4803]: https://github.com/nymtech/nym/pull/4803
-[#4801]: https://github.com/nymtech/nym/pull/4801
-[#4796]: https://github.com/nymtech/nym/pull/4796
-[#4783]: https://github.com/nymtech/nym/pull/4783
-[#4778]: https://github.com/nymtech/nym/pull/4778
-[#4771]: https://github.com/nymtech/nym/pull/4771
-[#4766]: https://github.com/nymtech/nym/pull/4766
-[#4765]: https://github.com/nymtech/nym/pull/4765
-[#4763]: https://github.com/nymtech/nym/pull/4763
-[#4759]: https://github.com/nymtech/nym/pull/4759
-[#4756]: https://github.com/nymtech/nym/pull/4756
-[#4754]: https://github.com/nymtech/nym/pull/4754
-[#4751]: https://github.com/nymtech/nym/pull/4751
-[#4725]: https://github.com/nymtech/nym/pull/4725
-[#4610]: https://github.com/nymtech/nym/pull/4610
-
-## [2024.10-caramello] (2024-09-10)
-
- Backport 4844 and 4845 ([#4857])
- Bugfix/client registration vol2 ([#4856])
- Remove wireguard feature flag and pass runtime enabled flag ([#4839])
- Eliminate cancel unsafe sig awaiting ([#4834])
- added explicit updateable admin to the mixnet contract ([#4822])
- using legacy signing payload in CLI and verifying both variants in contract ([#4821])
- adding ecash contract address ([#4819])
- Check profit margin of node before defaulting to hardcoded value  ([#4802])
- Sync last_seen_bandwidth immediately ([#4774])
- Feature/additional ecash nym cli utils ([#4773])
- Better storage error logging ([#4772])
- bugfix: make sure DKG parses data out of events if logs are empty ([#4764])
- Fix clippy on rustc beta toolchain ([#4746])
- Fix clippy for beta toolchain ([#4742])
- Disable testnet-manager on non-unix ([#4741])
- Don't set NYM_VPN_API to default ([#4740])
- Update publish-nym-binaries.yml ([#4739])
- Update ci-build-upload-binaries.yml ([#4738])
- Add NYM_VPN_API to network config ([#4736])
- Re-export RecipientFormattingError in nym sdk ([#4735])
- Persist wireguard peers ([#4732])
- Fix tokio error in 1.39 ([#4730])
- Feature/vesting purge plus ranged cost params ([#4716])
- Fix (some) feature unification build failures ([#4681])
- Feature Compact Ecash : The One PR ([#4623])
-
-[#4857]: https://github.com/nymtech/nym/pull/4857
-[#4856]: https://github.com/nymtech/nym/pull/4856
-[#4839]: https://github.com/nymtech/nym/pull/4839
-[#4834]: https://github.com/nymtech/nym/pull/4834
-[#4822]: https://github.com/nymtech/nym/pull/4822
-[#4821]: https://github.com/nymtech/nym/pull/4821
-[#4819]: https://github.com/nymtech/nym/pull/4819
-[#4802]: https://github.com/nymtech/nym/pull/4802
-[#4774]: https://github.com/nymtech/nym/pull/4774
-[#4773]: https://github.com/nymtech/nym/pull/4773
-[#4772]: https://github.com/nymtech/nym/pull/4772
-[#4764]: https://github.com/nymtech/nym/pull/4764
-[#4746]: https://github.com/nymtech/nym/pull/4746
-[#4742]: https://github.com/nymtech/nym/pull/4742
-[#4741]: https://github.com/nymtech/nym/pull/4741
-[#4740]: https://github.com/nymtech/nym/pull/4740
-[#4739]: https://github.com/nymtech/nym/pull/4739
-[#4738]: https://github.com/nymtech/nym/pull/4738
-[#4736]: https://github.com/nymtech/nym/pull/4736
-[#4735]: https://github.com/nymtech/nym/pull/4735
-[#4732]: https://github.com/nymtech/nym/pull/4732
-[#4730]: https://github.com/nymtech/nym/pull/4730
-[#4716]: https://github.com/nymtech/nym/pull/4716
-[#4681]: https://github.com/nymtech/nym/pull/4681
-[#4623]: https://github.com/nymtech/nym/pull/4623
-
 ## [2024.9-topdeck] (2024-07-26)

 - chore: fix 1.80 lint issues ([#4731])
@@ -45,7 +45,6 @@ members = [
    "common/credentials",
    "common/credential-utils",
    "common/credentials-interface",
-    "common/credential-verification",
    "common/crypto",
    "common/dkg",
    "common/ecash-double-spending",
@@ -81,7 +80,6 @@ members = [
    "common/nyxd-scraper",
    "common/pemstore",
    "common/serde-helpers",
-    "common/service-provider-requests-common",
    "common/socks5-client-core",
    "common/socks5/proxy-helpers",
    "common/socks5/requests",
@@ -103,9 +101,6 @@ members = [
    "mixnode",
    "sdk/lib/socks5-listener",
    "sdk/rust/nym-sdk",
-    "sdk/ffi/shared",
-    "sdk/ffi/go",
-    "sdk/ffi/cpp",
    "service-providers/authenticator",
    "service-providers/common",
    "service-providers/ip-packet-router",
@@ -114,17 +109,13 @@ members = [
    "nym-api",
    "nym-browser-extension/storage",
    "nym-api/nym-api-requests",
-    "nym-data-observatory",
    "nym-node",
    "nym-node/nym-node-http-api",
    "nym-node/nym-node-requests",
    "nym-outfox",
    "nym-validator-rewarder",
-    "tools/echo-server",
    "tools/internal/ssl-inject",
    # "tools/internal/sdk-version-bump",
-    "tools/internal/testnet-manager",
-    "tools/internal/testnet-manager/dkg-bypass-contract",
    "tools/nym-cli",
    "tools/nym-id-cli",
    "tools/nym-nr-query",
@@ -137,23 +128,19 @@ members = [
    "wasm/zknym-lib",
    "tools/internal/testnet-manager",
    "tools/internal/testnet-manager/dkg-bypass-contract",
-    "tools/echo-server",
 ]

 default-members = [
    "clients/native",
    "clients/socks5",
-    "explorer-api",
    "gateway",
+    "service-providers/network-requester",
    "mixnode",
    "nym-api",
-    "nym-data-observatory",
-    "nym-node",
-    "nym-validator-rewarder",
-    "service-providers/authenticator",
-    "service-providers/ip-packet-router",
-    "service-providers/network-requester",
    "tools/nymvisor",
+    "explorer-api",
+    "nym-validator-rewarder",
+    "nym-node",
 ]

 exclude = [
@@ -162,6 +149,7 @@ exclude = [
    "nym-wallet",
    "nym-vpn/ui/src-tauri",
    "cpu-cycles",
+    "sdk/ffi/cpp",
 ]

 [workspace.package]
@@ -178,11 +166,9 @@ readme = "README.md"
 addr = "0.15.6"
 aes = "0.8.1"
 aes-gcm = "0.10.1"
-aes-gcm-siv = "0.11.1"
-aead = "0.5.2"
-anyhow = "1.0.89"
+anyhow = "1.0.71"
 argon2 = "0.5.0"
-async-trait = "0.1.82"
+async-trait = "0.1.81"
 axum = "0.7.5"
 axum-extra = "0.9.3"
 base64 = "0.22.1"
@@ -205,26 +191,25 @@ chacha20 = "0.9.0"
 chacha20poly1305 = "0.10.1"
 chrono = "0.4.31"
 cipher = "0.4.3"
-clap = "4.5.17"
+clap = "4.5.16"
 clap_complete = "4.5"
 clap_complete_fig = "4.5"
 colored = "2.0"
-comfy-table = "7.1.1"
+comfy-table = "6.0.0"
 console = "0.15.8"
 console-subscriber = "0.1.1"
 console_error_panic_hook = "0.1"
 const-str = "0.5.6"
-const_format = "0.2.33"
+const_format = "0.2.32"
 criterion = "0.4"
 csv = "1.3.0"
 ctr = "0.9.1"
 cupid = "0.6.1"
 curve25519-dalek = "4.1"
 dashmap = "5.5.3"
-# We want https://github.com/DefGuard/wireguard-rs/pull/64 , but there's no crates.io release being pushed out anymore
-defguard_wireguard_rs = { git = "https://github.com/DefGuard/wireguard-rs.git", rev = "v0.4.7" }
+defguard_wireguard_rs = "0.4.2"
 digest = "0.10.7"
-dirs = "5.0"
+dirs = "4.0"
 doc-comment = "0.3"
 dotenvy = "0.15.6"
 ecdsa = "0.16"
@@ -236,7 +221,7 @@ flate2 = "1.0.33"
 futures = "0.3.28"
 generic-array = "0.14.7"
 getrandom = "0.2.10"
-getset = "0.1.3"
+getset = "0.1.1"
 handlebars = "3.5.5"
 headers = "0.4.0"
 hex = "0.4.3"
@@ -244,12 +229,10 @@ hex-literal = "0.3.3"
 hkdf = "0.12.3"
 hmac = "0.12.1"
 http = "1"
-http-body-util = "0.1"
 httpcodec = "0.2.3"
 humantime = "2.1.0"
 humantime-serde = "1.1.1"
-hyper = "1.4.1"
-hyper-util = "0.1"
+hyper = "1.3.1"
 indicatif = "0.17.8"
 inquire = "0.6.2"
 ip_network = "0.4.1"
@@ -269,7 +252,7 @@ okapi = "0.7.0"
 once_cell = "1.7.2"
 opentelemetry = "0.19.0"
 opentelemetry-jaeger = "0.18.0"
-parking_lot = "0.12.3"
+parking_lot = "0.12.1"
 pem = "0.8"
 petgraph = "0.6.5"
 pin-project = "1.0"
@@ -277,7 +260,9 @@ pretty_env_logger = "0.4.0"
 publicsuffix = "2.2.3"
 quote = "1"
 rand = "0.8.5"
+rand-07 = "0.7.3"
 rand_chacha = "0.3"
+rand_chacha_02 = "0.2"
 rand_core = "0.6.3"
 rand_distr = "0.4"
 rand_pcg = "0.3.1"
@@ -288,13 +273,13 @@ reqwest = { version = "0.12.4", default-features = false }
 rocket = "0.5.0"
 rocket_cors = "0.6.0"
 rocket_okapi = "0.8.0"
-safer-ffi = "0.1.13"
-schemars = "0.8.21"
+safer-ffi = "0.1.12"
+schemars = "0.8.1"
 semver = "1.0.23"
-serde = "1.0.210"
+serde = "1.0.209"
 serde_bytes = "0.11.15"
 serde_derive = "1.0"
-serde_json = "1.0.128"
+serde_json = "1.0.127"
 serde_repr = "0.1"
 serde_with = "3.9.0"
 serde_yaml = "0.9.25"
@@ -302,21 +287,20 @@ sha2 = "0.10.8"
 si-scale = "0.2.3"
 sphinx-packet = "0.1.1"
 sqlx = "0.6.3"
-strum = "0.26"
+strum = "0.25"
 subtle-encoding = "0.5"
 syn = "1"
-sysinfo = "0.30.13"
+sysinfo = "0.30.12"
 tap = "1.0.1"
-tar = "0.4.41"
+tar = "0.4.40"
 tempfile = "3.5.0"
 thiserror = "1.0.63"
 time = "0.3.30"
 tokio = "1.39"
-tokio-stream = "0.1.16"
+tokio-stream = "0.1.15"
 tokio-test = "0.4.4"
-tokio-tun = "0.11.5"
 tokio-tungstenite = { version = "0.20.1" }
-tokio-util = "0.7.12"
+tokio-util = "0.7.11"
 toml = "0.8.14"
 tower = "0.4.13"
 tower-http = "0.5.2"
@@ -328,12 +312,13 @@ ts-rs = "7.0.0"
 tungstenite = { version = "0.20.1", default-features = false }
 url = "2.5"
 utoipa = "4.2"
+utoipa-rapidoc = "4.0"
 utoipa-swagger-ui = "7.1"
 utoipauto = "0.1"
 uuid = "*"
 vergen = { version = "=8.3.1", default-features = false }
 walkdir = "2"
-wasm-bindgen-test = "0.3.43"
+wasm-bindgen-test = "0.3.36"
 x25519-dalek = "2.0.0"
 zeroize = "1.6.0"

@@ -348,6 +333,7 @@ group = { version = "0.13.0", default-features = false }
 ff = { version = "0.13.0", default-features = false }

 # cosmwasm-related
+cosmwasm-derive = "=1.4.3"
 cosmwasm-schema = "=1.4.3"
 cosmwasm-std = "=1.4.3"
 # use 0.5.0 as that's the version used by cosmwasm-std 1.4.3
@@ -365,10 +351,13 @@ cw-controllers = { version = "=1.1.0" }
 # cosmrs-related
 bip32 = { version = "0.5.2", default-features = false }

-cosmrs = { version = "0.21.1" }
-tendermint = "0.40.0"
-tendermint-rpc = "0.40.0"
-prost = { version = "0.13", default-features = false }
+# temporarily using a fork again (yay.) because we need staking and slashing support (which are already on main but not released)
+# plus response message parsing (which is, as of the time of writing this message, waiting to get merged)
+#cosmrs = { path = "../cosmos-rust-fork/cosmos-rust/cosmrs" }
+cosmrs = { git = "https://github.com/cosmos/cosmos-rust", rev = "4b1332e6d8258ac845cef71589c8d362a669675a" } # unfortuntely we need a fork by yours truly to get the staking support
+tendermint = "0.37.0"                                                                                        # same version as used by cosmrs
+tendermint-rpc = "0.37.0"                                                                                    # same version as used by cosmrs
+prost = { version = "0.12", default-features = false }

 # wasm-related dependencies
 gloo-utils = "0.2.0"
@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.41"
+version = "1.1.39"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"
@@ -1,16 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::commands::CliNativeClient;
-use crate::error::ClientError;
-use nym_client_core::cli_helpers::client_import_coin_index_signatures::{
-    import_coin_index_signatures, CommonClientImportCoinIndexSignaturesArgs,
-};
-
-pub(crate) async fn execute(
-    args: CommonClientImportCoinIndexSignaturesArgs,
-) -> Result<(), ClientError> {
-    import_coin_index_signatures::<CliNativeClient, _>(args).await?;
-    println!("successfully imported coin index signatures!");
-    Ok(())
-}
@@ -1,16 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::commands::CliNativeClient;
-use crate::error::ClientError;
-use nym_client_core::cli_helpers::client_import_expiration_date_signatures::{
-    import_expiration_date_signatures, CommonClientImportExpirationDateSignaturesArgs,
-};
-
-pub(crate) async fn execute(
-    args: CommonClientImportExpirationDateSignaturesArgs,
-) -> Result<(), ClientError> {
-    import_expiration_date_signatures::<CliNativeClient, _>(args).await?;
-    println!("successfully imported expiration date signatures!");
-    Ok(())
-}
@@ -1,16 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::commands::CliNativeClient;
-use crate::error::ClientError;
-use nym_client_core::cli_helpers::client_import_master_verification_key::{
-    import_master_verification_key, CommonClientImportMasterVerificationKeyArgs,
-};
-
-pub(crate) async fn execute(
-    args: CommonClientImportMasterVerificationKeyArgs,
-) -> Result<(), ClientError> {
-    import_master_verification_key::<CliNativeClient, _>(args).await?;
-    println!("successfully imported master verification key!");
-    Ok(())
-}
@@ -1,59 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use clap::{Args, Subcommand};
-use nym_client_core::cli_helpers::client_import_coin_index_signatures::CommonClientImportCoinIndexSignaturesArgs;
-use nym_client_core::cli_helpers::client_import_credential::CommonClientImportTicketBookArgs;
-use nym_client_core::cli_helpers::client_import_expiration_date_signatures::CommonClientImportExpirationDateSignaturesArgs;
-use nym_client_core::cli_helpers::client_import_master_verification_key::CommonClientImportMasterVerificationKeyArgs;
-use std::error::Error;
-
-pub(crate) mod import_coin_index_signatures;
-pub(crate) mod import_credential;
-pub(crate) mod import_expiration_date_signatures;
-pub(crate) mod import_master_verification_key;
-pub(crate) mod show_ticketbooks;
-
-#[derive(Args)]
-#[clap(args_conflicts_with_subcommands = true, subcommand_required = true)]
-pub struct Ecash {
-    #[clap(subcommand)]
-    pub command: EcashCommands,
-}
-
-impl Ecash {
-    pub async fn execute(self) -> Result<(), Box<dyn Error + Send + Sync>> {
-        match self.command {
-            EcashCommands::ShowTicketBooks(args) => show_ticketbooks::execute(args).await?,
-            EcashCommands::ImportTicketBook(args) => import_credential::execute(args).await?,
-            EcashCommands::ImportCoinIndexSignatures(args) => {
-                import_coin_index_signatures::execute(args).await?
-            }
-            EcashCommands::ImportExpirationDateSignatures(args) => {
-                import_expiration_date_signatures::execute(args).await?
-            }
-            EcashCommands::ImportMasterVerificationKey(args) => {
-                import_master_verification_key::execute(args).await?
-            }
-        }
-        Ok(())
-    }
-}
-
-#[derive(Subcommand)]
-pub enum EcashCommands {
-    /// Display information associated with the imported ticketbooks,
-    ShowTicketBooks(show_ticketbooks::Args),
-
-    /// Import a pre-generated ticketbook
-    ImportTicketBook(CommonClientImportTicketBookArgs),
-
-    /// Import coin index signatures needed for ticketbooks
-    ImportCoinIndexSignatures(CommonClientImportCoinIndexSignaturesArgs),
-
-    /// Import expiration date signatures needed for ticketbooks
-    ImportExpirationDateSignatures(CommonClientImportExpirationDateSignaturesArgs),
-
-    /// Import master verification key needed for ticketbooks
-    ImportMasterVerificationKey(CommonClientImportMasterVerificationKeyArgs),
-}
@@ -4,10 +4,10 @@
 use crate::commands::CliNativeClient;
 use crate::error::ClientError;
 use nym_client_core::cli_helpers::client_import_credential::{
-    import_credential, CommonClientImportTicketBookArgs,
+    import_credential, CommonClientImportCredentialArgs,
 };

-pub(crate) async fn execute(args: CommonClientImportTicketBookArgs) -> Result<(), ClientError> {
+pub(crate) async fn execute(args: CommonClientImportCredentialArgs) -> Result<(), ClientError> {
    import_credential::<CliNativeClient, _>(args).await?;
    println!("successfully imported credential!");
    Ok(())
@@ -6,13 +6,13 @@ use crate::client::config::old_config_v1_1_20::ConfigV1_1_20;
 use crate::client::config::old_config_v1_1_20_2::ConfigV1_1_20_2;
 use crate::client::config::old_config_v1_1_33::ConfigV1_1_33;
 use crate::client::config::{BaseClientConfig, Config};
-use crate::commands::ecash::Ecash;
 use crate::error::ClientError;
 use clap::CommandFactory;
 use clap::{Parser, Subcommand};
 use log::{error, info};
 use nym_bin_common::bin_info;
 use nym_bin_common::completions::{fig_generate, ArgShell};
+use nym_client_core::cli_helpers::client_import_credential::CommonClientImportCredentialArgs;
 use nym_client_core::cli_helpers::CliClient;
 use nym_client_core::client::base_client::storage::migration_helpers::v1_1_33;
 use nym_config::OptionalSet;
@@ -22,10 +22,11 @@ use std::sync::OnceLock;

 mod add_gateway;
 pub(crate) mod build_info;
-pub(crate) mod ecash;
+pub(crate) mod import_credential;
 pub(crate) mod init;
 mod list_gateways;
 pub(crate) mod run;
+mod show_ticketbooks;
 mod switch_gateway;

 pub(crate) struct CliNativeClient;
@@ -72,8 +73,8 @@ pub(crate) enum Commands {
    /// Run the Nym client with provided configuration client optionally overriding set parameters
    Run(run::Run),

-    /// Ecash-related functionalities
-    Ecash(Ecash),
+    /// Import a pre-generated credential
+    ImportCredential(CommonClientImportCredentialArgs),

    /// List all registered with gateways
    ListGateways(list_gateways::Args),
@@ -84,6 +85,9 @@ pub(crate) enum Commands {
    /// Change the currently active gateway. Note that you must have already registered with the new gateway!
    SwitchGateway(switch_gateway::Args),

+    /// Display information associated with the imported ticketbooks,
+    ShowTicketbooks(show_ticketbooks::Args),
+
    /// Show build information of this binary
    BuildInfo(build_info::BuildInfo),

@@ -112,10 +116,11 @@ pub(crate) async fn execute(args: Cli) -> Result<(), Box<dyn Error + Send + Sync
    match args.command {
        Commands::Init(m) => init::execute(m).await?,
        Commands::Run(m) => run::execute(m).await?,
-        Commands::Ecash(ecash) => ecash.execute().await?,
+        Commands::ImportCredential(m) => import_credential::execute(m).await?,
        Commands::ListGateways(args) => list_gateways::execute(args).await?,
        Commands::AddGateway(args) => add_gateway::execute(args).await?,
        Commands::SwitchGateway(args) => switch_gateway::execute(args).await?,
+        Commands::ShowTicketbooks(args) => show_ticketbooks::execute(args).await?,
        Commands::BuildInfo(m) => build_info::execute(m),
        Commands::Completions(s) => s.generate(&mut Cli::command(), bin_name),
        Commands::GenerateFigSpec => fig_generate(&mut Cli::command(), bin_name),
@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.41"
+version = "1.1.39"
 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"
@@ -1,16 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::commands::CliSocks5Client;
-use crate::error::Socks5ClientError;
-use nym_client_core::cli_helpers::client_import_coin_index_signatures::{
-    import_coin_index_signatures, CommonClientImportCoinIndexSignaturesArgs,
-};
-
-pub(crate) async fn execute(
-    args: CommonClientImportCoinIndexSignaturesArgs,
-) -> Result<(), Socks5ClientError> {
-    import_coin_index_signatures::<CliSocks5Client, _>(args).await?;
-    println!("successfully imported coin index signatures!");
-    Ok(())
-}
@@ -1,16 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::commands::CliSocks5Client;
-use crate::error::Socks5ClientError;
-use nym_client_core::cli_helpers::client_import_expiration_date_signatures::{
-    import_expiration_date_signatures, CommonClientImportExpirationDateSignaturesArgs,
-};
-
-pub(crate) async fn execute(
-    args: CommonClientImportExpirationDateSignaturesArgs,
-) -> Result<(), Socks5ClientError> {
-    import_expiration_date_signatures::<CliSocks5Client, _>(args).await?;
-    println!("successfully imported expiration date signatures!");
-    Ok(())
-}
@@ -1,16 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::commands::CliSocks5Client;
-use crate::error::Socks5ClientError;
-use nym_client_core::cli_helpers::client_import_master_verification_key::{
-    import_master_verification_key, CommonClientImportMasterVerificationKeyArgs,
-};
-
-pub(crate) async fn execute(
-    args: CommonClientImportMasterVerificationKeyArgs,
-) -> Result<(), Socks5ClientError> {
-    import_master_verification_key::<CliSocks5Client, _>(args).await?;
-    println!("successfully imported master verification key!");
-    Ok(())
-}
@@ -1,59 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use clap::{Args, Subcommand};
-use nym_client_core::cli_helpers::client_import_coin_index_signatures::CommonClientImportCoinIndexSignaturesArgs;
-use nym_client_core::cli_helpers::client_import_credential::CommonClientImportTicketBookArgs;
-use nym_client_core::cli_helpers::client_import_expiration_date_signatures::CommonClientImportExpirationDateSignaturesArgs;
-use nym_client_core::cli_helpers::client_import_master_verification_key::CommonClientImportMasterVerificationKeyArgs;
-use std::error::Error;
-
-pub(crate) mod import_coin_index_signatures;
-pub(crate) mod import_credential;
-pub(crate) mod import_expiration_date_signatures;
-pub(crate) mod import_master_verification_key;
-pub(crate) mod show_ticketbooks;
-
-#[derive(Args)]
-#[clap(args_conflicts_with_subcommands = true, subcommand_required = true)]
-pub struct Ecash {
-    #[clap(subcommand)]
-    pub command: EcashCommands,
-}
-
-impl Ecash {
-    pub async fn execute(self) -> Result<(), Box<dyn Error + Send + Sync>> {
-        match self.command {
-            EcashCommands::ShowTicketBooks(args) => show_ticketbooks::execute(args).await?,
-            EcashCommands::ImportTicketBook(args) => import_credential::execute(args).await?,
-            EcashCommands::ImportCoinIndexSignatures(args) => {
-                import_coin_index_signatures::execute(args).await?
-            }
-            EcashCommands::ImportExpirationDateSignatures(args) => {
-                import_expiration_date_signatures::execute(args).await?
-            }
-            EcashCommands::ImportMasterVerificationKey(args) => {
-                import_master_verification_key::execute(args).await?
-            }
-        }
-        Ok(())
-    }
-}
-
-#[derive(Subcommand)]
-pub enum EcashCommands {
-    /// Display information associated with the imported ticketbooks,
-    ShowTicketBooks(show_ticketbooks::Args),
-
-    /// Import a pre-generated ticketbook
-    ImportTicketBook(CommonClientImportTicketBookArgs),
-
-    /// Import coin index signatures needed for ticketbooks
-    ImportCoinIndexSignatures(CommonClientImportCoinIndexSignaturesArgs),
-
-    /// Import expiration date signatures needed for ticketbooks
-    ImportExpirationDateSignatures(CommonClientImportExpirationDateSignaturesArgs),
-
-    /// Import master verification key needed for ticketbooks
-    ImportMasterVerificationKey(CommonClientImportMasterVerificationKeyArgs),
-}
@@ -4,10 +4,12 @@
 use crate::commands::CliSocks5Client;
 use crate::error::Socks5ClientError;
 use nym_client_core::cli_helpers::client_import_credential::{
-    import_credential, CommonClientImportTicketBookArgs,
+    import_credential, CommonClientImportCredentialArgs,
 };

-pub async fn execute(args: CommonClientImportTicketBookArgs) -> Result<(), Socks5ClientError> {
+pub(crate) async fn execute(
+    args: CommonClientImportCredentialArgs,
+) -> Result<(), Socks5ClientError> {
    import_credential::<CliSocks5Client, _>(args).await?;
    println!("successfully imported credential!");
    Ok(())
@@ -1,7 +1,6 @@
 // Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::commands::ecash::Ecash;
 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;
@@ -14,6 +13,7 @@ use clap::{Parser, Subcommand};
 use log::{error, info};
 use nym_bin_common::bin_info;
 use nym_bin_common::completions::{fig_generate, ArgShell};
+use nym_client_core::cli_helpers::client_import_credential::CommonClientImportCredentialArgs;
 use nym_client_core::cli_helpers::CliClient;
 use nym_client_core::client::base_client::storage::migration_helpers::v1_1_33;
 use nym_client_core::client::topology_control::geo_aware_provider::CountryGroup;
@@ -26,10 +26,11 @@ use std::sync::OnceLock;

 mod add_gateway;
 pub(crate) mod build_info;
-pub mod ecash;
+mod import_credential;
 pub mod init;
 mod list_gateways;
 pub(crate) mod run;
+mod show_ticketbooks;
 mod switch_gateway;

 pub(crate) struct CliSocks5Client;
@@ -76,8 +77,8 @@ pub(crate) enum Commands {
    /// Run the Nym client with provided configuration client optionally overriding set parameters
    Run(run::Run),

-    /// Ecash-related functionalities
-    Ecash(Ecash),
+    /// Import a pre-generated credential
+    ImportCredential(CommonClientImportCredentialArgs),

    /// List all registered with gateways
    ListGateways(list_gateways::Args),
@@ -88,6 +89,9 @@ pub(crate) enum Commands {
    /// Change the currently active gateway. Note that you must have already registered with the new gateway!
    SwitchGateway(switch_gateway::Args),

+    /// Display information associated with the imported ticketbooks,
+    ShowTicketbooks(show_ticketbooks::Args),
+
    /// Show build information of this binary
    BuildInfo(build_info::BuildInfo),

@@ -119,10 +123,11 @@ pub(crate) async fn execute(args: Cli) -> Result<(), Box<dyn Error + Send + Sync
    match args.command {
        Commands::Init(m) => init::execute(m).await?,
        Commands::Run(m) => run::execute(m).await?,
-        Commands::Ecash(ecash) => ecash.execute().await?,
+        Commands::ImportCredential(m) => import_credential::execute(m).await?,
        Commands::ListGateways(args) => list_gateways::execute(args).await?,
        Commands::AddGateway(args) => add_gateway::execute(args).await?,
        Commands::SwitchGateway(args) => switch_gateway::execute(args).await?,
+        Commands::ShowTicketbooks(args) => show_ticketbooks::execute(args).await?,
        Commands::BuildInfo(m) => build_info::execute(m),
        Commands::Completions(s) => s.generate(&mut Cli::command(), bin_name),
        Commands::GenerateFigSpec => fig_generate(&mut Cli::command(), bin_name),
@@ -9,7 +9,7 @@ use nym_client_core::cli_helpers::client_show_ticketbooks::{
 };

 #[derive(clap::Args)]
-pub struct Args {
+pub(crate) struct Args {
    #[command(flatten)]
    common_args: CommonShowTicketbooksArgs,

@@ -23,7 +23,7 @@ impl AsRef<CommonShowTicketbooksArgs> for Args {
    }
 }

-pub async fn execute(args: Args) -> Result<(), Socks5ClientError> {
+pub(crate) async fn execute(args: Args) -> Result<(), Socks5ClientError> {
    let output = args.output;
    let res = show_ticketbooks::<CliSocks5Client, _>(args).await?;

@@ -9,24 +9,9 @@ edition.workspace = true
 license.workspace = true

 [dependencies]
-base64 = { workspace = true }
 bincode = { workspace = true }
 rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
-thiserror = { workspace = true }

-nym-credentials-interface = { path = "../credentials-interface" }
-nym-crypto = { path = "../crypto", features = ["asymmetric"] }
-nym-service-provider-requests-common = { path = "../service-provider-requests-common" }
 nym-sphinx = { path = "../nymsphinx" }
 nym-wireguard-types = { path = "../wireguard-types" }
-
-## verify:
-hmac = { workspace = true, optional = true }
-sha2 = { workspace = true, optional = true }
-x25519-dalek = { workspace = true, features = ["static_secrets"] }
-
-[features]
-default = ["verify"]
-# this is moved to a separate feature as we really need clients to import it (especially, *cough*, wasm)
-verify = ["hmac", "sha2"]
@@ -1,22 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use thiserror::Error;
-
-#[derive(Debug, Error)]
-pub enum Error {
-    #[error("the provided base64-encoded client MAC ('{mac}') was malformed: {source}")]
-    MalformedClientMac {
-        mac: String,
-        #[source]
-        source: base64::DecodeError,
-    },
-
-    #[cfg(feature = "verify")]
-    #[error("failed to verify mac provided by '{client}': {source}")]
-    FailedClientMacVerification {
-        client: String,
-        #[source]
-        source: hmac::digest::MacError,
-    },
-}
@@ -2,14 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0

 pub mod v1;
-pub mod v2;

-mod error;
-
-pub use error::Error;
-pub use v2 as latest;
-
-pub const CURRENT_VERSION: u8 = 2;
+pub const CURRENT_VERSION: u8 = 1;

 fn make_bincode_serializer() -> impl bincode::Options {
    use bincode::Options;
@@ -1,13 +1,7 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-pub mod registration;
 pub mod request;
 pub mod response;

-pub use registration::{ClientMac, GatewayClient, InitMessage, Nonce};
-
-#[cfg(feature = "verify")]
-pub use registration::HmacSha256;
-
-pub const VERSION: u8 = 1;
+const VERSION: u8 = 1;
@@ -1,218 +0,0 @@
-// Copyright 2023-2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::error::Error;
-use base64::{engine::general_purpose, Engine};
-use nym_wireguard_types::PeerPublicKey;
-use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use std::net::IpAddr;
-use std::time::SystemTime;
-use std::{fmt, ops::Deref, str::FromStr};
-
-#[cfg(feature = "verify")]
-use hmac::{Hmac, Mac};
-#[cfg(feature = "verify")]
-use nym_crypto::asymmetric::encryption::PrivateKey;
-#[cfg(feature = "verify")]
-use sha2::Sha256;
-
-pub type PendingRegistrations = HashMap<PeerPublicKey, RegistrationData>;
-pub type PrivateIPs = HashMap<IpAddr, Taken>;
-
-#[cfg(feature = "verify")]
-pub type HmacSha256 = Hmac<Sha256>;
-
-pub type Nonce = u64;
-pub type Taken = Option<SystemTime>;
-
-pub const BANDWIDTH_CAP_PER_DAY: i64 = 1024 * 1024 * 1024; // 1 GB
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct InitMessage {
-    /// Base64 encoded x25519 public key
-    pub pub_key: PeerPublicKey,
-}
-
-impl InitMessage {
-    pub fn new(pub_key: PeerPublicKey) -> Self {
-        InitMessage { pub_key }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct RegistrationData {
-    pub nonce: u64,
-    pub gateway_data: GatewayClient,
-    pub wg_port: u16,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct RegistredData {
-    pub pub_key: PeerPublicKey,
-    pub private_ip: IpAddr,
-    pub wg_port: u16,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct RemainingBandwidthData {
-    pub available_bandwidth: u64,
-    pub suspended: bool,
-}
-
-/// Client that wants to register sends its PublicKey bytes mac digest encrypted with a DH shared secret.
-/// Gateway/Nym node can then verify pub_key payload using the same process
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct GatewayClient {
-    /// Base64 encoded x25519 public key
-    pub pub_key: PeerPublicKey,
-
-    /// Assigned private IP
-    pub private_ip: IpAddr,
-
-    /// Sha256 hmac on the data (alongside the prior nonce)
-    pub mac: ClientMac,
-}
-
-impl GatewayClient {
-    #[cfg(feature = "verify")]
-    pub fn new(
-        local_secret: &PrivateKey,
-        remote_public: x25519_dalek::PublicKey,
-        private_ip: IpAddr,
-        nonce: u64,
-    ) -> Self {
-        // convert from 1.0 x25519-dalek private key into 2.0 x25519-dalek
-        #[allow(clippy::expect_used)]
-        let static_secret = x25519_dalek::StaticSecret::from(local_secret.to_bytes());
-        let local_public: x25519_dalek::PublicKey = (&static_secret).into();
-
-        let dh = static_secret.diffie_hellman(&remote_public);
-
-        // TODO: change that to use our nym_crypto::hmac module instead
-        #[allow(clippy::expect_used)]
-        let mut mac = HmacSha256::new_from_slice(dh.as_bytes())
-            .expect("x25519 shared secret is always 32 bytes long");
-
-        mac.update(local_public.as_bytes());
-        mac.update(private_ip.to_string().as_bytes());
-        mac.update(&nonce.to_le_bytes());
-
-        GatewayClient {
-            pub_key: PeerPublicKey::new(local_public),
-            private_ip,
-            mac: ClientMac(mac.finalize().into_bytes().to_vec()),
-        }
-    }
-
-    // Reusable secret should be gateways Wireguard PK
-    // Client should perform this step when generating its payload, using its own WG PK
-    #[cfg(feature = "verify")]
-    pub fn verify(&self, gateway_key: &PrivateKey, nonce: u64) -> Result<(), Error> {
-        // convert from 1.0 x25519-dalek private key into 2.0 x25519-dalek
-        #[allow(clippy::expect_used)]
-        let static_secret = x25519_dalek::StaticSecret::from(gateway_key.to_bytes());
-
-        let dh = static_secret.diffie_hellman(&self.pub_key);
-
-        // TODO: change that to use our nym_crypto::hmac module instead
-        #[allow(clippy::expect_used)]
-        let mut mac = HmacSha256::new_from_slice(dh.as_bytes())
-            .expect("x25519 shared secret is always 32 bytes long");
-
-        mac.update(self.pub_key.as_bytes());
-        mac.update(self.private_ip.to_string().as_bytes());
-        mac.update(&nonce.to_le_bytes());
-
-        mac.verify_slice(&self.mac)
-            .map_err(|source| Error::FailedClientMacVerification {
-                client: self.pub_key.to_string(),
-                source,
-            })
-    }
-
-    pub fn pub_key(&self) -> PeerPublicKey {
-        self.pub_key
-    }
-}
-
-// TODO: change the inner type into generic array of size HmacSha256::OutputSize
-// TODO2: rely on our internal crypto/hmac
-#[derive(Debug, Clone)]
-pub struct ClientMac(Vec<u8>);
-
-impl fmt::Display for ClientMac {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", general_purpose::STANDARD.encode(&self.0))
-    }
-}
-
-impl ClientMac {
-    #[allow(dead_code)]
-    pub fn new(mac: Vec<u8>) -> Self {
-        ClientMac(mac)
-    }
-}
-
-impl Deref for ClientMac {
-    type Target = Vec<u8>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl FromStr for ClientMac {
-    type Err = Error;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let mac_bytes: Vec<u8> =
-            general_purpose::STANDARD
-                .decode(s)
-                .map_err(|source| Error::MalformedClientMac {
-                    mac: s.to_string(),
-                    source,
-                })?;
-
-        Ok(ClientMac(mac_bytes))
-    }
-}
-
-impl Serialize for ClientMac {
-    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
-        let encoded_key = general_purpose::STANDARD.encode(self.0.clone());
-        serializer.serialize_str(&encoded_key)
-    }
-}
-
-impl<'de> Deserialize<'de> for ClientMac {
-    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        let encoded_key = String::deserialize(deserializer)?;
-        ClientMac::from_str(&encoded_key).map_err(serde::de::Error::custom)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use nym_crypto::asymmetric::encryption;
-
-    #[test]
-    #[cfg(feature = "verify")]
-    fn client_request_roundtrip() {
-        let mut rng = rand::thread_rng();
-
-        let gateway_key_pair = encryption::KeyPair::new(&mut rng);
-        let client_key_pair = encryption::KeyPair::new(&mut rng);
-
-        let nonce = 1234567890;
-
-        let client = GatewayClient::new(
-            client_key_pair.private_key(),
-            x25519_dalek::PublicKey::from(gateway_key_pair.public_key().to_bytes()),
-            "10.0.0.42".parse().unwrap(),
-            nonce,
-        );
-        assert!(client.verify(gateway_key_pair.private_key(), nonce).is_ok())
-    }
-}
@@ -1,9 +1,8 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use super::registration::{GatewayClient, InitMessage};
 use nym_sphinx::addressing::Recipient;
-use nym_wireguard_types::PeerPublicKey;
+use nym_wireguard_types::{GatewayClient, InitMessage, PeerPublicKey};
 use serde::{Deserialize, Serialize};

 use crate::make_bincode_serializer;
@@ -83,24 +82,3 @@ pub enum AuthenticatorRequestData {
    Final(GatewayClient),
    QueryBandwidth(PeerPublicKey),
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::str::FromStr;
-
-    #[test]
-    fn check_first_byte_version() {
-        let version = 2;
-        let data = AuthenticatorRequest {
-            version,
-            data: AuthenticatorRequestData::Initial(InitMessage::new(
-                PeerPublicKey::from_str("yvNUDpT5l7W/xDhiu6HkqTHDQwbs/B3J5UrLmORl1EQ=").unwrap(),
-            )),
-            reply_to: Recipient::try_from_base58_string("D1rrpsysCGCYXy9saP8y3kmNpGtJZUXN9SvFoUcqAsM9.9Ssso1ea5NfkbMASdiseDSjTN1fSWda5SgEVjdSN4CvV@GJqd3ZxpXWSNxTfx7B1pPtswpetH4LnJdFeLeuY5KUuN").unwrap(),
-            request_id: 1,
-        };
-        let bytes = data.to_bytes().unwrap();
-        assert_eq!(*bytes.first().unwrap(), version);
-    }
-}
@@ -1,8 +1,8 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use super::registration::{RegistrationData, RegistredData, RemainingBandwidthData};
 use nym_sphinx::addressing::Recipient;
+use nym_wireguard_types::registration::{RegistrationData, RegistredData, RemainingBandwidthData};
 use serde::{Deserialize, Serialize};

 use crate::make_bincode_serializer;
@@ -1,174 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use nym_service_provider_requests_common::{Protocol, ServiceProviderType};
-
-use crate::{v1, v2};
-
-impl From<v1::request::AuthenticatorRequest> for v2::request::AuthenticatorRequest {
-    fn from(authenticator_request: v1::request::AuthenticatorRequest) -> Self {
-        Self {
-            protocol: Protocol {
-                version: 2,
-                service_provider_type: ServiceProviderType::Authenticator,
-            },
-            data: authenticator_request.data.into(),
-            reply_to: authenticator_request.reply_to,
-            request_id: authenticator_request.request_id,
-        }
-    }
-}
-
-impl From<v1::request::AuthenticatorRequestData> for v2::request::AuthenticatorRequestData {
-    fn from(authenticator_request_data: v1::request::AuthenticatorRequestData) -> Self {
-        match authenticator_request_data {
-            v1::request::AuthenticatorRequestData::Initial(init_msg) => {
-                v2::request::AuthenticatorRequestData::Initial(init_msg.into())
-            }
-            v1::request::AuthenticatorRequestData::Final(gw_client) => {
-                v2::request::AuthenticatorRequestData::Final(gw_client.into())
-            }
-            v1::request::AuthenticatorRequestData::QueryBandwidth(pub_key) => {
-                v2::request::AuthenticatorRequestData::QueryBandwidth(pub_key)
-            }
-        }
-    }
-}
-
-impl From<v1::registration::InitMessage> for v2::registration::InitMessage {
-    fn from(init_msg: v1::registration::InitMessage) -> Self {
-        Self {
-            pub_key: init_msg.pub_key,
-        }
-    }
-}
-
-impl From<v1::registration::GatewayClient> for Box<v2::registration::FinalMessage> {
-    fn from(gw_client: v1::registration::GatewayClient) -> Self {
-        Box::new(v2::registration::FinalMessage {
-            gateway_client: gw_client.into(),
-            credential: None,
-        })
-    }
-}
-
-impl From<v1::registration::GatewayClient> for v2::registration::GatewayClient {
-    fn from(gw_client: v1::registration::GatewayClient) -> Self {
-        Self {
-            pub_key: gw_client.pub_key,
-            private_ip: gw_client.private_ip,
-            mac: gw_client.mac.into(),
-        }
-    }
-}
-
-impl From<v2::registration::GatewayClient> for v1::registration::GatewayClient {
-    fn from(gw_client: v2::registration::GatewayClient) -> Self {
-        Self {
-            pub_key: gw_client.pub_key,
-            private_ip: gw_client.private_ip,
-            mac: gw_client.mac.into(),
-        }
-    }
-}
-
-impl From<v1::registration::ClientMac> for v2::registration::ClientMac {
-    fn from(mac: v1::registration::ClientMac) -> Self {
-        Self::new(mac.to_vec())
-    }
-}
-
-impl From<v2::registration::ClientMac> for v1::registration::ClientMac {
-    fn from(mac: v2::registration::ClientMac) -> Self {
-        Self::new(mac.to_vec())
-    }
-}
-
-impl From<v2::response::AuthenticatorResponse> for v1::response::AuthenticatorResponse {
-    fn from(authenticator_response: v2::response::AuthenticatorResponse) -> Self {
-        Self {
-            version: authenticator_response.protocol.version,
-            data: authenticator_response.data.into(),
-            reply_to: authenticator_response.reply_to,
-        }
-    }
-}
-
-impl From<v2::response::AuthenticatorResponseData> for v1::response::AuthenticatorResponseData {
-    fn from(authenticator_response_data: v2::response::AuthenticatorResponseData) -> Self {
-        match authenticator_response_data {
-            v2::response::AuthenticatorResponseData::PendingRegistration(
-                pending_registration_response,
-            ) => v1::response::AuthenticatorResponseData::PendingRegistration(
-                pending_registration_response.into(),
-            ),
-            v2::response::AuthenticatorResponseData::Registered(registered_response) => {
-                v1::response::AuthenticatorResponseData::Registered(registered_response.into())
-            }
-            v2::response::AuthenticatorResponseData::RemainingBandwidth(
-                remaining_bandwidth_response,
-            ) => v1::response::AuthenticatorResponseData::RemainingBandwidth(
-                remaining_bandwidth_response.into(),
-            ),
-        }
-    }
-}
-
-impl From<v2::response::PendingRegistrationResponse> for v1::response::PendingRegistrationResponse {
-    fn from(value: v2::response::PendingRegistrationResponse) -> Self {
-        Self {
-            request_id: value.request_id,
-            reply_to: value.reply_to,
-            reply: value.reply.into(),
-        }
-    }
-}
-
-impl From<v2::response::RegisteredResponse> for v1::response::RegisteredResponse {
-    fn from(value: v2::response::RegisteredResponse) -> Self {
-        Self {
-            request_id: value.request_id,
-            reply_to: value.reply_to,
-            reply: value.reply.into(),
-        }
-    }
-}
-
-impl From<v2::response::RemainingBandwidthResponse> for v1::response::RemainingBandwidthResponse {
-    fn from(value: v2::response::RemainingBandwidthResponse) -> Self {
-        Self {
-            request_id: value.request_id,
-            reply_to: value.reply_to,
-            reply: value.reply.map(Into::into),
-        }
-    }
-}
-
-impl From<v2::registration::RegistrationData> for v1::registration::RegistrationData {
-    fn from(value: v2::registration::RegistrationData) -> Self {
-        Self {
-            nonce: value.nonce,
-            gateway_data: value.gateway_data.into(),
-            wg_port: value.wg_port,
-        }
-    }
-}
-
-impl From<v2::registration::RegistredData> for v1::registration::RegistredData {
-    fn from(value: v2::registration::RegistredData) -> Self {
-        Self {
-            pub_key: value.pub_key,
-            private_ip: value.private_ip,
-            wg_port: value.wg_port,
-        }
-    }
-}
-
-impl From<v2::registration::RemainingBandwidthData> for v1::registration::RemainingBandwidthData {
-    fn from(value: v2::registration::RemainingBandwidthData) -> Self {
-        Self {
-            available_bandwidth: value.available_bandwidth as u64,
-            suspended: false,
-        }
-    }
-}
@@ -1,9 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-pub mod conversion;
-pub mod registration;
-pub mod request;
-pub mod response;
-
-pub const VERSION: u8 = 2;
@@ -1,116 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use super::registration::{FinalMessage, InitMessage};
-use nym_service_provider_requests_common::{Protocol, ServiceProviderType};
-use nym_sphinx::addressing::Recipient;
-use nym_wireguard_types::PeerPublicKey;
-use serde::{Deserialize, Serialize};
-
-use crate::make_bincode_serializer;
-
-use super::VERSION;
-
-fn generate_random() -> u64 {
-    use rand::RngCore;
-    let mut rng = rand::rngs::OsRng;
-    rng.next_u64()
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct AuthenticatorRequest {
-    pub protocol: Protocol,
-    pub data: AuthenticatorRequestData,
-    pub reply_to: Recipient,
-    pub request_id: u64,
-}
-
-impl AuthenticatorRequest {
-    pub fn from_reconstructed_message(
-        message: &nym_sphinx::receiver::ReconstructedMessage,
-    ) -> Result<Self, bincode::Error> {
-        use bincode::Options;
-        make_bincode_serializer().deserialize(&message.message)
-    }
-
-    pub fn new_initial_request(init_message: InitMessage, reply_to: Recipient) -> (Self, u64) {
-        let request_id = generate_random();
-        (
-            Self {
-                protocol: Protocol {
-                    service_provider_type: ServiceProviderType::Authenticator,
-                    version: VERSION,
-                },
-                data: AuthenticatorRequestData::Initial(init_message),
-                reply_to,
-                request_id,
-            },
-            request_id,
-        )
-    }
-
-    pub fn new_final_request(final_message: FinalMessage, reply_to: Recipient) -> (Self, u64) {
-        let request_id = generate_random();
-        (
-            Self {
-                protocol: Protocol {
-                    service_provider_type: ServiceProviderType::Authenticator,
-                    version: VERSION,
-                },
-                data: AuthenticatorRequestData::Final(Box::new(final_message)),
-                reply_to,
-                request_id,
-            },
-            request_id,
-        )
-    }
-
-    pub fn new_query_request(peer_public_key: PeerPublicKey, reply_to: Recipient) -> (Self, u64) {
-        let request_id = generate_random();
-        (
-            Self {
-                protocol: Protocol {
-                    service_provider_type: ServiceProviderType::Authenticator,
-                    version: VERSION,
-                },
-                data: AuthenticatorRequestData::QueryBandwidth(peer_public_key),
-                reply_to,
-                request_id,
-            },
-            request_id,
-        )
-    }
-
-    pub fn to_bytes(&self) -> Result<Vec<u8>, bincode::Error> {
-        use bincode::Options;
-        make_bincode_serializer().serialize(self)
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub enum AuthenticatorRequestData {
-    Initial(InitMessage),
-    Final(Box<FinalMessage>),
-    QueryBandwidth(PeerPublicKey),
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::str::FromStr;
-
-    #[test]
-    fn check_first_bytes_protocol() {
-        let version = 2;
-        let data = AuthenticatorRequest {
-            protocol: Protocol { version, service_provider_type: ServiceProviderType::Authenticator },
-            data: AuthenticatorRequestData::Initial(InitMessage::new(
-                PeerPublicKey::from_str("yvNUDpT5l7W/xDhiu6HkqTHDQwbs/B3J5UrLmORl1EQ=").unwrap(),
-            )),
-            reply_to: Recipient::try_from_base58_string("D1rrpsysCGCYXy9saP8y3kmNpGtJZUXN9SvFoUcqAsM9.9Ssso1ea5NfkbMASdiseDSjTN1fSWda5SgEVjdSN4CvV@GJqd3ZxpXWSNxTfx7B1pPtswpetH4LnJdFeLeuY5KUuN").unwrap(),
-            request_id: 1,
-        };
-        let bytes = *data.to_bytes().unwrap().first_chunk::<2>().unwrap();
-        assert_eq!(bytes, [version, ServiceProviderType::Authenticator as u8]);
-    }
-}
@@ -1,129 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use super::registration::{RegistrationData, RegistredData, RemainingBandwidthData};
-use nym_service_provider_requests_common::{Protocol, ServiceProviderType};
-use nym_sphinx::addressing::Recipient;
-use serde::{Deserialize, Serialize};
-
-use crate::make_bincode_serializer;
-
-use super::VERSION;
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct AuthenticatorResponse {
-    pub protocol: Protocol,
-    pub data: AuthenticatorResponseData,
-    pub reply_to: Recipient,
-}
-
-impl AuthenticatorResponse {
-    pub fn new_pending_registration_success(
-        registration_data: RegistrationData,
-        request_id: u64,
-        reply_to: Recipient,
-    ) -> Self {
-        Self {
-            protocol: Protocol {
-                service_provider_type: ServiceProviderType::Authenticator,
-                version: VERSION,
-            },
-            data: AuthenticatorResponseData::PendingRegistration(PendingRegistrationResponse {
-                reply: registration_data,
-                reply_to,
-                request_id,
-            }),
-            reply_to,
-        }
-    }
-
-    pub fn new_registered(
-        registred_data: RegistredData,
-        reply_to: Recipient,
-        request_id: u64,
-    ) -> Self {
-        Self {
-            protocol: Protocol {
-                service_provider_type: ServiceProviderType::Authenticator,
-                version: VERSION,
-            },
-            data: AuthenticatorResponseData::Registered(RegisteredResponse {
-                reply: registred_data,
-                reply_to,
-                request_id,
-            }),
-            reply_to,
-        }
-    }
-
-    pub fn new_remaining_bandwidth(
-        remaining_bandwidth_data: Option<RemainingBandwidthData>,
-        reply_to: Recipient,
-        request_id: u64,
-    ) -> Self {
-        Self {
-            protocol: Protocol {
-                service_provider_type: ServiceProviderType::Authenticator,
-                version: VERSION,
-            },
-            data: AuthenticatorResponseData::RemainingBandwidth(RemainingBandwidthResponse {
-                reply: remaining_bandwidth_data,
-                reply_to,
-                request_id,
-            }),
-            reply_to,
-        }
-    }
-
-    pub fn recipient(&self) -> Recipient {
-        self.reply_to
-    }
-
-    pub fn to_bytes(&self) -> Result<Vec<u8>, bincode::Error> {
-        use bincode::Options;
-        make_bincode_serializer().serialize(self)
-    }
-
-    pub fn from_reconstructed_message(
-        message: &nym_sphinx::receiver::ReconstructedMessage,
-    ) -> Result<Self, bincode::Error> {
-        use bincode::Options;
-        make_bincode_serializer().deserialize(&message.message)
-    }
-
-    pub fn id(&self) -> Option<u64> {
-        match &self.data {
-            AuthenticatorResponseData::PendingRegistration(response) => Some(response.request_id),
-            AuthenticatorResponseData::Registered(response) => Some(response.request_id),
-            AuthenticatorResponseData::RemainingBandwidth(response) => Some(response.request_id),
-        }
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub enum AuthenticatorResponseData {
-    PendingRegistration(PendingRegistrationResponse),
-    Registered(RegisteredResponse),
-    RemainingBandwidth(RemainingBandwidthResponse),
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct PendingRegistrationResponse {
-    pub request_id: u64,
-    pub reply_to: Recipient,
-    pub reply: RegistrationData,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct RegisteredResponse {
-    pub request_id: u64,
-    pub reply_to: Recipient,
-    pub reply: RegistredData,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct RemainingBandwidthResponse {
-    pub request_id: u64,
-    pub reply_to: Recipient,
-    pub reply: Option<RemainingBandwidthData>,
-}
@@ -18,7 +18,7 @@ nym-ecash-time = { path = "../ecash-time" }
 nym-credential-storage = { path = "../credential-storage" }
 nym-credentials = { path = "../credentials" }
 nym-credentials-interface = { path = "../credentials-interface" }
-nym-crypto = { path = "../crypto", features = ["rand", "asymmetric", "stream_cipher", "aes", "hashing"] }
+nym-crypto = { path = "../crypto", features = ["rand", "asymmetric", "symmetric", "aes", "hashing"] }
 nym-network-defaults = { path = "../network-defaults" }
 nym-validator-client = { path = "../client-libs/validator-client", default-features = false }
 nym-ecash-contract-common = { path = "../cosmwasm-smart-contracts/ecash-contract" }
@@ -2,9 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::error::BandwidthControllerError;
-use crate::utils::{
-    get_aggregate_verification_key, get_coin_index_signatures, get_expiration_date_signatures,
-};
+use crate::utils::{get_coin_index_signatures, get_expiration_date_signatures};
 use log::info;
 use nym_credential_storage::storage::Storage;
 use nym_credentials::ecash::bandwidth::IssuanceTicketBook;
@@ -57,7 +55,7 @@ where
    ))
 }

-pub async fn query_and_persist_required_global_data<S>(
+pub async fn query_and_persist_required_global_signatures<S>(
    storage: &S,
    epoch_id: EpochId,
    expiration_date: Date,
@@ -67,10 +65,6 @@ where
    S: Storage,
    <S as Storage>::StorageError: Send + Sync + 'static,
 {
-    log::info!("Getting master verification key");
-    // this will also persist the key in the storage if was not there already
-    get_aggregate_verification_key(storage, epoch_id, apis.clone()).await?;
-
    log::info!("Getting expiration date signatures");
    // this will also persist the signatures in the storage if they were not there already
    get_expiration_date_signatures(storage, epoch_id, expiration_date, apis.clone()).await?;
@@ -16,7 +16,7 @@ use nym_credential_storage::models::RetrievedTicketbook;
 use nym_credential_storage::storage::Storage;
 use nym_credentials::ecash::bandwidth::CredentialSpendingData;
 use nym_credentials_interface::{
-    AnnotatedCoinIndexSignature, AnnotatedExpirationDateSignature, VerificationKeyAuth,
+    AnnotatedCoinIndexSignature, AnnotatedExpirationDateSignature, NymPayInfo, VerificationKeyAuth,
 };
 use nym_ecash_time::Date;
 use nym_validator_client::nym_api::EpochId;
@@ -165,9 +165,7 @@ impl<C, St: Storage> BandwidthController<C, St> {
            .get_coin_index_signatures(epoch_id, &mut api_clients)
            .await?;

-        let pay_info = retrieved_ticketbook
-            .ticketbook
-            .generate_pay_info(provider_pk);
+        let pay_info = NymPayInfo::generate(provider_pk);

        let spend_request = retrieved_ticketbook.ticketbook.prepare_for_spending(
            &verification_key,
@@ -4,10 +4,6 @@
 use crate::error::BandwidthControllerError;
 use log::warn;
 use nym_credential_storage::storage::Storage;
-use nym_credentials::ecash::bandwidth::serialiser::keys::EpochVerificationKey;
-use nym_credentials::ecash::bandwidth::serialiser::signatures::{
-    AggregatedCoinIndicesSignatures, AggregatedExpirationDateSignatures,
-};
 use nym_credentials_interface::{
    AnnotatedCoinIndexSignature, AnnotatedExpirationDateSignature, VerificationKeyAuth,
 };
@@ -98,18 +94,13 @@ where
    .await?
    .key;

-    let full = EpochVerificationKey {
-        epoch_id,
-        key: master_vk,
-    };
-
    // store the retrieved key
    storage
-        .insert_master_verification_key(&full)
+        .insert_master_verification_key(epoch_id, &master_vk)
        .await
        .map_err(BandwidthControllerError::credential_storage_error)?;

-    Ok(full.key)
+    Ok(master_vk)
 }

 pub(crate) async fn get_coin_index_signatures<St>(
@@ -141,18 +132,13 @@ where
    .await?
    .signatures;

-    let aggregated = AggregatedCoinIndicesSignatures {
-        epoch_id,
-        signatures: index_sigs,
-    };
-
    // store the retrieved key
    storage
-        .insert_coin_index_signatures(&aggregated)
+        .insert_coin_index_signatures(epoch_id, &index_sigs)
        .await
        .map_err(BandwidthControllerError::credential_storage_error)?;

-    Ok(aggregated.signatures)
+    Ok(index_sigs)
 }

 pub(crate) async fn get_expiration_date_signatures<St>(
@@ -185,17 +171,11 @@ where
    .await?
    .signatures;

-    let aggregated = AggregatedExpirationDateSignatures {
-        epoch_id,
-        expiration_date,
-        signatures: expiration_sigs,
-    };
-
    // store the retrieved key
    storage
-        .insert_expiration_date_signatures(&aggregated)
+        .insert_expiration_date_signatures(epoch_id, expiration_date, &expiration_sigs)
        .await
        .map_err(BandwidthControllerError::credential_storage_error)?;

-    Ok(aggregated.signatures)
+    Ok(expiration_sigs)
 }
@@ -8,14 +8,14 @@ license = { workspace = true }
 repository = { workspace = true }

 [dependencies]
+const-str = { workspace = true }
 clap = { workspace = true, features = ["derive"], optional = true }
 clap_complete = { workspace = true, optional = true }
 clap_complete_fig = { workspace = true, optional = true }
-const-str = { workspace = true }
 log = { workspace = true }
 pretty_env_logger = { workspace = true }
+semver = "0.11"
 schemars = { workspace = true, features = ["preserve_order"], optional = true }
-semver.workspace = true
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, optional = true }

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

+use semver::SemVerError;
 pub use semver::Version;

-/// Checks if the version is minor version compatible.
-///
 /// Checks whether given `version` is compatible with a given semantic version requirement `req`
 /// according to major-minor semver rules. The semantic version requirement can be passed as a full,
 /// concrete version number, because that's what we'll have in our Cargo.toml files (e.g. 0.3.2).
@@ -23,7 +22,7 @@ pub fn is_minor_version_compatible(version: &str, req: &str) -> bool {
    expected_version.major == req_version.major && expected_version.minor == req_version.minor
 }

-pub fn parse_version(raw_version: &str) -> Result<Version, semver::Error> {
+pub fn parse_version(raw_version: &str) -> Result<Version, SemVerError> {
    Version::parse(raw_version)
 }

@@ -14,7 +14,7 @@ base64 = { workspace = true }
 bs58 = { workspace = true }
 cfg-if = { workspace = true }
 clap = { workspace = true, optional = true }
-comfy-table = { workspace = true, optional = true }
+comfy-table = { version = "7.1.1", optional = true }
 futures = { workspace = true }
 humantime-serde = { workspace = true }
 log = { workspace = true }
@@ -59,19 +59,19 @@ nym-ecash-time = { path = "../ecash-time" }

 ### For serving prometheus metrics
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.hyper]
-workspace = true
+version = "1"
 features = ["server", "http1"]

 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.http-body-util]
-workspace = true
+version = "0.1"

 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.hyper-util]
-workspace = true
+version = "0.1"
 features = ["tokio"]
 ###

 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-stream]
-workspace = true
+version = "0.1.11"
 features = ["time"]

 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio]
@@ -102,7 +102,7 @@ workspace = true
 features = ["tokio"]

 [target."cfg(target_arch = \"wasm32\")".dependencies.gloo-timers]
-version = "0.3.0"
+version = "0.2.4"
 features = ["futures"]

 [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-utils]
@@ -110,7 +110,7 @@ path = "../wasm/utils"
 features = ["websocket"]

 [target."cfg(target_arch = \"wasm32\")".dependencies.time]
-workspace = true
+version = "0.3.17"
 features = ["wasm-bindgen"]

 [dev-dependencies]
@@ -1,13 +0,0 @@
-/*
- * Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
- * SPDX-License-Identifier: Apache-2.0
- */
-
-- make aes128 key column nullable and add aes256 column
-ALTER TABLE remote_gateway_details RENAME COLUMN derived_aes128_ctr_blake3_hmac_keys_bs58 TO derived_aes128_ctr_blake3_hmac_keys_bs58_old;
-ALTER TABLE remote_gateway_details ADD COLUMN derived_aes128_ctr_blake3_hmac_keys_bs58 TEXT;
-ALTER TABLE remote_gateway_details ADD COLUMN derived_aes256_gcm_siv_key BLOB;
-
-UPDATE remote_gateway_details SET derived_aes128_ctr_blake3_hmac_keys_bs58 = derived_aes128_ctr_blake3_hmac_keys_bs58_old;
-
-ALTER TABLE remote_gateway_details DROP COLUMN derived_aes128_ctr_blake3_hmac_keys_bs58_old;
@@ -155,12 +155,11 @@ impl StorageManager {
    ) -> Result<(), sqlx::Error> {
        sqlx::query!(
            r#"
-                INSERT INTO remote_gateway_details(gateway_id_bs58, derived_aes128_ctr_blake3_hmac_keys_bs58, derived_aes256_gcm_siv_key, gateway_owner_address, gateway_listener)
-                VALUES (?, ?, ?, ?, ?)
+                INSERT INTO remote_gateway_details(gateway_id_bs58, derived_aes128_ctr_blake3_hmac_keys_bs58, gateway_owner_address, gateway_listener) 
+                VALUES (?, ?, ?, ?)
            "#,
            remote.gateway_id_bs58,
            remote.derived_aes128_ctr_blake3_hmac_keys_bs58,
-            remote.derived_aes256_gcm_siv_key,
            remote.gateway_owner_address,
            remote.gateway_listener,
        )
@@ -169,30 +168,6 @@ impl StorageManager {
        Ok(())
    }

-    pub(crate) async fn update_remote_gateway_key(
-        &self,
-        gateway_id_bs58: &str,
-        derived_aes128_ctr_blake3_hmac_keys_bs58: Option<&str>,
-        derived_aes256_gcm_siv_key: Option<&[u8]>,
-    ) -> Result<(), sqlx::Error> {
-        sqlx::query!(
-            r#"
-                UPDATE remote_gateway_details
-                SET
-                    derived_aes128_ctr_blake3_hmac_keys_bs58 = ?,
-                    derived_aes256_gcm_siv_key = ?
-                WHERE gateway_id_bs58 = ?
-            "#,
-            derived_aes128_ctr_blake3_hmac_keys_bs58,
-            derived_aes256_gcm_siv_key,
-            gateway_id_bs58
-        )
-        .execute(&self.connection_pool)
-        .await?;
-
-        Ok(())
-    }
-
    pub(crate) async fn remove_remote_gateway_details(
        &self,
        gateway_id: &str,
@@ -7,8 +7,7 @@ use crate::{
 };
 use async_trait::async_trait;
 use manager::StorageManager;
-use nym_crypto::asymmetric::ed25519;
-use nym_gateway_requests::SharedSymmetricKey;
+use nym_crypto::asymmetric::identity::PublicKey;
 use std::path::Path;

 pub mod error;
@@ -68,7 +67,7 @@ impl GatewaysDetailsStore for OnDiskGatewaysDetails {
        Ok(registered)
    }

-    async fn all_gateways_identities(&self) -> Result<Vec<ed25519::PublicKey>, Self::StorageError> {
+    async fn all_gateways_identities(&self) -> Result<Vec<PublicKey>, Self::StorageError> {
        Ok(self
            .manager
            .registered_gateways()
@@ -133,21 +132,6 @@ impl GatewaysDetailsStore for OnDiskGatewaysDetails {
        Ok(())
    }

-    async fn upgrade_stored_remote_gateway_key(
-        &self,
-        gateway_id: ed25519::PublicKey,
-        updated_key: &SharedSymmetricKey,
-    ) -> Result<(), Self::StorageError> {
-        self.manager
-            .update_remote_gateway_key(
-                &gateway_id.to_base58_string(),
-                None,
-                Some(updated_key.as_bytes()),
-            )
-            .await?;
-        Ok(())
-    }
-
    // ideally all of those should be run under a storage tx to ensure storage consistency,
    // but at that point it's fine
    async fn remove_gateway_details(&self, gateway_id: &str) -> Result<(), Self::StorageError> {
@@ -2,10 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::types::{ActiveGateway, GatewayRegistration};
-use crate::{BadGateway, GatewayDetails, GatewaysDetailsStore};
+use crate::{BadGateway, GatewaysDetailsStore};
 use async_trait::async_trait;
-use nym_crypto::asymmetric::ed25519::PublicKey;
-use nym_gateway_requests::{SharedGatewayKey, SharedSymmetricKey};
 use std::collections::HashMap;
 use std::sync::Arc;
 use thiserror::Error;
@@ -36,6 +34,10 @@ struct InMemStorageInner {
 impl GatewaysDetailsStore for InMemGatewaysDetails {
    type StorageError = InMemStorageError;

+    async fn has_gateway_details(&self, gateway_id: &str) -> Result<bool, Self::StorageError> {
+        Ok(self.inner.read().await.gateways.contains_key(gateway_id))
+    }
+
    async fn active_gateway(&self) -> Result<ActiveGateway, Self::StorageError> {
        let guard = self.inner.read().await;

@@ -66,10 +68,6 @@ impl GatewaysDetailsStore for InMemGatewaysDetails {
        Ok(self.inner.read().await.gateways.values().cloned().collect())
    }

-    async fn has_gateway_details(&self, gateway_id: &str) -> Result<bool, Self::StorageError> {
-        Ok(self.inner.read().await.gateways.contains_key(gateway_id))
-    }
-
    async fn load_gateway_details(
        &self,
        gateway_id: &str,
@@ -96,29 +94,6 @@ impl GatewaysDetailsStore for InMemGatewaysDetails {
        Ok(())
    }

-    async fn upgrade_stored_remote_gateway_key(
-        &self,
-        gateway_id: PublicKey,
-        updated_key: &SharedSymmetricKey,
-    ) -> Result<(), Self::StorageError> {
-        let mut guard = self.inner.write().await;
-
-        #[allow(clippy::unwrap_used)]
-        if let Some(target) = guard.gateways.get_mut(&gateway_id.to_string()) {
-            let GatewayDetails::Remote(details) = &mut target.details else {
-                return Ok(());
-            };
-            assert_eq!(Arc::strong_count(&details.shared_key), 1);
-
-            // eh. that's nasty, but it's only ever used for ephemeral clients so should be fine for now...
-            details.shared_key = Arc::new(SharedGatewayKey::Current(
-                SharedSymmetricKey::try_from_bytes(updated_key.as_bytes()).unwrap(),
-            ))
-        }
-
-        Ok(())
-    }
-
    async fn remove_gateway_details(&self, gateway_id: &str) -> Result<(), Self::StorageError> {
        let mut guard = self.inner.write().await;
        if let Some(active) = guard.active_gateway.as_ref() {
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use nym_crypto::asymmetric::identity::Ed25519RecoveryError;
-use nym_gateway_requests::shared_key::SharedKeyConversionError;
+use nym_gateway_requests::registration::handshake::shared_key::SharedKeyConversionError;
 use thiserror::Error;

 #[derive(Debug, Error)]
@@ -36,9 +36,6 @@ pub enum BadGateway {
        source: SharedKeyConversionError,
    },

-    #[error("could not find any valid shared keys for gateway {gateway_id}")]
-    MissingSharedKey { gateway_id: String },
-
    #[error(
        "the listening address of gateway {gateway_id} ({raw_listener}) is malformed: {source}"
    )]
@@ -5,8 +5,6 @@
 #![warn(clippy::unwrap_used)]

 use async_trait::async_trait;
-use nym_crypto::asymmetric::identity;
-use nym_gateway_requests::SharedSymmetricKey;
 use std::error::Error;

 pub mod backend;
@@ -20,6 +18,7 @@ pub use error::BadGateway;

 #[cfg(all(not(target_arch = "wasm32"), feature = "fs-gateways-storage"))]
 pub use backend::fs_backend::{error::StorageError, OnDiskGatewaysDetails};
+use nym_crypto::asymmetric::identity;

 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
 #[cfg_attr(not(target_arch = "wasm32"), async_trait)]
@@ -62,12 +61,6 @@ pub trait GatewaysDetailsStore {
        details: &GatewayRegistration,
    ) -> Result<(), Self::StorageError>;

-    async fn upgrade_stored_remote_gateway_key(
-        &self,
-        gateway_id: identity::PublicKey,
-        updated_key: &SharedSymmetricKey,
-    ) -> Result<(), Self::StorageError>;
-
    /// Remove given gateway details from the underlying store.
    async fn remove_gateway_details(&self, gateway_id: &str) -> Result<(), Self::StorageError>;
 }
@@ -4,10 +4,9 @@
 use crate::BadGateway;
 use cosmrs::AccountId;
 use nym_crypto::asymmetric::identity;
-use nym_gateway_requests::shared_key::{LegacySharedKeys, SharedGatewayKey, SharedSymmetricKey};
+use nym_gateway_requests::registration::handshake::SharedKeys;
 use serde::{Deserialize, Serialize};
 use std::fmt::{Display, Formatter};
-use std::ops::Deref;
 use std::str::FromStr;
 use std::sync::Arc;
 use time::OffsetDateTime;
@@ -65,13 +64,13 @@ impl From<GatewayDetails> for GatewayRegistration {
 impl GatewayDetails {
    pub fn new_remote(
        gateway_id: identity::PublicKey,
-        shared_key: Arc<SharedGatewayKey>,
+        derived_aes128_ctr_blake3_hmac_keys: Arc<SharedKeys>,
        gateway_owner_address: Option<AccountId>,
        gateway_listener: Url,
    ) -> Self {
        GatewayDetails::Remote(RemoteGatewayDetails {
            gateway_id,
-            shared_key,
+            derived_aes128_ctr_blake3_hmac_keys,
            gateway_owner_address,
            gateway_listener,
        })
@@ -88,9 +87,9 @@ impl GatewayDetails {
        }
    }

-    pub fn shared_key(&self) -> Option<&SharedGatewayKey> {
+    pub fn shared_key(&self) -> Option<&SharedKeys> {
        match self {
-            GatewayDetails::Remote(details) => Some(&details.shared_key),
+            GatewayDetails::Remote(details) => Some(&details.derived_aes128_ctr_blake3_hmac_keys),
            GatewayDetails::Custom(_) => None,
        }
    }
@@ -168,8 +167,7 @@ pub struct RegisteredGateway {
 #[cfg_attr(feature = "sqlx", derive(sqlx::FromRow))]
 pub struct RawRemoteGatewayDetails {
    pub gateway_id_bs58: String,
-    pub derived_aes128_ctr_blake3_hmac_keys_bs58: Option<String>,
-    pub derived_aes256_gcm_siv_key: Option<Vec<u8>>,
+    pub derived_aes128_ctr_blake3_hmac_keys_bs58: String,
    pub gateway_owner_address: Option<String>,
    pub gateway_listener: String,
 }
@@ -186,35 +184,13 @@ impl TryFrom<RawRemoteGatewayDetails> for RemoteGatewayDetails {
                }
            })?;

-        let shared_key =
-            match (
-                &value.derived_aes256_gcm_siv_key,
-                &value.derived_aes128_ctr_blake3_hmac_keys_bs58,
-            ) {
-                (None, None) => {
-                    return Err(BadGateway::MissingSharedKey {
-                        gateway_id: value.gateway_id_bs58.clone(),
-                    })
-                }
-                (Some(aes256gcm_siv), _) => {
-                    let current_key =
-                        SharedSymmetricKey::try_from_bytes(aes256gcm_siv).map_err(|source| {
-                            BadGateway::MalformedSharedKeys {
-                                gateway_id: value.gateway_id_bs58.clone(),
-                                source,
-                            }
-                        })?;
-                    SharedGatewayKey::Current(current_key)
-                }
-                (None, Some(aes128ctr_hmac)) => {
-                    let legacy_key = LegacySharedKeys::try_from_base58_string(aes128ctr_hmac)
-                        .map_err(|source| BadGateway::MalformedSharedKeys {
-                            gateway_id: value.gateway_id_bs58.clone(),
-                            source,
-                        })?;
-                    SharedGatewayKey::Legacy(legacy_key)
-                }
-            };
+        let derived_aes128_ctr_blake3_hmac_keys = Arc::new(
+            SharedKeys::try_from_base58_string(&value.derived_aes128_ctr_blake3_hmac_keys_bs58)
+                .map_err(|source| BadGateway::MalformedSharedKeys {
+                    gateway_id: value.gateway_id_bs58.clone(),
+                    source,
+                })?,
+        );

        let gateway_owner_address = value
            .gateway_owner_address
@@ -240,7 +216,7 @@ impl TryFrom<RawRemoteGatewayDetails> for RemoteGatewayDetails {

        Ok(RemoteGatewayDetails {
            gateway_id,
-            shared_key: Arc::new(shared_key),
+            derived_aes128_ctr_blake3_hmac_keys,
            gateway_owner_address,
            gateway_listener,
        })
@@ -249,16 +225,11 @@ impl TryFrom<RawRemoteGatewayDetails> for RemoteGatewayDetails {

 impl<'a> From<&'a RemoteGatewayDetails> for RawRemoteGatewayDetails {
    fn from(value: &'a RemoteGatewayDetails) -> Self {
-        let (derived_aes128_ctr_blake3_hmac_keys_bs58, derived_aes256_gcm_siv_key) =
-            match value.shared_key.deref() {
-                SharedGatewayKey::Current(key) => (None, Some(key.to_bytes())),
-                SharedGatewayKey::Legacy(key) => (Some(key.to_base58_string()), None),
-            };
-
        RawRemoteGatewayDetails {
            gateway_id_bs58: value.gateway_id.to_base58_string(),
-            derived_aes128_ctr_blake3_hmac_keys_bs58,
-            derived_aes256_gcm_siv_key,
+            derived_aes128_ctr_blake3_hmac_keys_bs58: value
+                .derived_aes128_ctr_blake3_hmac_keys
+                .to_base58_string(),
            gateway_owner_address: value.gateway_owner_address.as_ref().map(|o| o.to_string()),
            gateway_listener: value.gateway_listener.to_string(),
        }
@@ -269,7 +240,9 @@ impl<'a> From<&'a RemoteGatewayDetails> for RawRemoteGatewayDetails {
 pub struct RemoteGatewayDetails {
    pub gateway_id: identity::PublicKey,

-    pub shared_key: Arc<SharedGatewayKey>,
+    // note: `SharedKeys` implement ZeroizeOnDrop, meaning when `RemoteGatewayDetails` is dropped,
+    // the keys will be zeroized
+    pub derived_aes128_ctr_blake3_hmac_keys: Arc<SharedKeys>,

    pub gateway_owner_address: Option<AccountId>,

@@ -1,68 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::cli_helpers::{CliClient, CliClientConfig};
-use std::fs;
-use std::path::PathBuf;
-
-#[cfg(feature = "cli")]
-fn parse_encoded_signatures_data(raw: &str) -> bs58::decode::Result<Vec<u8>> {
-    bs58::decode(raw).into_vec()
-}
-
-#[cfg_attr(feature = "cli", derive(clap::Args))]
-#[cfg_attr(feature = "cli",
-    clap(
-        group(clap::ArgGroup::new("sig_data").required(true)),
-    ))
-]
-pub struct CommonClientImportCoinIndexSignaturesArgs {
-    /// Id of client that is going to import the signatures
-    #[cfg_attr(feature = "cli", clap(long))]
-    pub id: String,
-
-    /// Config file of the client that is supposed to use the signatures.
-    #[cfg_attr(feature = "cli", clap(long))]
-    pub(crate) client_config: PathBuf,
-
-    /// Explicitly provide the encoded signatures data (as base58)
-    #[cfg_attr(feature = "cli", clap(long, group = "sig_data", value_parser = parse_encoded_signatures_data))]
-    pub(crate) signatures_data: Option<Vec<u8>>,
-
-    /// Specifies the path to file containing binary signatures data
-    #[cfg_attr(feature = "cli", clap(long, group = "sig_data"))]
-    pub(crate) signatures_path: Option<PathBuf>,
-
-    // currently hidden as there exists only a single serialization standard
-    #[cfg_attr(feature = "cli", clap(long, hide = true))]
-    pub(crate) version: Option<u8>,
-}
-
-pub async fn import_coin_index_signatures<C, A>(args: A) -> Result<(), C::Error>
-where
-    A: Into<CommonClientImportCoinIndexSignaturesArgs>,
-    C: CliClient,
-    C::Error: From<std::io::Error> + From<nym_id::NymIdError>,
-{
-    let common_args = args.into();
-    let id = &common_args.id;
-
-    let config = C::try_load_current_config(id).await?;
-    let paths = config.common_paths();
-
-    let credentials_store =
-        nym_credential_storage::initialise_persistent_storage(&paths.credentials_database).await;
-
-    let version = common_args.version;
-    let raw_key = match common_args.signatures_data {
-        Some(data) => data,
-        None => {
-            // SAFETY: one of those arguments must have been set
-            fs::read(common_args.signatures_path.unwrap())?
-        }
-    };
-
-    nym_id::import_coin_index_signatures(credentials_store, raw_key, version).await?;
-
-    Ok(())
-}
@@ -11,14 +11,9 @@ fn parse_encoded_credential_data(raw: &str) -> bs58::decode::Result<Vec<u8>> {
 }

 #[cfg_attr(feature = "cli", derive(clap::Args))]
-#[cfg_attr(feature = "cli",
-    clap(
-        group(clap::ArgGroup::new("cred_data").required(true)),
-        group(clap::ArgGroup::new("type").required(true)),
-    ))
-]
+#[cfg_attr(feature = "cli", clap(group(clap::ArgGroup::new("cred_data").required(true))))]
 #[derive(Debug, Clone)]
-pub struct CommonClientImportTicketBookArgs {
+pub struct CommonClientImportCredentialArgs {
    /// Id of client that is going to import the credential
    #[cfg_attr(feature = "cli", clap(long))]
    pub id: String,
@@ -31,15 +26,6 @@ pub struct CommonClientImportTicketBookArgs {
    #[cfg_attr(feature = "cli", clap(long, group = "cred_data"))]
    pub(crate) credential_path: Option<PathBuf>,

-    /// Specifies whether we're attempting to import a standalone ticketbook (i.e. serialised `IssuedTicketBook`)
-    #[cfg_attr(feature = "cli", clap(long, group = "type"))]
-    pub(crate) standalone: bool,
-
-    /// Specifies whether we're attempting to import full ticketboot
-    /// (i.e. one that **might** contain required global signatures; that is serialised `ImportableTicketBook`)
-    #[cfg_attr(feature = "cli", clap(long, group = "type"))]
-    pub(crate) full: bool,
-
    // currently hidden as there exists only a single serialization standard
    #[cfg_attr(feature = "cli", clap(long, hide = true))]
    pub(crate) version: Option<u8>,
@@ -47,7 +33,7 @@ pub struct CommonClientImportTicketBookArgs {

 pub async fn import_credential<C, A>(args: A) -> Result<(), C::Error>
 where
-    A: Into<CommonClientImportTicketBookArgs>,
+    A: Into<CommonClientImportCredentialArgs>,
    C: CliClient,
    C::Error: From<std::io::Error> + From<nym_id::NymIdError>,
 {
@@ -68,19 +54,6 @@ where
        }
    };

-    if common_args.standalone {
-        nym_id::import_standalone_ticketbook(
-            credentials_store,
-            raw_credential,
-            common_args.version,
-        )
-        .await?;
-    } else {
-        // sanity check; clap should have ensured it
-        assert!(common_args.full);
-        nym_id::import_full_ticketbook(credentials_store, raw_credential, common_args.version)
-            .await?;
-    }
-
+    nym_id::import_credential(credentials_store, raw_credential, common_args.version).await?;
    Ok(())
 }
@@ -1,68 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::cli_helpers::{CliClient, CliClientConfig};
-use std::fs;
-use std::path::PathBuf;
-
-#[cfg(feature = "cli")]
-fn parse_encoded_signatures_data(raw: &str) -> bs58::decode::Result<Vec<u8>> {
-    bs58::decode(raw).into_vec()
-}
-
-#[cfg_attr(feature = "cli", derive(clap::Args))]
-#[cfg_attr(feature = "cli",
-    clap(
-        group(clap::ArgGroup::new("sig_data").required(true)),
-    ))
-]
-pub struct CommonClientImportExpirationDateSignaturesArgs {
-    /// Id of client that is going to import the signatures
-    #[cfg_attr(feature = "cli", clap(long))]
-    pub id: String,
-
-    /// Config file of the client that is supposed to use the signatures.
-    #[cfg_attr(feature = "cli", clap(long))]
-    pub(crate) client_config: PathBuf,
-
-    /// Explicitly provide the encoded signatures data (as base58)
-    #[cfg_attr(feature = "cli", clap(long, group = "sig_data", value_parser = parse_encoded_signatures_data))]
-    pub(crate) signatures_data: Option<Vec<u8>>,
-
-    /// Specifies the path to file containing binary signatures data
-    #[cfg_attr(feature = "cli", clap(long, group = "sig_data"))]
-    pub(crate) signatures_path: Option<PathBuf>,
-
-    // currently hidden as there exists only a single serialization standard
-    #[cfg_attr(feature = "cli", clap(long, hide = true))]
-    pub(crate) version: Option<u8>,
-}
-
-pub async fn import_expiration_date_signatures<C, A>(args: A) -> Result<(), C::Error>
-where
-    A: Into<CommonClientImportExpirationDateSignaturesArgs>,
-    C: CliClient,
-    C::Error: From<std::io::Error> + From<nym_id::NymIdError>,
-{
-    let common_args = args.into();
-    let id = &common_args.id;
-
-    let config = C::try_load_current_config(id).await?;
-    let paths = config.common_paths();
-
-    let credentials_store =
-        nym_credential_storage::initialise_persistent_storage(&paths.credentials_database).await;
-
-    let version = common_args.version;
-    let raw_key = match common_args.signatures_data {
-        Some(data) => data,
-        None => {
-            // SAFETY: one of those arguments must have been set
-            fs::read(common_args.signatures_path.unwrap())?
-        }
-    };
-
-    nym_id::import_expiration_date_signatures(credentials_store, raw_key, version).await?;
-
-    Ok(())
-}
@@ -1,68 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::cli_helpers::{CliClient, CliClientConfig};
-use std::fs;
-use std::path::PathBuf;
-
-#[cfg(feature = "cli")]
-fn parse_encoded_key_data(raw: &str) -> bs58::decode::Result<Vec<u8>> {
-    bs58::decode(raw).into_vec()
-}
-
-#[cfg_attr(feature = "cli", derive(clap::Args))]
-#[cfg_attr(feature = "cli",
-    clap(
-        group(clap::ArgGroup::new("key_data_group").required(true)),
-    ))
-]
-pub struct CommonClientImportMasterVerificationKeyArgs {
-    /// Id of client that is going to import the key
-    #[cfg_attr(feature = "cli", clap(long))]
-    pub id: String,
-
-    /// Config file of the client that is supposed to use the key.
-    #[cfg_attr(feature = "cli", clap(long))]
-    pub(crate) client_config: PathBuf,
-
-    /// Explicitly provide the encoded key data (as base58)
-    #[cfg_attr(feature = "cli", clap(long, group = "key_data_group", value_parser = parse_encoded_key_data))]
-    pub(crate) key_data: Option<Vec<u8>>,
-
-    /// Specifies the path to file containing binary key data
-    #[cfg_attr(feature = "cli", clap(long, group = "key_data_group"))]
-    pub(crate) key_path: Option<PathBuf>,
-
-    // currently hidden as there exists only a single serialization standard
-    #[cfg_attr(feature = "cli", clap(long, hide = true))]
-    pub(crate) version: Option<u8>,
-}
-
-pub async fn import_master_verification_key<C, A>(args: A) -> Result<(), C::Error>
-where
-    A: Into<CommonClientImportMasterVerificationKeyArgs>,
-    C: CliClient,
-    C::Error: From<std::io::Error> + From<nym_id::NymIdError>,
-{
-    let common_args = args.into();
-    let id = &common_args.id;
-
-    let config = C::try_load_current_config(id).await?;
-    let paths = config.common_paths();
-
-    let credentials_store =
-        nym_credential_storage::initialise_persistent_storage(&paths.credentials_database).await;
-
-    let version = common_args.version;
-    let raw_key = match common_args.key_data {
-        Some(data) => data,
-        None => {
-            // SAFETY: one of those arguments must have been set
-            fs::read(common_args.key_path.unwrap())?
-        }
-    };
-
-    nym_id::import_master_verification_key(credentials_store, raw_key, version).await?;
-
-    Ok(())
-}
@@ -2,10 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 pub mod client_add_gateway;
-pub mod client_import_coin_index_signatures;
 pub mod client_import_credential;
-pub mod client_import_expiration_date_signatures;
-pub mod client_import_master_verification_key;
 pub mod client_init;
 pub mod client_list_gateways;
 pub mod client_run;
@@ -354,14 +354,12 @@ where
        config: &Config,
        initialisation_result: InitialisationResult,
        bandwidth_controller: Option<BandwidthController<C, S::CredentialStore>>,
-        details_store: &S::GatewaysDetailsStore,
        packet_router: PacketRouter,
        shutdown: TaskClient,
    ) -> Result<GatewayClient<C, S::CredentialStore>, ClientCoreError>
    where
        <S::KeyStore as KeyStore>::StorageError: Send + Sync + 'static,
        <S::CredentialStore as CredentialStorage>::StorageError: Send + Sync + 'static,
-        <S::GatewaysDetailsStore as GatewaysDetailsStore>::StorageError: Sync + Send,
    {
        let managed_keys = initialisation_result.client_keys;
        let GatewayDetails::Remote(details) = initialisation_result.gateway_registration.details
@@ -389,57 +387,23 @@ where
                        ),
                    cfg,
                    managed_keys.identity_keypair(),
-                    Some(details.shared_key),
+                    Some(details.derived_aes128_ctr_blake3_hmac_keys),
                    packet_router,
                    bandwidth_controller,
                    shutdown,
                )
            };

-        let gateway_failure = |err| {
-            log::error!("Could not authenticate and start up the gateway connection - {err}");
-            ClientCoreError::GatewayClientError {
-                gateway_id: details.gateway_id.to_base58_string(),
-                source: err,
-            }
-        };
-
-        // the gateway client startup procedure is slightly more complicated now
-        // we need to:
-        // - perform handshake (reg or auth)
-        // - check for key upgrade
-        // - maybe perform another upgrade handshake
-        // - check for bandwidth
-        // - start background tasks
-        let auth_res = gateway_client
-            .perform_initial_authentication()
-            .await
-            .map_err(gateway_failure)?;
-
-        if auth_res.requires_key_upgrade {
-            // drop the shared_key arc because we don't need it and we can't hold it for the purposes of upgrade
-            drop(auth_res);
-
-            let updated_key = gateway_client
-                .upgrade_key_authenticated()
-                .await
-                .map_err(gateway_failure)?;
-
-            details_store
-                .upgrade_stored_remote_gateway_key(gateway_client.gateway_identity(), &updated_key)
-                .await.map_err(|err| {
-                    error!("failed to store upgraded gateway key! this connection might be forever broken now: {err}");
-                    ClientCoreError::GatewaysDetailsStoreError { source: Box::new(err) }
-            })?
-        }
-
        gateway_client
-            .claim_initial_bandwidth()
+            .authenticate_and_start()
            .await
-            .map_err(gateway_failure)?;
-        gateway_client
-            .start_listening_for_mixnet_messages()
-            .map_err(gateway_failure)?;
+            .map_err(|err| {
+                log::error!("Could not authenticate and start up the gateway connection - {err}");
+                ClientCoreError::GatewayClientError {
+                    gateway_id: details.gateway_id.to_base58_string(),
+                    source: err,
+                }
+            })?;

        Ok(gateway_client)
    }
@@ -449,14 +413,12 @@ where
        config: &Config,
        initialisation_result: InitialisationResult,
        bandwidth_controller: Option<BandwidthController<C, S::CredentialStore>>,
-        details_store: &S::GatewaysDetailsStore,
        packet_router: PacketRouter,
        mut shutdown: TaskClient,
    ) -> Result<Box<dyn GatewayTransceiver + Send>, ClientCoreError>
    where
        <S::KeyStore as KeyStore>::StorageError: Send + Sync + 'static,
        <S::CredentialStore as CredentialStorage>::StorageError: Send + Sync + 'static,
-        <S::GatewaysDetailsStore as GatewaysDetailsStore>::StorageError: Sync + Send,
    {
        // if we have setup custom gateway sender and persisted details agree with it, return it
        if let Some(mut custom_gateway_transceiver) = custom_gateway_transceiver {
@@ -467,7 +429,7 @@ where
            {
                Err(ClientCoreError::CustomGatewaySelectionExpected)
            } else {
-                // and make sure to invalidate the task client, so we wouldn't cause premature shutdown
+                // and make sure to invalidate the task client so we wouldn't cause premature shutdown
                shutdown.disarm();
                custom_gateway_transceiver.set_packet_router(packet_router)?;
                Ok(custom_gateway_transceiver)
@@ -479,7 +441,6 @@ where
            config,
            initialisation_result,
            bandwidth_controller,
-            details_store,
            packet_router,
            shutdown,
        )
@@ -669,8 +630,7 @@ where
        )
        .await?;

-        let (reply_storage_backend, credential_store, details_store) =
-            self.client_store.into_runtime_stores();
+        let (reply_storage_backend, credential_store) = self.client_store.into_runtime_stores();

        // channels for inter-component communication
        // TODO: make the channels be internally created by the relevant components
@@ -745,7 +705,6 @@ where
            self.config,
            init_res,
            bandwidth_controller,
-            &details_store,
            gateway_packet_router,
            shutdown.fork("gateway_transceiver"),
        )
@@ -13,7 +13,7 @@ pub mod v1_1_33 {
    use nym_client_core_gateways_storage::{
        CustomGatewayDetails, GatewayDetails, GatewayRegistration, RemoteGatewayDetails,
    };
-    use nym_gateway_requests::shared_key::LegacySharedKeys;
+    use nym_gateway_requests::registration::handshake::SharedKeys;
    use serde::{Deserialize, Serialize};
    use sha2::{digest::Digest, Sha256};
    use std::ops::Deref;
@@ -58,7 +58,7 @@ pub mod v1_1_33 {
    }

    impl PersistedGatewayConfig {
-        fn verify(&self, shared_key: &LegacySharedKeys) -> bool {
+        fn verify(&self, shared_key: &SharedKeys) -> bool {
            let key_bytes = Zeroizing::new(shared_key.to_bytes());

            let mut key_hasher = Sha256::new();
@@ -74,7 +74,7 @@ pub mod v1_1_33 {
        gateway_id: String,
    }

-    fn load_shared_key<P: AsRef<Path>>(path: P) -> Result<LegacySharedKeys, ClientCoreError> {
+    fn load_shared_key<P: AsRef<Path>>(path: P) -> Result<SharedKeys, ClientCoreError> {
        // the shared key was a simple pem file
        Ok(nym_pemstore::load_key(path)?)
    }
@@ -83,7 +83,7 @@ pub mod v1_1_33 {
        gateway_id: String,
        gateway_owner: String,
        gateway_listener: String,
-        gateway_shared_key: LegacySharedKeys,
+        gateway_shared_key: SharedKeys,
    ) -> Result<GatewayDetails, ClientCoreError> {
        Ok(GatewayDetails::Remote(RemoteGatewayDetails {
            gateway_id: gateway_id
@@ -91,7 +91,7 @@ pub mod v1_1_33 {
                .map_err(|err| ClientCoreError::UpgradeFailure {
                    message: format!("the stored gateway id was malformed: {err}"),
                })?,
-            shared_key: Arc::new(gateway_shared_key.into()),
+            derived_aes128_ctr_blake3_hmac_keys: Arc::new(gateway_shared_key),
            gateway_owner_address: Some(gateway_owner.parse().map_err(|err| {
                ClientCoreError::UpgradeFailure {
                    message: format!("the stored gateway owner address was malformed: {err}"),
@@ -49,13 +49,7 @@ pub trait MixnetClientStorage {
    type CredentialStore: CredentialStorage;
    type GatewaysDetailsStore: GatewaysDetailsStore;

-    fn into_runtime_stores(
-        self,
-    ) -> (
-        Self::ReplyStore,
-        Self::CredentialStore,
-        Self::GatewaysDetailsStore,
-    );
+    fn into_runtime_stores(self) -> (Self::ReplyStore, Self::CredentialStore);

    fn key_store(&self) -> &Self::KeyStore;
    fn reply_store(&self) -> &Self::ReplyStore;
@@ -83,18 +77,8 @@ impl MixnetClientStorage for Ephemeral {
    type CredentialStore = EphemeralCredentialStorage;
    type GatewaysDetailsStore = InMemGatewaysDetails;

-    fn into_runtime_stores(
-        self,
-    ) -> (
-        Self::ReplyStore,
-        Self::CredentialStore,
-        Self::GatewaysDetailsStore,
-    ) {
-        (
-            self.reply_store,
-            self.credential_store,
-            self.gateway_details_store,
-        )
+    fn into_runtime_stores(self) -> (Self::ReplyStore, Self::CredentialStore) {
+        (self.reply_store, self.credential_store)
    }

    fn key_store(&self) -> &Self::KeyStore {
@@ -184,18 +168,8 @@ impl MixnetClientStorage for OnDiskPersistent {
    type CredentialStore = PersistentCredentialStorage;
    type GatewaysDetailsStore = OnDiskGatewaysDetails;

-    fn into_runtime_stores(
-        self,
-    ) -> (
-        Self::ReplyStore,
-        Self::CredentialStore,
-        Self::GatewaysDetailsStore,
-    ) {
-        (
-            self.reply_store,
-            self.credential_store,
-            self.gateway_details_store,
-        )
+    fn into_runtime_stores(self) -> (Self::ReplyStore, Self::CredentialStore) {
+        (self.reply_store, self.credential_store)
    }

    fn key_store(&self) -> &Self::KeyStore {
@@ -3,7 +3,7 @@

 use crate::client::key_manager::persistence::KeyStore;
 use nym_crypto::asymmetric::{encryption, identity};
-use nym_gateway_requests::shared_key::{LegacySharedKeys, SharedGatewayKey, SharedSymmetricKey};
+use nym_gateway_requests::registration::handshake::SharedKeys;
 use nym_sphinx::acknowledgements::AckKey;
 use rand::{CryptoRng, RngCore};
 use std::sync::Arc;
@@ -84,7 +84,5 @@ fn _assert_keys_zeroize_on_drop() {
    _assert_zeroize_on_drop::<identity::KeyPair>();
    _assert_zeroize_on_drop::<encryption::KeyPair>();
    _assert_zeroize_on_drop::<AckKey>();
-    _assert_zeroize_on_drop::<LegacySharedKeys>();
-    _assert_zeroize_on_drop::<SharedSymmetricKey>();
-    _assert_zeroize_on_drop::<SharedGatewayKey>();
+    _assert_zeroize_on_drop::<SharedKeys>();
 }
@@ -102,7 +102,6 @@ impl TopologyRefresher {
            .current_topology()
            .await
            .ok_or(NymTopologyError::EmptyNetworkTopology)?;
-
        if !topology.gateway_exists(gateway) {
            return Err(NymTopologyError::NonExistentGatewayError {
                identity_key: gateway.to_base58_string(),
@@ -214,11 +214,6 @@ pub enum ClientCoreError {

    #[error("this client has already registered with gateway {gateway_id}")]
    AlreadyRegistered { gateway_id: String },
-
-    #[error(
-        "fresh registration with gateway {gateway_id} somehow requires an additional key upgrade!"
-    )]
-    UnexpectedKeyUpgrade { gateway_id: String },
 }

 /// Set of messages that the client can send to listeners via the task manager
@@ -320,7 +320,7 @@ pub(super) async fn register_with_gateway(
            source: err,
        }
    })?;
-    let auth_response = gateway_client
+    let shared_keys = gateway_client
        .perform_initial_authentication()
        .await
        .map_err(|err| {
@@ -330,17 +330,8 @@ pub(super) async fn register_with_gateway(
                source: err,
            }
        })?;
-
-    // this should NEVER happen, if it did, it means the function was misused,
-    // because for any fresh **registration**, the derived key is always up to date
-    if auth_response.requires_key_upgrade {
-        return Err(ClientCoreError::UnexpectedKeyUpgrade {
-            gateway_id: gateway_id.to_base58_string(),
-        });
-    }
-
    Ok(RegistrationResult {
-        shared_keys: auth_response.initial_shared_key,
+        shared_keys,
        authenticated_ephemeral_client: gateway_client,
    })
 }
@@ -11,7 +11,7 @@ use nym_client_core_gateways_storage::{
 };
 use nym_crypto::asymmetric::identity;
 use nym_gateway_client::client::InitGatewayClient;
-use nym_gateway_requests::shared_key::SharedGatewayKey;
+use nym_gateway_requests::registration::handshake::SharedKeys;
 use nym_sphinx::addressing::clients::Recipient;
 use nym_topology::gateway;
 use nym_validator_client::client::IdentityKey;
@@ -104,7 +104,7 @@ impl SelectedGateway {
 /// - shared keys derived between ourselves and the node
 /// - an authenticated handle of an ephemeral handle created for the purposes of registration
 pub struct RegistrationResult {
-    pub shared_keys: Arc<SharedGatewayKey>,
+    pub shared_keys: Arc<SharedKeys>,
    pub authenticated_ephemeral_client: InitGatewayClient,
 }

@@ -11,14 +11,13 @@ license.workspace = true
 # TODO: (for this and other crates), similarly to 'tokio', import only required "futures" modules rather than
 # the entire crate
 futures = { workspace = true }
-tracing = { workspace = true }
+log = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
 rand = { workspace = true }
 tokio = { workspace = true, features = ["macros"] }
 si-scale = { workspace = true }
 time.workspace = true
-zeroize.workspace = true

 # internal
 nym-bandwidth-controller = { path = "../../bandwidth-controller" }
@@ -44,7 +43,7 @@ workspace = true
 features = ["macros", "rt", "net", "sync", "time"]

 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-stream]
-workspace = true
+version = "0.1.11"
 features = ["net", "sync", "time"]

 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-tungstenite]
@@ -2,37 +2,21 @@
 // SPDX-License-Identifier: Apache-2.0

 use si_scale::helpers::bibytes2;
-use std::sync::atomic::{AtomicBool, AtomicI64, Ordering};
+use std::sync::atomic::{AtomicI64, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
 use time::OffsetDateTime;

-pub(crate) struct BandwidthClaimGuard {
-    inner: Arc<ClientBandwidthInner>,
-}
-
-impl Drop for BandwidthClaimGuard {
-    fn drop(&mut self) {
-        let old = self.inner.claiming_more.swap(false, Ordering::SeqCst);
-        assert!(
-            old,
-            "critical failure: there were multiple BandwidthClaimGuard existing"
-        )
-    }
-}
-
-#[derive(Clone)]
+#[derive(Clone, Default)]
 pub struct ClientBandwidth {
    inner: Arc<ClientBandwidthInner>,
 }

+#[derive(Default)]
 struct ClientBandwidthInner {
    /// the actual bandwidth amount (in bytes) available
    available: AtomicI64,

-    /// flag to indicate whether this client is currently in the process of claiming additional bandwidth
-    claiming_more: AtomicBool,
-
    /// defines the timestamp when the bandwidth information has been logged to the logs stream
    last_logged_ts: AtomicI64,

@@ -45,28 +29,11 @@ impl ClientBandwidth {
        ClientBandwidth {
            inner: Arc::new(ClientBandwidthInner {
                available: AtomicI64::new(0),
-                claiming_more: AtomicBool::new(false),
                last_logged_ts: AtomicI64::new(0),
                last_updated_ts: AtomicI64::new(0),
            }),
        }
    }
-
-    pub(crate) fn begin_bandwidth_claim(&self) -> Option<BandwidthClaimGuard> {
-        if self
-            .inner
-            .claiming_more
-            .compare_exchange(false, true, Ordering::SeqCst, Ordering::SeqCst)
-            .is_ok()
-        {
-            Some(BandwidthClaimGuard {
-                inner: self.inner.clone(),
-            })
-        } else {
-            None
-        }
-    }
-
    pub(crate) fn remaining(&self) -> i64 {
        self.inner.available.load(Ordering::Acquire)
    }
@@ -86,9 +53,9 @@ impl ClientBandwidth {
        let remaining_bi2 = bibytes2(remaining as f64);

        if remaining < 0 {
-            tracing::warn!("OUT OF BANDWIDTH. remaining: {remaining_bi2}");
+            log::warn!("OUT OF BANDWIDTH. remaining: {remaining_bi2}");
        } else {
-            tracing::info!("remaining bandwidth: {remaining_bi2}");
+            log::info!("remaining bandwidth: {remaining_bi2}");
        }

        self.inner
@@ -1,6 +1,5 @@
 // Copyright 2021-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
-
 use crate::bandwidth::ClientBandwidth;
 use crate::client::config::GatewayClientConfig;
 use crate::error::GatewayClientError;
@@ -12,24 +11,24 @@ use crate::socket_state::{ws_fd, PartiallyDelegatedHandle, SocketState};
 use crate::traits::GatewayPacketRouter;
 use crate::{cleanup_socket_message, try_decrypt_binary_message};
 use futures::{SinkExt, StreamExt};
+use log::*;
 use nym_bandwidth_controller::{BandwidthController, BandwidthStatusMessage};
 use nym_credential_storage::ephemeral_storage::EphemeralStorage as EphemeralCredentialStorage;
 use nym_credential_storage::storage::Storage as CredentialStorage;
 use nym_credentials::CredentialSpendingData;
 use nym_crypto::asymmetric::identity;
-use nym_gateway_requests::registration::handshake::client_handshake;
+use nym_gateway_requests::authentication::encrypted_address::EncryptedAddressBytes;
+use nym_gateway_requests::iv::IV;
+use nym_gateway_requests::registration::handshake::{client_handshake, SharedKeys};
 use nym_gateway_requests::{
-    BinaryRequest, ClientControlRequest, ClientRequest, SensitiveServerResponse, ServerResponse,
-    SharedGatewayKey, SharedSymmetricKey, AES_GCM_SIV_PROTOCOL_VERSION,
-    CREDENTIAL_UPDATE_V2_PROTOCOL_VERSION, CURRENT_PROTOCOL_VERSION,
+    BinaryRequest, ClientControlRequest, ServerResponse, CREDENTIAL_UPDATE_V2_PROTOCOL_VERSION,
+    CURRENT_PROTOCOL_VERSION,
 };
 use nym_sphinx::forwarding::packet::MixPacket;
 use nym_task::TaskClient;
 use nym_validator_client::nyxd::contract_traits::DkgQueryClient;
 use rand::rngs::OsRng;
 use std::sync::Arc;
-use tracing::instrument;
-use tracing::*;
 use tungstenite::protocol::Message;
 use url::Url;

@@ -46,7 +45,6 @@ use std::os::raw::c_int as RawFd;
 use wasm_utils::websocket::JSWebsocket;
 #[cfg(target_arch = "wasm32")]
 use wasmtimer::tokio::sleep;
-use zeroize::Zeroizing;

 pub mod config;

@@ -73,13 +71,6 @@ impl GatewayConfig {
    }
 }

-#[must_use]
-#[derive(Debug)]
-pub struct AuthenticationResponse {
-    pub initial_shared_key: Arc<SharedGatewayKey>,
-    pub requires_key_upgrade: bool,
-}
-
 // TODO: this should be refactored into a state machine that keeps track of its authentication state
 pub struct GatewayClient<C, St = EphemeralCredentialStorage> {
    pub cfg: GatewayClientConfig,
@@ -89,7 +80,7 @@ pub struct GatewayClient<C, St = EphemeralCredentialStorage> {
    gateway_address: String,
    gateway_identity: identity::PublicKey,
    local_identity: Arc<identity::KeyPair>,
-    shared_key: Option<Arc<SharedGatewayKey>>,
+    shared_key: Option<Arc<SharedKeys>>,
    connection: SocketState,
    packet_router: PacketRouter,
    bandwidth_controller: Option<BandwidthController<C, St>>,
@@ -107,7 +98,7 @@ impl<C, St> GatewayClient<C, St> {
        gateway_config: GatewayConfig,
        local_identity: Arc<identity::KeyPair>,
        // TODO: make it mandatory. if you don't want to pass it, use `new_init`
-        shared_key: Option<Arc<SharedGatewayKey>>,
+        shared_key: Option<Arc<SharedKeys>>,
        packet_router: PacketRouter,
        bandwidth_controller: Option<BandwidthController<C, St>>,
        task_client: TaskClient,
@@ -302,7 +293,7 @@ impl<C, St> GatewayClient<C, St> {
    // as we need to be able to write the request and read the subsequent response
    async fn send_websocket_message(
        &mut self,
-        msg: impl Into<Message>,
+        msg: Message,
    ) -> Result<ServerResponse, GatewayClientError> {
        let should_restart_mixnet_listener = if self.connection.is_partially_delegated() {
            self.recover_socket_connection().await?;
@@ -316,7 +307,7 @@ impl<C, St> GatewayClient<C, St> {
            SocketState::NotConnected => return Err(GatewayClientError::ConnectionNotEstablished),
            _ => return Err(GatewayClientError::ConnectionInInvalidState),
        };
-        conn.send(msg.into()).await?;
+        conn.send(msg).await?;
        let response = self.read_control_response().await;

        if should_restart_mixnet_listener {
@@ -407,19 +398,13 @@ impl<C, St> GatewayClient<C, St> {
        }
    }

-    async fn register(
-        &mut self,
-        derive_aes256_gcm_siv_key: bool,
-    ) -> Result<(), GatewayClientError> {
+    async fn register(&mut self) -> Result<(), GatewayClientError> {
        if !self.connection.is_established() {
            return Err(GatewayClientError::ConnectionNotEstablished);
        }

        debug_assert!(self.connection.is_available());
-        log::debug!(
-            "registering with gateway. using legacy key derivation: {}",
-            !derive_aes256_gcm_siv_key
-        );
+        log::debug!("Registering gateway");

        // it's fine to instantiate it here as it's only used once (during authentication or registration)
        // and putting it into the GatewayClient struct would be a hassle
@@ -432,15 +417,11 @@ impl<C, St> GatewayClient<C, St> {
                self.local_identity.as_ref(),
                self.gateway_identity,
                self.cfg.bandwidth.require_tickets,
-                derive_aes256_gcm_siv_key,
-                #[cfg(not(target_arch = "wasm32"))]
-                self.task_client.clone(),
            )
            .await
            .map_err(GatewayClientError::RegistrationFailure),
-            _ => return Err(GatewayClientError::ConnectionInInvalidState),
+            _ => unreachable!(),
        }?;
-
        let (authentication_status, gateway_protocol) = match self.read_control_response().await? {
            ServerResponse::Register {
                protocol_version,
@@ -449,7 +430,7 @@ impl<C, St> GatewayClient<C, St> {
            ServerResponse::Error { message } => {
                return Err(GatewayClientError::GatewayError(message))
            }
-            other => return Err(GatewayClientError::UnexpectedResponse { name: other.name() }),
+            _ => return Err(GatewayClientError::UnexpectedResponse),
        };

        self.check_gateway_protocol(gateway_protocol)?;
@@ -465,93 +446,41 @@ impl<C, St> GatewayClient<C, St> {
        Ok(())
    }

-    pub async fn upgrade_key_authenticated(
+    async fn authenticate(
        &mut self,
-    ) -> Result<Zeroizing<SharedSymmetricKey>, GatewayClientError> {
-        info!("*** STARTING AES128CTR-HMAC KEY UPGRADE INTO AES256GCM-SIV***");
-
+        shared_key: Option<SharedKeys>,
+    ) -> Result<(), GatewayClientError> {
+        if shared_key.is_none() && self.shared_key.is_none() {
+            return Err(GatewayClientError::NoSharedKeyAvailable);
+        }
        if !self.connection.is_established() {
            return Err(GatewayClientError::ConnectionNotEstablished);
        }
+        log::debug!("Authenticating with gateway");

-        if !self.authenticated {
-            return Err(GatewayClientError::NotAuthenticated);
-        }
-
-        let Some(shared_key) = self.shared_key.as_ref() else {
-            return Err(GatewayClientError::NoSharedKeyAvailable);
-        };
-
-        if !shared_key.is_legacy() {
-            return Err(GatewayClientError::KeyAlreadyUpgraded);
-        }
-
-        // make sure we have the only reference, so we could safely swap it
-        if Arc::strong_count(shared_key) != 1 {
-            return Err(GatewayClientError::KeyAlreadyInUse);
-        }
-
-        assert!(shared_key.is_legacy());
-        let legacy_key = shared_key.unwrap_legacy();
-        let (updated_key, hkdf_salt) = legacy_key.upgrade();
-        let derived_key_digest = updated_key.digest();
-
-        let upgrade_request = ClientRequest::UpgradeKey {
-            hkdf_salt,
-            derived_key_digest,
-        }
-        .encrypt(legacy_key)?;
-
-        info!("sending upgrade request and awaiting the acknowledgement back");
-        let (ciphertext, nonce) = match self.send_websocket_message(upgrade_request).await? {
-            ServerResponse::EncryptedResponse { ciphertext, nonce } => (ciphertext, nonce),
-            ServerResponse::Error { message } => {
-                return Err(GatewayClientError::GatewayError(message))
-            }
-            other => return Err(GatewayClientError::UnexpectedResponse { name: other.name() }),
-        };
-
-        // attempt to decrypt it using NEW key
-        let Ok(response) = SensitiveServerResponse::decrypt(&ciphertext, &nonce, &updated_key)
-        else {
-            return Err(GatewayClientError::FatalKeyUpgradeFailure);
-        };
-
-        match response {
-            SensitiveServerResponse::KeyUpgradeAck { .. } => {
-                info!("received key upgrade acknowledgement")
-            }
-            _ => return Err(GatewayClientError::FatalKeyUpgradeFailure),
-        }
-
-        // perform in memory swap and make a copy for updating storage
-        let zeroizing_updated_key = updated_key.zeroizing_clone();
-        self.shared_key = Some(Arc::new(updated_key.into()));
-
-        Ok(zeroizing_updated_key)
-    }
-
-    async fn authenticate(&mut self) -> Result<(), GatewayClientError> {
-        let Some(shared_key) = self.shared_key.as_ref() else {
-            return Err(GatewayClientError::NoSharedKeyAvailable);
-        };
-
-        if !self.connection.is_established() {
-            return Err(GatewayClientError::ConnectionNotEstablished);
-        }
-        debug!("authenticating with gateway");
+        // it's fine to instantiate it here as it's only used once (during authentication or registration)
+        // and putting it into the GatewayClient struct would be a hassle
+        let mut rng = OsRng;

+        // because of the previous check one of the unwraps MUST succeed
+        let shared_key = shared_key
+            .as_ref()
+            .unwrap_or_else(|| self.shared_key.as_ref().unwrap());
+        let iv = IV::new_random(&mut rng);
        let self_address = self
            .local_identity
            .as_ref()
            .public_key()
            .derive_destination_address();
+        let encrypted_address = EncryptedAddressBytes::new(&self_address, shared_key, &iv);

        let msg = ClientControlRequest::new_authenticate(
            self_address,
-            shared_key,
+            encrypted_address,
+            iv,
            self.cfg.bandwidth.require_tickets,
-        )?;
+        )
+        .into();

        match self.send_websocket_message(msg).await? {
            ServerResponse::Authenticate {
@@ -565,101 +494,39 @@ impl<C, St> GatewayClient<C, St> {

                self.negotiated_protocol = protocol_version;
                log::debug!("authenticated: {status}, bandwidth remaining: {bandwidth_remaining}");
-
                self.task_client.send_status_msg(Box::new(
                    BandwidthStatusMessage::RemainingBandwidth(bandwidth_remaining),
                ));
                Ok(())
            }
            ServerResponse::Error { message } => Err(GatewayClientError::GatewayError(message)),
-            other => Err(GatewayClientError::UnexpectedResponse { name: other.name() }),
+            _ => Err(GatewayClientError::UnexpectedResponse),
        }
    }

    /// Helper method to either call register or authenticate based on self.shared_key value
-    #[instrument(skip_all,
-        fields(
-            gateway = %self.gateway_identity,
-            gateway_address = %self.gateway_address
-        )
-    )]
    pub async fn perform_initial_authentication(
        &mut self,
-    ) -> Result<AuthenticationResponse, GatewayClientError> {
-        if !self.connection.is_established() {
-            self.establish_connection().await?;
-        }
-
-        // 1. check gateway's protocol version
-        let supports_aes_gcm_siv = match self.get_gateway_protocol().await {
-            Ok(protocol) => protocol >= AES_GCM_SIV_PROTOCOL_VERSION,
-            Err(_) => {
-                // if we failed to send the request, it means the gateway is running the old binary,
-                // so it has reset our connection - we have to reconnect
-                self.establish_connection().await?;
-                false
-            }
-        };
-
-        if !supports_aes_gcm_siv {
-            warn!("this gateway is on an old version that doesn't support AES256-GCM-SIV");
-        }
-
+    ) -> Result<Arc<SharedKeys>, GatewayClientError> {
        if self.authenticated {
            debug!("Already authenticated");
            return if let Some(shared_key) = &self.shared_key {
-                Ok(AuthenticationResponse {
-                    initial_shared_key: Arc::clone(shared_key),
-                    requires_key_upgrade: shared_key.is_legacy() && supports_aes_gcm_siv,
-                })
+                Ok(Arc::clone(shared_key))
            } else {
                Err(GatewayClientError::AuthenticationFailureWithPreexistingSharedKey)
            };
        }

        if self.shared_key.is_some() {
-            self.authenticate().await?;
-
-            if self.authenticated {
-                // if we are authenticated it means we MUST have an associated shared_key
-                let shared_key = self.shared_key.as_ref().unwrap();
-
-                let requires_key_upgrade = shared_key.is_legacy() && supports_aes_gcm_siv;
-
-                Ok(AuthenticationResponse {
-                    initial_shared_key: Arc::clone(shared_key),
-                    requires_key_upgrade,
-                })
-            } else {
-                Err(GatewayClientError::AuthenticationFailure)
-            }
+            self.authenticate(None).await?;
        } else {
-            self.register(supports_aes_gcm_siv).await?;
-
-            // if registration didn't return an error, we MUST have an associated shared key
-            let shared_key = self.shared_key.as_ref().unwrap();
-
-            // we're always registering with the highest supported protocol,
-            // so no upgrades are required
-            Ok(AuthenticationResponse {
-                initial_shared_key: Arc::clone(shared_key),
-                requires_key_upgrade: false,
-            })
+            self.register().await?;
        }
-    }
-
-    pub async fn get_gateway_protocol(&mut self) -> Result<u8, GatewayClientError> {
-        if !self.connection.is_established() {
-            return Err(GatewayClientError::ConnectionNotEstablished);
-        }
-
-        match self
-            .send_websocket_message(ClientControlRequest::SupportedProtocol {})
-            .await?
-        {
-            ServerResponse::SupportedProtocol { version } => Ok(version),
-            ServerResponse::Error { message } => Err(GatewayClientError::GatewayError(message)),
-            other => Err(GatewayClientError::UnexpectedResponse { name: other.name() }),
+        if self.authenticated {
+            // if we are authenticated it means we MUST have an associated shared_key
+            Ok(Arc::clone(self.shared_key.as_ref().unwrap()))
+        } else {
+            Err(GatewayClientError::AuthenticationFailure)
        }
    }

@@ -667,17 +534,22 @@ impl<C, St> GatewayClient<C, St> {
        &mut self,
        credential: CredentialSpendingData,
    ) -> Result<(), GatewayClientError> {
+        let mut rng = OsRng;
+        let iv = IV::new_random(&mut rng);
+
        let msg = ClientControlRequest::new_enc_ecash_credential(
            credential,
            self.shared_key.as_ref().unwrap(),
-        )?;
+            iv,
+        )
+        .into();
        let bandwidth_remaining = match self.send_websocket_message(msg).await? {
            ServerResponse::Bandwidth { available_total } => Ok(available_total),
            ServerResponse::Error { message } => Err(GatewayClientError::GatewayError(message)),
            ServerResponse::TypedError { error } => {
                Err(GatewayClientError::TypedGatewayError(error))
            }
-            other => Err(GatewayClientError::UnexpectedResponse { name: other.name() }),
+            _ => Err(GatewayClientError::UnexpectedResponse),
        }?;

        // TODO: create tracing span
@@ -688,11 +560,11 @@ impl<C, St> GatewayClient<C, St> {
    }

    async fn try_claim_testnet_bandwidth(&mut self) -> Result<(), GatewayClientError> {
-        let msg = ClientControlRequest::ClaimFreeTestnetBandwidth;
+        let msg = ClientControlRequest::ClaimFreeTestnetBandwidth.into();
        let bandwidth_remaining = match self.send_websocket_message(msg).await? {
            ServerResponse::Bandwidth { available_total } => Ok(available_total),
            ServerResponse::Error { message } => Err(GatewayClientError::GatewayError(message)),
-            other => Err(GatewayClientError::UnexpectedResponse { name: other.name() }),
+            _ => Err(GatewayClientError::UnexpectedResponse),
        }?;

        info!("managed to claim testnet bandwidth");
@@ -724,11 +596,6 @@ impl<C, St> GatewayClient<C, St> {
            return Err(GatewayClientError::NoBandwidthControllerAvailable);
        }

-        let Some(_claim_guard) = self.bandwidth.begin_bandwidth_claim() else {
-            debug!("there's already an existing bandwidth claim ongoing");
-            return Ok(());
-        };
-
        warn!("Not enough bandwidth. Trying to get more bandwidth, this might take a while");
        if !self.cfg.bandwidth.require_tickets {
            info!("The client is running in disabled credentials mode - attempting to claim bandwidth without a credential");
@@ -796,10 +663,10 @@ impl<C, St> GatewayClient<C, St> {
            return Err(GatewayClientError::ConnectionNotEstablished);
        }

-        let messages: Result<Vec<_>, _> = packets
+        let messages: Vec<_> = packets
            .into_iter()
            .map(|mix_packet| {
-                BinaryRequest::ForwardSphinx { packet: mix_packet }.into_ws_message(
+                BinaryRequest::new_forward_request(mix_packet).into_ws_message(
                    self.shared_key
                        .as_ref()
                        .expect("no shared key present even though we're authenticated!"),
@@ -808,7 +675,7 @@ impl<C, St> GatewayClient<C, St> {
            .collect();

        if let Err(err) = self
-            .batch_send_websocket_messages_without_response(messages?)
+            .batch_send_websocket_messages_without_response(messages)
            .await
        {
            if err.is_closed_connection() && self.cfg.connection.should_reconnect_on_failure {
@@ -872,11 +739,11 @@ impl<C, St> GatewayClient<C, St> {
        }
        // note: into_ws_message encrypts the requests and adds a MAC on it. Perhaps it should
        // be more explicit in the naming?
-        let msg = BinaryRequest::ForwardSphinx { packet: mix_packet }.into_ws_message(
+        let msg = BinaryRequest::new_forward_request(mix_packet).into_ws_message(
            self.shared_key
                .as_ref()
                .expect("no shared key present even though we're authenticated!"),
-        )?;
+        );
        self.send_with_reconnection_on_failure(msg).await
    }

@@ -936,8 +803,8 @@ impl<C, St> GatewayClient<C, St> {
            self.establish_connection().await?;
        }

-        // if we're reconnecting, because we lost connection, we need to re-authenticate the connection
-        self.authenticate().await?;
+        // TODO: the name of this method is very deceiving
+        self.perform_initial_authentication().await?;

        // this call is NON-blocking
        self.start_listening_for_mixnet_messages()?;
@@ -951,16 +818,16 @@ impl<C, St> GatewayClient<C, St> {
        Ok(())
    }

-    pub async fn claim_initial_bandwidth(&mut self) -> Result<(), GatewayClientError>
+    pub async fn authenticate_and_start(&mut self) -> Result<Arc<SharedKeys>, GatewayClientError>
    where
        C: DkgQueryClient + Send + Sync,
        St: CredentialStorage,
        <St as CredentialStorage>::StorageError: Send + Sync + 'static,
    {
-        if !self.authenticated {
-            return Err(GatewayClientError::NotAuthenticated);
+        if !self.connection.is_established() {
+            self.establish_connection().await?;
        }
-
+        let shared_key = self.perform_initial_authentication().await?;
        let bandwidth_remaining = self.bandwidth.remaining();
        if bandwidth_remaining < self.cfg.bandwidth.remaining_bandwidth_threshold {
            self.cfg
@@ -969,20 +836,6 @@ impl<C, St> GatewayClient<C, St> {
            info!("Claiming more bandwidth with existing credentials. Stop the process now if you don't want that to happen.");
            self.claim_bandwidth().await?;
        }
-        Ok(())
-    }
-
-    #[deprecated(note = "this method does not deal with upgraded keys for legacy clients")]
-    pub async fn authenticate_and_start(
-        &mut self,
-    ) -> Result<AuthenticationResponse, GatewayClientError>
-    where
-        C: DkgQueryClient + Send + Sync,
-        St: CredentialStorage,
-        <St as CredentialStorage>::StorageError: Send + Sync + 'static,
-    {
-        let shared_key = self.perform_initial_authentication().await?;
-        self.claim_initial_bandwidth().await?;

        // this call is NON-blocking
        self.start_listening_for_mixnet_messages()?;
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use nym_gateway_requests::registration::handshake::error::HandshakeError;
-use nym_gateway_requests::{GatewayRequestsError, SimpleGatewayRequestsError};
+use nym_gateway_requests::SimpleGatewayRequestsError;
 use std::io;
 use thiserror::Error;
 use tungstenite::Error as WsError;
@@ -21,21 +21,9 @@ pub enum GatewayClientError {
    #[error("gateway returned an error response: {0}")]
    TypedGatewayError(SimpleGatewayRequestsError),

-    #[error("request error: {0}")]
-    RequestError(#[from] GatewayRequestsError),
-
    #[error("There was a network error: {0}")]
    NetworkError(#[from] WsError),

-    #[error("failed to upgrade our shared key - the gateway sent malformed response")]
-    FatalKeyUpgradeFailure,
-
-    #[error("the current key is already up to date! there's no need to upgrade it")]
-    KeyAlreadyUpgraded,
-
-    #[error("can't perform key upgrade as the key is already being used elsewhere")]
-    KeyAlreadyInUse,
-
    #[cfg(target_arch = "wasm32")]
    #[error("There was a network error: {0}")]
    NetworkErrorWasm(#[from] JsError),
@@ -85,8 +73,8 @@ pub enum GatewayClientError {
        cutoff_bi2: String,
    },

-    #[error("received an unexpected response of type {name}")]
-    UnexpectedResponse { name: String },
+    #[error("Received an unexpected response")]
+    UnexpectedResponse,

    #[error("Connection is in an invalid state - please send a bug report")]
    ConnectionInInvalidState,
@@ -2,14 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::error::GatewayClientError;
+use log::warn;
 use nym_gateway_requests::BinaryResponse;
-use tracing::{error, warn};
 use tungstenite::{protocol::Message, Error as WsError};

 pub use client::{config::GatewayClientConfig, GatewayClient, GatewayConfig};
-pub use nym_gateway_requests::shared_key::{
-    LegacySharedKeys, SharedGatewayKey, SharedSymmetricKey,
-};
+pub use nym_gateway_requests::registration::handshake::SharedKeys;
 pub use packet_router::{
    AcknowledgementReceiver, AcknowledgementSender, MixnetMessageReceiver, MixnetMessageSender,
    PacketRouter,
@@ -47,15 +45,11 @@ pub(crate) fn cleanup_socket_messages(

 pub(crate) fn try_decrypt_binary_message(
    bin_msg: Vec<u8>,
-    shared_keys: &SharedGatewayKey,
+    shared_keys: &SharedKeys,
 ) -> Option<Vec<u8>> {
    match BinaryResponse::try_from_encrypted_tagged_bytes(bin_msg, shared_keys) {
        Ok(bin_response) => match bin_response {
-            BinaryResponse::PushedMixMessage { message } => Some(message),
-            _ => {
-                error!("received unhandled binary response");
-                None
-            }
+            BinaryResponse::PushedMixMessage(plaintext) => Some(plaintext),
        },
        Err(err) => {
            warn!("message received from the gateway was malformed! - {err}",);
@@ -44,7 +44,7 @@ impl PacketRouter {
            // having already been dropped
            if self.shutdown.is_shutdown_poll() || self.shutdown.is_dummy() {
                // This should ideally not happen, but it's ok
-                tracing::warn!("Failed to send mixnet messages due to receiver task shutdown");
+                log::warn!("Failed to send mixnet messages due to receiver task shutdown");
                return Err(GatewayClientError::ShutdownInProgress);
            }
            // This should never happen during ordinary operation the way it's currently used.
@@ -60,7 +60,7 @@ impl PacketRouter {
            // having already been dropped
            if self.shutdown.is_shutdown_poll() || self.shutdown.is_dummy() {
                // This should ideally not happen, but it's ok
-                tracing::warn!("Failed to send acks due to receiver task shutdown");
+                log::warn!("Failed to send acks due to receiver task shutdown");
                return Err(GatewayClientError::ShutdownInProgress);
            }
            // This should never happen during ordinary operation the way it's currently used.
@@ -9,17 +9,18 @@ use crate::{cleanup_socket_messages, try_decrypt_binary_message};
 use futures::channel::oneshot;
 use futures::stream::{SplitSink, SplitStream};
 use futures::{SinkExt, StreamExt};
-use nym_gateway_requests::shared_key::SharedGatewayKey;
+use log::*;
+use nym_gateway_requests::registration::handshake::SharedKeys;
 use nym_gateway_requests::{ServerResponse, SimpleGatewayRequestsError};
 use nym_task::TaskClient;
-use si_scale::helpers::bibytes2;
 use std::os::raw::c_int as RawFd;
 use std::sync::Arc;
-use tracing::*;
 use tungstenite::{protocol::Message, Error as WsError};

+use si_scale::helpers::bibytes2;
 #[cfg(unix)]
 use std::os::fd::AsRawFd;
+use std::time::Duration;
 #[cfg(not(target_arch = "wasm32"))]
 use tokio::net::TcpStream;
 #[cfg(not(target_arch = "wasm32"))]
@@ -62,7 +63,7 @@ pub(crate) struct PartiallyDelegatedHandle {

 struct PartiallyDelegatedRouter {
    packet_router: PacketRouter,
-    shared_key: Arc<SharedGatewayKey>,
+    shared_key: Arc<SharedKeys>,
    client_bandwidth: ClientBandwidth,

    stream_return: SplitStreamSender,
@@ -72,7 +73,7 @@ struct PartiallyDelegatedRouter {
 impl PartiallyDelegatedRouter {
    fn new(
        packet_router: PacketRouter,
-        shared_key: Arc<SharedGatewayKey>,
+        shared_key: Arc<SharedKeys>,
        client_bandwidth: ClientBandwidth,
        stream_return: SplitStreamSender,
        stream_return_requester: oneshot::Receiver<()>,
@@ -247,7 +248,7 @@ impl PartiallyDelegatedHandle {
    pub(crate) fn split_and_listen_for_mixnet_messages(
        conn: WsConn,
        packet_router: PacketRouter,
-        shared_key: Arc<SharedGatewayKey>,
+        shared_key: Arc<SharedKeys>,
        client_bandwidth: ClientBandwidth,
        shutdown: TaskClient,
    ) -> Self {
@@ -285,7 +286,20 @@ impl PartiallyDelegatedHandle {
        &mut self,
        msg: Message,
    ) -> Result<(), GatewayClientError> {
-        Ok(self.sink_half.send(msg).await?)
+
+        log::info!("JON: PartiallyDelegated::send_without_response - sending a message");
+        // let r = self.sink_half.send(msg).await;
+        // Ok(r?)
+        let r = tokio::time::timeout(Duration::from_secs(3), self.sink_half.send(msg)).await;
+        let rr = match r {
+            Ok(rr) => Ok(rr?),
+            Err(_) => {
+                log::error!("JON: PartiallyDelegated::send_without_response - timeout sending a message");
+                Err(GatewayClientError::Timeout)
+            }
+        };
+        log::info!("JON: PartiallyDelegated::send_without_response - sent a message: {rr:?}");
+        rr
    }

    pub(crate) async fn batch_send_without_response(
@@ -294,7 +308,9 @@ impl PartiallyDelegatedHandle {
    ) -> Result<(), GatewayClientError> {
        let stream_messages: Vec<_> = messages.into_iter().map(Ok).collect();
        let mut send_stream = futures::stream::iter(stream_messages);
-        Ok(self.sink_half.send_all(&mut send_stream).await?)
+        let r = Ok(self.sink_half.send_all(&mut send_stream).await?);
+        log::info!("JON: PartiallyDelegated::batch_send_without_response - sent messages");
+        r
    }

    pub(crate) async fn merge(self) -> Result<WsConn, GatewayClientError> {
@@ -1,9 +1,9 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

+use log::{error, trace, warn};
 use nym_sphinx::addressing::nodes::MAX_NODE_ADDRESS_UNPADDED_LEN;
 use nym_sphinx::params::PacketSize;
-use tracing::{error, trace, warn};

 pub trait GatewayPacketRouter {
    type Error: std::error::Error;
@@ -20,13 +20,11 @@ nym-coconut-bandwidth-contract-common = { path = "../../cosmwasm-smart-contracts
 nym-ecash-contract-common = { path = "../../cosmwasm-smart-contracts/ecash-contract" }
 nym-multisig-contract-common = { path = "../../cosmwasm-smart-contracts/multisig-contract" }
 nym-group-contract-common = { path = "../../cosmwasm-smart-contracts/group-contract" }
-nym-serde-helpers = { path = "../../serde-helpers", features = ["hex", "base64"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 nym-http-api-client = { path = "../../../common/http-api-client" }
 thiserror = { workspace = true }
 log = { workspace = true }
-tracing = { workspace = true }
 url = { workspace = true, features = ["serde"] }
 tokio = { workspace = true, features = ["sync", "time"] }
 time = { workspace = true, features = ["formatting"] }
@@ -42,10 +42,6 @@ pub trait MixnetQueryClient {

    // state/sys-params-related

-    async fn admin(&self) -> Result<cw_controllers::AdminResponse, NyxdError> {
-        self.query_mixnet_contract(MixnetQueryMsg::Admin {}).await
-    }
-
    async fn get_mixnet_contract_version(&self) -> Result<ContractBuildInformation, NyxdError> {
        self.query_mixnet_contract(MixnetQueryMsg::GetContractVersion {})
            .await
@@ -584,7 +580,6 @@ mod tests {
        msg: MixnetQueryMsg,
    ) -> u32 {
        match msg {
-            MixnetQueryMsg::Admin {} => client.admin().ignore(),
            MixnetQueryMsg::GetAllFamiliesPaged { limit, start_after } => client
                .get_all_family_members_paged(start_after, limit)
                .ignore(),
@@ -31,15 +31,6 @@ pub trait MixnetSigningClient {

    // state/sys-params-related

-    async fn update_admin(
-        &self,
-        admin: String,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NyxdError> {
-        self.execute_mixnet_contract(fee, MixnetExecuteMsg::UpdateAdmin { admin }, vec![])
-            .await
-    }
-
    async fn update_rewarding_validator_address(
        &self,
        address: AccountId,
@@ -769,7 +760,6 @@ mod tests {
        msg: MixnetExecuteMsg,
    ) {
        match msg {
-            MixnetExecuteMsg::UpdateAdmin { admin } => client.update_admin(admin, None).ignore(),
            MixnetExecuteMsg::AssignNodeLayer { mix_id, layer } => {
                client.assign_node_layer(mix_id, layer, None).ignore()
            }
@@ -5,7 +5,7 @@ use crate::nyxd;
 use crate::nyxd::coin::Coin;
 use crate::nyxd::cosmwasm_client::helpers::{create_pagination, next_page_key};
 use crate::nyxd::cosmwasm_client::types::{
-    Account, CodeDetails, Contract, ContractCodeId, Model, SequenceResponse, SimulateResponse,
+    Account, CodeDetails, Contract, ContractCodeId, SequenceResponse, SimulateResponse,
 };
 use crate::nyxd::error::NyxdError;
 use crate::nyxd::Query;
@@ -21,14 +21,15 @@ use cosmrs::proto::cosmos::tx::v1beta1::{
    SimulateRequest, SimulateResponse as ProtoSimulateResponse,
 };
 use cosmrs::proto::cosmwasm::wasm::v1::{
-    QueryAllContractStateRequest, QueryAllContractStateResponse, QueryCodeRequest,
-    QueryCodeResponse, QueryCodesRequest, QueryCodesResponse, QueryContractHistoryRequest,
-    QueryContractHistoryResponse, QueryContractInfoRequest, QueryContractInfoResponse,
-    QueryContractsByCodeRequest, QueryContractsByCodeResponse, QueryRawContractStateRequest,
-    QueryRawContractStateResponse, QuerySmartContractStateRequest, QuerySmartContractStateResponse,
+    QueryCodeRequest, QueryCodeResponse, QueryCodesRequest, QueryCodesResponse,
+    QueryContractHistoryRequest, QueryContractHistoryResponse, QueryContractInfoRequest,
+    QueryContractInfoResponse, QueryContractsByCodeRequest, QueryContractsByCodeResponse,
+    QueryRawContractStateRequest, QueryRawContractStateResponse, QuerySmartContractStateRequest,
+    QuerySmartContractStateResponse,
 };
 use cosmrs::tendermint::{block, chain, Hash};
 use cosmrs::{AccountId, Coin as CosmosCoin, Tx};
+use log::trace;
 use prost::Message;
 use serde::{Deserialize, Serialize};

@@ -67,7 +68,7 @@ pub trait CosmWasmClient: TendermintRpcClient {
        Res: Message + Default,
    {
        if let Some(ref abci_path) = path {
-            tracing::trace!("performing query on abci path {abci_path}")
+            trace!("performing query on abci path {abci_path}")
        }
        let mut buf = Vec::with_capacity(req.encoded_len());
        req.encode(&mut buf)?;
@@ -153,20 +154,13 @@ pub trait CosmWasmClient: TendermintRpcClient {
            let req = QueryAllBalancesRequest {
                address: address.to_string(),
                pagination,
-                resolve_denom: false,
            };

            let mut res = self
                .make_abci_query::<_, QueryAllBalancesResponse>(path.clone(), req)
                .await?;

-            let early_break = res.balances.is_empty();
            raw_balances.append(&mut res.balances);
-
-            if early_break {
-                break;
-            }
-
            if let Some(next_key) = next_page_key(res.pagination) {
                pagination = Some(create_pagination(next_key))
            } else {
@@ -194,13 +188,7 @@ pub trait CosmWasmClient: TendermintRpcClient {
                .make_abci_query::<_, QueryTotalSupplyResponse>(path.clone(), req)
                .await?;

-            let early_break = res.supply.is_empty();
            supply.append(&mut res.supply);
-
-            if early_break {
-                break;
-            }
-
            if let Some(next_key) = next_page_key(res.pagination) {
                pagination = Some(create_pagination(next_key))
            } else {
@@ -230,19 +218,17 @@ pub trait CosmWasmClient: TendermintRpcClient {

        loop {
            let mut res = self
-                .tx_search(query.clone(), false, page, per_page, Order::Ascending)
+                .tx_search(query.clone(), false, page, 100, Order::Ascending)
                .await?;

+            results.append(&mut res.txs);
            // sanity check for if tendermint's maximum per_page was modified -
            // we don't want to accidentally be stuck in an infinite loop
-            let early_break = res.total_count == 0 || res.txs.is_empty();
-            results.append(&mut res.txs);
-
-            if early_break {
+            if res.total_count == 0 || res.txs.is_empty() {
                break;
            }

-            if res.total_count > results.len() as u32 {
+            if res.total_count >= per_page {
                page += 1
            } else {
                break;
@@ -309,7 +295,7 @@ pub trait CosmWasmClient: TendermintRpcClient {

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

-            let early_break = res.code_infos.is_empty();
            raw_codes.append(&mut res.code_infos);
-
-            if early_break {
-                break;
-            }
-
            if let Some(next_key) = next_page_key(res.pagination) {
                pagination = Some(create_pagination(next_key))
            } else {
@@ -392,13 +372,7 @@ pub trait CosmWasmClient: TendermintRpcClient {
                .make_abci_query::<_, QueryContractsByCodeResponse>(path.clone(), req)
                .await?;

-            let early_break = res.contracts.is_empty();
            raw_contracts.append(&mut res.contracts);
-
-            if early_break {
-                break;
-            }
-
            if let Some(next_key) = next_page_key(res.pagination) {
                pagination = Some(create_pagination(next_key))
            } else {
@@ -454,13 +428,7 @@ pub trait CosmWasmClient: TendermintRpcClient {
                .make_abci_query::<_, QueryContractHistoryResponse>(path.clone(), req)
                .await?;

-            let early_break = res.entries.is_empty();
            raw_entries.append(&mut res.entries);
-
-            if early_break {
-                break;
-            }
-
            if let Some(next_key) = next_page_key(res.pagination) {
                pagination = Some(create_pagination(next_key))
            } else {
@@ -474,38 +442,6 @@ pub trait CosmWasmClient: TendermintRpcClient {
            .collect::<Result<_, _>>()?)
    }

-    async fn query_all_contract_state(&self, address: &AccountId) -> Result<Vec<Model>, NyxdError> {
-        let path = Some("/cosmwasm.wasm.v1.Query/AllContractState".to_owned());
-
-        let mut models = Vec::new();
-        let mut pagination = None;
-
-        loop {
-            let req = QueryAllContractStateRequest {
-                address: address.to_string(),
-                pagination,
-            };
-
-            let mut res = self
-                .make_abci_query::<_, QueryAllContractStateResponse>(path.clone(), req)
-                .await?;
-
-            let empty_response = res.models.is_empty();
-            models.append(&mut res.models);
-
-            if empty_response {
-                break;
-            }
-            if let Some(next_key) = next_page_key(res.pagination) {
-                pagination = Some(create_pagination(next_key))
-            } else {
-                break;
-            }
-        }
-
-        Ok(models.into_iter().map(Into::into).collect())
-    }
-
    async fn query_contract_raw(
        &self,
        address: &AccountId,
@@ -552,7 +488,7 @@ pub trait CosmWasmClient: TendermintRpcClient {
            .make_abci_query::<_, QuerySmartContractStateResponse>(path, req)
            .await?;

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

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

-use crate::nyxd::cosmwasm_client::types::ExecuteResult;
 use crate::nyxd::error::NyxdError;
 use base64::Engine;
 use cosmrs::abci::TxMsgData;
@@ -11,6 +10,7 @@ use log::error;
 use prost::bytes::Bytes;
 use tendermint_rpc::endpoint::broadcast;

+use crate::nyxd::cosmwasm_client::types::ExecuteResult;
 pub use cosmrs::abci::MsgResponse;

 pub fn parse_msg_responses(data: Bytes) -> Vec<MsgResponse> {
@@ -21,8 +21,7 @@ pub struct Log {

 /// Searches in logs for the first event of the given event type and in that event
 /// for the first attribute with the given attribute key.
-#[deprecated]
-pub fn find_attribute_in_logs<'a>(
+pub fn find_attribute<'a>(
    logs: &'a [Log],
    event_type: &str,
    attribute_key: &str,
@@ -36,7 +35,6 @@ pub fn find_attribute_in_logs<'a>(
 }

 /// Search for the proposal id in the given log. It'll be in the LAST wasm event, with attribute key "proposal_id"
-#[deprecated]
 pub fn find_proposal_id(logs: &[Log]) -> Result<u64, NyxdError> {
    let maybe_attributes = logs
        .iter()
@@ -27,34 +27,13 @@ use cosmrs::vesting::{
 };
 use cosmrs::{AccountId, Any, Coin as CosmosCoin};
 use prost::Message;
-use serde::{Deserialize, Serialize};
+use serde::Serialize;

 pub use cosmrs::abci::GasInfo;
 pub use cosmrs::abci::MsgResponse;

 pub type ContractCodeId = u64;

-// yet another thing to put in cosmrs
-#[derive(Serialize, Deserialize)]
-pub struct Model {
-    #[serde(with = "nym_serde_helpers::hex")]
-    pub key: Vec<u8>,
-
-    #[serde(with = "nym_serde_helpers::base64")]
-    pub value: Vec<u8>,
-}
-
-// follow the cosmwasm serialisation format, i.e. hex for key and base64 for value
-
-impl From<cosmrs::proto::cosmwasm::wasm::v1::Model> for Model {
-    fn from(model: cosmrs::proto::cosmwasm::wasm::v1::Model) -> Self {
-        Model {
-            key: model.key,
-            value: model.value,
-        }
-    }
-}
-
 #[derive(Serialize)]
 pub struct EmptyMsg {}

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

-use crate::nyxd::cosmwasm_client::logs::Log;
 use crate::nyxd::TxResponse;
-use cosmrs::tendermint::abci;
-
-pub use abci::Event;

 // Searches in events for an event of the given event type which contains an
 // attribute for with the given key.
 pub fn find_tx_attribute(tx: &TxResponse, event_type: &str, attribute_key: &str) -> Option<String> {
-    find_event_attribute(&tx.tx_result.events, event_type, attribute_key)
-}
-
-pub fn find_event_attribute(
-    events: &[Event],
-    event_type: &str,
-    attribute_key: &str,
-) -> Option<String> {
-    let event = events.iter().find(|e| e.kind == event_type)?;
+    let event = tx.tx_result.events.iter().find(|e| e.kind == event_type)?;
    let attribute = event.attributes.iter().find(|&attr| {
        if let Ok(key_str) = attr.key_str() {
            key_str == attribute_key
@@ -28,23 +16,3 @@ pub fn find_event_attribute(
    })?;
    Some(attribute.value_str().ok().map(|str| str.to_string())).flatten()
 }
-
-pub fn find_attribute_value_in_logs_or_events(
-    logs: &[Log],
-    events: &[Event],
-    event_type: &str,
-    attribute_key: &str,
-) -> Option<String> {
-    // if logs are empty, i.e. we're using post 0.50 code, parse the events instead
-    if !logs.is_empty() {
-        #[allow(deprecated)]
-        return crate::nyxd::cosmwasm_client::logs::find_attribute_in_logs(
-            logs,
-            event_type,
-            attribute_key,
-        )
-        .map(|attr| attr.value.clone());
-    }
-
-    find_event_attribute(events, event_type, attribute_key)
-}
@@ -4,11 +4,9 @@
 use crate::rpc::TendermintRpcClient;
 use async_trait::async_trait;
 use base64::Engine;
-use cosmrs::tendermint;
 use cosmrs::tendermint::{block::Height, evidence::Evidence, Hash};
 use reqwest::header::HeaderMap;
 use reqwest::{header, RequestBuilder};
-use tendermint_rpc::dialect::{v0_34, v0_37, v0_38, LatestDialect};
 use tendermint_rpc::{
    client::CompatMode,
    dialect::{self, Dialect},
@@ -23,21 +21,8 @@ macro_rules! perform_with_compat {
    ($self:expr, $request:expr) => {{
        let request = $request;
        match $self.compat {
-            CompatMode::V0_38 => {
-                $self
-                    .perform_request_with_dialect(request, dialect::v0_38::Dialect)
-                    .await
-            }
-            CompatMode::V0_37 => {
-                $self
-                    .perform_request_with_dialect(request, dialect::v0_37::Dialect)
-                    .await
-            }
-            CompatMode::V0_34 => {
-                $self
-                    .perform_request_with_dialect(request, dialect::v0_34::Dialect)
-                    .await
-            }
+            CompatMode::V0_37 => $self.perform_v0_37(request).await,
+            CompatMode::V0_34 => $self.perform_v0_34(request).await,
        }
    }};
 }
@@ -85,11 +70,7 @@ impl ReqwestRpcClient {
            .headers(headers)
    }

-    async fn perform_request_with_dialect<R, S>(
-        &self,
-        request: R,
-        _dialect: S,
-    ) -> Result<R::Output, Error>
+    async fn perform_request<R, S>(&self, request: R) -> Result<R::Output, Error>
    where
        R: SimpleRequest<S>,
        S: Dialect,
@@ -100,25 +81,26 @@ impl ReqwestRpcClient {
            .send()
            .await
            .map_err(TendermintRpcErrorMap::into_rpc_err)?;
-        let response_status = response.status();
        let bytes = response
            .bytes()
            .await
            .map_err(TendermintRpcErrorMap::into_rpc_err)?;
-
-        // Successful JSON-RPC requests are expected to return a 200 OK HTTP status.
-        // Otherwise, this means that the HTTP request failed as a whole,
-        // as opposed to the JSON-RPC request returning an error,
-        // and we cannot expect the response body to be a valid JSON-RPC response.
-        if response_status != reqwest::StatusCode::OK {
-            // hehe, that's so nasty but we have to somehow convert between different versions of the same lib
-            return Err(Error::http_request_failed(
-                response_status.as_u16().try_into().unwrap(),
-            ));
-        }
-
        R::Response::from_string(bytes).map(Into::into)
    }
+
+    async fn perform_v0_34<R>(&self, request: R) -> Result<R::Output, Error>
+    where
+        R: SimpleRequest<dialect::v0_34::Dialect>,
+    {
+        self.perform_request(request).await
+    }
+
+    async fn perform_v0_37<R>(&self, request: R) -> Result<R::Output, Error>
+    where
+        R: SimpleRequest<dialect::v0_37::Dialect>,
+    {
+        self.perform_request(request).await
+    }
 }

 trait TendermintRpcErrorMap {
@@ -138,50 +120,18 @@ impl TendermintRpcClient for ReqwestRpcClient {
    where
        R: SimpleRequest,
    {
-        self.perform_request_with_dialect(request, LatestDialect)
-            .await
+        self.perform_request(request).await
    }

-    async fn block<H>(&self, height: H) -> Result<endpoint::block::Response, Error>
+    async fn block_results<H>(&self, height: H) -> Result<block_results::Response, Error>
    where
        H: Into<Height> + Send,
    {
-        perform_with_compat!(self, endpoint::block::Request::new(height.into()))
+        perform_with_compat!(self, block_results::Request::new(height.into()))
    }

-    async fn block_by_hash(
-        &self,
-        hash: tendermint::Hash,
-    ) -> Result<endpoint::block_by_hash::Response, Error> {
-        perform_with_compat!(self, endpoint::block_by_hash::Request::new(hash))
-    }
-
-    async fn latest_block(&self) -> Result<endpoint::block::Response, Error> {
-        perform_with_compat!(self, endpoint::block::Request::default())
-    }
-
-    async fn block_results<H>(&self, height: H) -> Result<endpoint::block_results::Response, Error>
-    where
-        H: Into<Height> + Send,
-    {
-        perform_with_compat!(self, endpoint::block_results::Request::new(height.into()))
-    }
-
-    async fn latest_block_results(&self) -> Result<endpoint::block_results::Response, Error> {
-        perform_with_compat!(self, endpoint::block_results::Request::default())
-    }
-
-    async fn block_search(
-        &self,
-        query: Query,
-        page: u32,
-        per_page: u8,
-        order: Order,
-    ) -> Result<endpoint::block_search::Response, Error> {
-        perform_with_compat!(
-            self,
-            endpoint::block_search::Request::new(query, page, per_page, order)
-        )
+    async fn latest_block_results(&self) -> Result<block_results::Response, Error> {
+        perform_with_compat!(self, block_results::Request::default())
    }

    async fn header<H>(&self, height: H) -> Result<endpoint::header::Response, Error>
@@ -190,26 +140,11 @@ impl TendermintRpcClient for ReqwestRpcClient {
    {
        let height = height.into();
        match self.compat {
-            CompatMode::V0_38 => {
-                self.perform_request_with_dialect(
-                    endpoint::header::Request::new(height),
-                    v0_38::Dialect,
-                )
-                .await
-            }
-            CompatMode::V0_37 => {
-                self.perform_request_with_dialect(
-                    endpoint::header::Request::new(height),
-                    v0_37::Dialect,
-                )
-                .await
-            }
+            CompatMode::V0_37 => self.perform(endpoint::header::Request::new(height)).await,
            CompatMode::V0_34 => {
                // Back-fill with a request to /block endpoint and
                // taking just the header from the response.
-                let resp = self
-                    .perform_request_with_dialect(block::Request::new(height), v0_34::Dialect)
-                    .await?;
+                let resp = self.perform_v0_34(block::Request::new(height)).await?;
                Ok(resp.into())
            }
        }
@@ -217,25 +152,12 @@ impl TendermintRpcClient for ReqwestRpcClient {

    async fn header_by_hash(&self, hash: Hash) -> Result<header_by_hash::Response, Error> {
        match self.compat {
-            CompatMode::V0_38 => {
-                self.perform_request_with_dialect(
-                    header_by_hash::Request::new(hash),
-                    v0_38::Dialect,
-                )
-                .await
-            }
-            CompatMode::V0_37 => {
-                self.perform_request_with_dialect(
-                    header_by_hash::Request::new(hash),
-                    v0_37::Dialect,
-                )
-                .await
-            }
+            CompatMode::V0_37 => self.perform(header_by_hash::Request::new(hash)).await,
            CompatMode::V0_34 => {
                // Back-fill with a request to /block_by_hash endpoint and
                // taking just the header from the response.
                let resp = self
-                    .perform_request_with_dialect(block_by_hash::Request::new(hash), v0_34::Dialect)
+                    .perform_v0_34(block_by_hash::Request::new(hash))
                    .await?;
                Ok(resp.into())
            }
@@ -245,18 +167,8 @@ impl TendermintRpcClient for ReqwestRpcClient {
    /// `/broadcast_evidence`: broadcast an evidence.
    async fn broadcast_evidence(&self, e: Evidence) -> Result<evidence::Response, Error> {
        match self.compat {
-            CompatMode::V0_38 => {
-                self.perform_request_with_dialect(evidence::Request::new(e), v0_38::Dialect)
-                    .await
-            }
-            CompatMode::V0_37 => {
-                self.perform_request_with_dialect(evidence::Request::new(e), v0_37::Dialect)
-                    .await
-            }
-            CompatMode::V0_34 => {
-                self.perform_request_with_dialect(evidence::Request::new(e), v0_34::Dialect)
-                    .await
-            }
+            CompatMode::V0_37 => self.perform(evidence::Request::new(e)).await,
+            CompatMode::V0_34 => self.perform_v0_34(evidence::Request::new(e)).await,
        }
    }

@@ -10,7 +10,6 @@ anyhow = { workspace = true }
 base64 = { workspace = true }
 bip39 = { workspace = true }
 bs58 = { workspace = true }
-colored = { workspace = true }
 comfy-table = { workspace = true }
 cfg-if = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
@@ -26,10 +25,9 @@ rand = { workspace = true, features = ["std"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
-tempfile = { workspace = true }
 time = { workspace = true, features = ["parsing", "formatting"] }
-tokio = { workspace = true, features = ["sync"] }
-toml = { workspace = true }
+tokio = { workspace = true, features = ["sync"]}
+toml = "0.5.6"
 url = { workspace = true }
 tap = { workspace = true }
 zeroize = { workspace = true }
@@ -0,0 +1,64 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::utils::CommonConfigsWrapper;
+use anyhow::bail;
+use clap::ArgGroup;
+use clap::Parser;
+use nym_credential_storage::initialise_persistent_storage;
+use nym_id::import_credential;
+use std::fs;
+use std::path::PathBuf;
+
+fn parse_encoded_credential_data(raw: &str) -> bs58::decode::Result<Vec<u8>> {
+    bs58::decode(raw).into_vec()
+}
+
+#[derive(Debug, Parser)]
+#[clap(group(ArgGroup::new("cred_data").required(true)))]
+pub struct Args {
+    /// Config file of the client that is supposed to use the credential.
+    #[clap(long)]
+    pub(crate) client_config: PathBuf,
+
+    /// Explicitly provide the encoded credential data (as base58)
+    #[clap(long, group = "cred_data", value_parser = parse_encoded_credential_data)]
+    pub(crate) credential_data: Option<Vec<u8>>,
+
+    /// Specifies the path to file containing binary credential data
+    #[clap(long, group = "cred_data")]
+    pub(crate) credential_path: Option<PathBuf>,
+
+    // currently hidden as there exists only a single serialization standard
+    #[clap(long, hide = true)]
+    pub(crate) version: Option<u8>,
+}
+
+pub async fn execute(args: Args) -> anyhow::Result<()> {
+    let loaded = CommonConfigsWrapper::try_load(args.client_config)?;
+
+    if let Ok(id) = loaded.try_get_id() {
+        println!("loaded config file for client '{id}'");
+    }
+
+    let Ok(credentials_store) = loaded.try_get_credentials_store() else {
+        bail!("the loaded config does not have a credentials store information")
+    };
+
+    println!(
+        "using credentials store at '{}'",
+        credentials_store.display()
+    );
+    let credentials_store = initialise_persistent_storage(credentials_store).await;
+
+    let raw_credential = match args.credential_data {
+        Some(data) => data,
+        None => {
+            // SAFETY: one of those arguments must have been set
+            fs::read(args.credential_path.unwrap())?
+        }
+    };
+
+    import_credential(credentials_store, raw_credential, args.version).await?;
+    Ok(())
+}
@@ -0,0 +1,56 @@
+// Copyright 2022-2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::context::SigningClient;
+use crate::utils::CommonConfigsWrapper;
+use anyhow::bail;
+use clap::Parser;
+use nym_credential_storage::initialise_persistent_storage;
+use nym_credential_utils::utils;
+use nym_credentials_interface::TicketType;
+use nym_crypto::asymmetric::identity;
+use std::path::PathBuf;
+
+#[derive(Debug, Parser)]
+pub struct Args {
+    /// Specify which type of ticketbook should be issued
+    #[clap(long, default_value_t = TicketType::V1MixnetEntry)]
+    pub(crate) ticketbook_type: TicketType,
+
+    /// Config file of the client that is supposed to use the credential.
+    #[clap(long)]
+    pub(crate) client_config: PathBuf,
+}
+
+pub async fn execute(args: Args, client: SigningClient) -> anyhow::Result<()> {
+    let loaded = CommonConfigsWrapper::try_load(args.client_config)?;
+
+    if let Ok(id) = loaded.try_get_id() {
+        println!("loaded config file for client '{id}'");
+    }
+
+    let Ok(credentials_store) = loaded.try_get_credentials_store() else {
+        bail!("the loaded config does not have a credentials store information")
+    };
+
+    let Ok(private_id_key) = loaded.try_get_private_id_key() else {
+        bail!("the loaded config does not have a public id key information")
+    };
+
+    println!(
+        "using credentials store at '{}'",
+        credentials_store.display()
+    );
+
+    let persistent_storage = initialise_persistent_storage(credentials_store).await;
+    let private_id_key: identity::PrivateKey = nym_pemstore::load_key(private_id_key)?;
+    utils::issue_credential(
+        &client,
+        &persistent_storage,
+        &private_id_key.to_bytes(),
+        args.ticketbook_type,
+    )
+    .await?;
+
+    Ok(())
+}
@@ -3,10 +3,6 @@

 use clap::{Args, Subcommand};

-pub mod generate_ticket;
-pub mod import_coin_index_signatures;
-pub mod import_expiration_date_signatures;
-pub mod import_master_verification_key;
 pub mod import_ticket_book;
 pub mod issue_ticket_book;
 pub mod recover_ticket_book;
@@ -23,8 +19,4 @@ pub enum EcashCommands {
    IssueTicketBook(issue_ticket_book::Args),
    RecoverTicketBook(recover_ticket_book::Args),
    ImportTicketBook(import_ticket_book::Args),
-    GenerateTicket(generate_ticket::Args),
-    ImportCoinIndexSignatures(import_coin_index_signatures::Args),
-    ImportExpirationDateSignatures(import_expiration_date_signatures::Args),
-    ImportMasterVerificationKey(import_master_verification_key::Args),
 }
@@ -1,178 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::utils::CommonConfigsWrapper;
-use anyhow::{anyhow, bail};
-use clap::Parser;
-use colored::Colorize;
-use comfy_table::Table;
-use nym_credential_storage::initialise_persistent_storage;
-use nym_credential_storage::storage::Storage;
-use nym_credentials::ecash::bandwidth::serialiser::VersionedSerialise;
-use std::path::PathBuf;
-
-#[derive(Debug, Parser)]
-pub struct Args {
-    /// Specify the index of the ticket to retrieve from the ticketbook.
-    /// By default, the current unspent value is used.
-    #[clap(long, group = "output")]
-    pub(crate) ticket_index: Option<u64>,
-
-    /// Specify whether we should display payments for ALL available tickets
-    #[clap(long, group = "output")]
-    pub(crate) full: bool,
-
-    /// Base58-encoded identity of the provider (must be 32 bytes long)
-    #[clap(long)]
-    pub(crate) provider: String,
-
-    /// Config file of the client that is supposed to use the credential.
-    #[clap(long, group = "source")]
-    pub(crate) client_config: Option<PathBuf>,
-
-    /// Path to the dedicated credential storage database
-    #[clap(long, group = "source")]
-    pub(crate) credential_storage: Option<PathBuf>,
-}
-
-pub async fn execute(args: Args) -> anyhow::Result<()> {
-    let credentials_store = if let Some(explicit) = args.credential_storage {
-        explicit
-    } else {
-        // SAFETY: at least one of them MUST HAVE been specified
-        let cfg = args.client_config.unwrap();
-
-        let loaded = CommonConfigsWrapper::try_load(cfg)?;
-
-        if let Ok(id) = loaded.try_get_id() {
-            println!("loaded config file for client '{id}'");
-        }
-
-        let Ok(credentials_store) = loaded.try_get_credentials_store() else {
-            bail!("the loaded config does not have a credentials store information")
-        };
-        credentials_store
-    };
-
-    let decoded_provider = bs58::decode(&args.provider).into_vec()?;
-    if decoded_provider.len() != 32 {
-        bail!("the provided provider information is malformed")
-    }
-    let provider_arr: [u8; 32] = decoded_provider.try_into().unwrap();
-
-    let persistent_storage = initialise_persistent_storage(&credentials_store).await;
-    let Some(mut next_ticketbook) = persistent_storage
-        .get_next_unspent_usable_ticketbook(0)
-        .await?
-    else {
-        bail!(
-            "there are no valid ticketbooks in the storage at {}",
-            credentials_store.display()
-        )
-    };
-
-    let epoch_id = next_ticketbook.ticketbook.epoch_id();
-    let expiration_date = next_ticketbook.ticketbook.expiration_date();
-
-    let verification_key = persistent_storage
-        .get_master_verification_key(epoch_id)
-        .await?
-        .ok_or_else(|| {
-            anyhow!("ticketbook got incorrectly imported - the master verification key is missing")
-        })?;
-    let expiration_signatures = persistent_storage
-        .get_expiration_date_signatures(expiration_date)
-        .await?
-        .ok_or_else(|| {
-            anyhow!(
-                "ticketbook got incorrectly imported - the expiration date signatures are missing"
-            )
-        })?;
-    let coin_indices_signatures = persistent_storage
-        .get_coin_index_signatures(epoch_id)
-        .await?
-        .ok_or_else(|| {
-            anyhow!("ticketbook got incorrectly imported - the coin index signatures are missing")
-        })?;
-
-    let ticketbook_data = next_ticketbook.ticketbook.pack();
-
-    let next_ticket = args
-        .ticket_index
-        .unwrap_or(next_ticketbook.ticketbook.spent_tickets());
-    let pay_info = next_ticketbook.ticketbook.generate_pay_info(provider_arr);
-
-    println!("{}", "TICKETBOOK DATA:".bold());
-    println!("{}", bs58::encode(&ticketbook_data.data).into_string());
-    println!();
-
-    // display it only for a single ticket
-    if !args.full {
-        println!("attempting to generate payment for ticket {next_ticket}...");
-        println!();
-        next_ticketbook.ticketbook.update_spent_tickets(next_ticket);
-
-        let req = next_ticketbook.ticketbook.prepare_for_spending(
-            &verification_key,
-            pay_info.into(),
-            &coin_indices_signatures,
-            &expiration_signatures,
-            1,
-        )?;
-
-        let payment = req.payment;
-
-        println!("{}", format!("PAYMENT FOR TICKET {next_ticket}: ").bold());
-        println!("{}", bs58::encode(&payment.to_bytes()).into_string());
-        return Ok(());
-    }
-
-    println!(
-        "generating payment information for {} tickets. this might take a while!...",
-        next_ticketbook.ticketbook.params_total_tickets()
-    );
-
-    // otherwise generate all the payments
-    let last_spent = next_ticketbook.ticketbook.spent_tickets();
-
-    let mut table = Table::new();
-    table.set_header(vec!["index", "binary data", "spend status"]);
-
-    for i in 0..next_ticketbook.ticketbook.params_total_tickets() {
-        let status = if i < last_spent {
-            "SPENT".red()
-        } else {
-            "NOT SPENT".green()
-        };
-
-        next_ticketbook.ticketbook.update_spent_tickets(i);
-
-        let req = next_ticketbook.ticketbook.prepare_for_spending(
-            &verification_key,
-            pay_info.into(),
-            &coin_indices_signatures,
-            &expiration_signatures,
-            1,
-        )?;
-
-        let payment = req.payment;
-        let payment_bytes = payment.to_bytes();
-        let len = payment_bytes.len();
-        let display_size = 100;
-        let remaining = len - display_size;
-
-        table.add_row(vec![
-            i.to_string(),
-            format!(
-                "{}…{remaining}bytes remaining",
-                bs58::encode(&payment_bytes[..display_size]).into_string()
-            ),
-            status.to_string(),
-        ]);
-    }
-
-    println!("{}", "AVAILABLE TICKETS".bold());
-    println!("{table}");
-
-    Ok(())
-}
@@ -1,76 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::utils::CommonConfigsWrapper;
-use anyhow::bail;
-use clap::ArgGroup;
-use clap::Parser;
-use nym_credential_storage::initialise_persistent_storage;
-use nym_id::import_credential::import_expiration_date_signatures;
-use std::fs;
-use std::path::PathBuf;
-
-fn parse_encoded_signatures_data(raw: &str) -> bs58::decode::Result<Vec<u8>> {
-    bs58::decode(raw).into_vec()
-}
-
-#[derive(Debug, Parser)]
-#[clap(
-    group(ArgGroup::new("sig_data").required(true)),
-)]
-pub struct Args {
-    /// Config file of the client that is supposed to use the signatures.
-    #[clap(long)]
-    pub(crate) client_config: PathBuf,
-
-    /// Explicitly provide the encoded signatures data (as base58)
-    #[clap(long, group = "sig_data", value_parser = parse_encoded_signatures_data)]
-    pub(crate) signatures_data: Option<Vec<u8>>,
-
-    /// Specifies the path to file containing binary signatures data
-    #[clap(long, group = "sig_data")]
-    pub(crate) signatures_path: Option<PathBuf>,
-
-    // currently hidden as there exists only a single serialization standard
-    #[clap(long, hide = true)]
-    pub(crate) version: Option<u8>,
-}
-
-impl Args {
-    fn signatures_data(self) -> anyhow::Result<Vec<u8>> {
-        let data = match self.signatures_data {
-            Some(data) => data,
-            None => {
-                // SAFETY: one of those arguments must have been set
-                #[allow(clippy::unwrap_used)]
-                fs::read(self.signatures_path.unwrap())?
-            }
-        };
-        Ok(data)
-    }
-}
-
-pub async fn execute(args: Args) -> anyhow::Result<()> {
-    let loaded = CommonConfigsWrapper::try_load(&args.client_config)?;
-
-    if let Ok(id) = loaded.try_get_id() {
-        println!("loaded config file for client '{id}'");
-    }
-
-    let Ok(credentials_store) = loaded.try_get_credentials_store() else {
-        bail!("the loaded config does not have a credentials store information")
-    };
-
-    println!(
-        "using credentials store at '{}'",
-        credentials_store.display()
-    );
-    let credentials_store = initialise_persistent_storage(credentials_store).await;
-
-    let version = args.version;
-    let raw_signatures = args.signatures_data()?;
-
-    import_expiration_date_signatures(credentials_store, raw_signatures, version).await?;
-
-    Ok(())
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zane Schepke	526671bfca	Update socket_state.rs	2024-09-16 12:43:40 -04:00
Zane Schepke	1fc70ff13a	test fix	2024-09-16 12:29:00 -04:00
Zane Schepke	4e857336d0	try disable disarm	2024-09-13 12:19:02 -04:00