ci: rename to check-merge-conflicts.yml

Fixes build on windows with nightly rustc due to

    https://github.com/MSxDOS/ntapi/issues/11

.github/workflows/build-and-upload-binaries-ci.yml

@@ -0,0 +1,112 @@
+name: Build and upload binaries to CI
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - 'clients/**'
+      - 'common/**'
+      - 'contracts/**'
+      - 'explorer-api/**'
+      - 'gateway/**'
+      - 'integrations/**'
+      - 'mixnode/**'
+      - 'sdk/rust/nym-sdk/**'
+      - 'service-providers/**'
+      - 'nym-api/**'
+      - 'nym-outfox/**'
+      - 'tools/nym-cli/**'
+      - 'tools/ts-rs-cli/**'
+  pull_request:
+    paths:
+      - 'clients/**'
+      - 'common/**'
+      - 'contracts/**'
+      - 'explorer-api/**'
+      - 'gateway/**'
+      - 'integrations/**'
+      - 'mixnode/**'
+      - 'sdk/rust/nym-sdk/**'
+      - 'service-providers/**'
+      - 'nym-api/**'
+      - 'nym-outfox/**'
+      - 'tools/nym-cli/**'
+      - 'tools/ts-rs-cli/**'
+
+env:
+  NETWORK: mainnet
+
+jobs:
+  publish-nym:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [ubuntu-20.04]
+
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare build output directory
+        shell: bash
+        env:
+          OUTPUT_DIR: ci-builds/${{ github.ref_name }}
+        run: |
+          rm -rf ci-builds || true
+          mkdir -p $OUTPUT_DIR
+          echo $OUTPUT_DIR
+
+      - name: Install Dependencies (Linux)
+        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools
+        continue-on-error: true
+
+      - name: Install Rust stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+
+      - name: Build all binaries
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --workspace --release
+
+      - name: Install Rust stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: wasm32-unknown-unknown
+          override: true
+          components: rustfmt, clippy
+
+      - name: Build release contracts
+        run: make wasm
+
+      - name: Prepare build output
+        shell: bash
+        env:
+          OUTPUT_DIR: ci-builds/${{ github.ref_name }}
+        run: |
+          cp target/release/nym-client $OUTPUT_DIR
+          cp target/release/nym-gateway $OUTPUT_DIR
+          cp target/release/nym-mixnode $OUTPUT_DIR
+          cp target/release/nym-socks5-client $OUTPUT_DIR
+          cp target/release/nym-api $OUTPUT_DIR
+          cp target/release/nym-network-requester $OUTPUT_DIR
+          cp target/release/nym-network-statistics $OUTPUT_DIR
+          cp target/release/nym-cli $OUTPUT_DIR
+
+          cp contracts/target/wasm32-unknown-unknown/release/mixnet_contract.wasm $OUTPUT_DIR
+          cp contracts/target/wasm32-unknown-unknown/release/vesting_contract.wasm $OUTPUT_DIR
+
+      - name: Deploy branch to CI www
+        continue-on-error: true
+        uses: easingthemes/ssh-deploy@main
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.CI_WWW_SSH_PRIVATE_KEY }}
+          ARGS: "-avzr"
+          SOURCE: "ci-builds/"
+          REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
+          REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
+          TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/builds/
+          EXCLUDE: "/dist/, /node_modules/"

.github/workflows/check-merge-conflicts.yml

@@ -0,0 +1,59 @@
+name: check-merge-conflicts
+
+# Check that the latest release branch merges into master and develop without
+# any conflicts that git is not able to resolve
+
+on:
+  workflow_dispatch:
+
+jobs:
+  get-release:
+    runs-on: ubuntu-20.04
+    outputs:
+      output1: ${{ steps.step2.outputs.latest_release }}
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Set output variable to latest release branch
+        id: step2
+        run: echo "latest_release=$(git branch -r | grep -E 'release/v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -n 1)" >> $GITHUB_OUTPUT
+
+  check-merge-release-into-master:
+    name: Check that the release branch merges into master
+    needs: get_release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Setup git user
+        run: |
+          git config --global user.name "ci"
+          git config --global user.email "ci@localhost"
+      - name: Check merge release branch into master
+        run: |
+          ./.github/workflows/support-files/git-merge-check.sh origin/master $branch1
+        env:
+          branch1: ${{needs.get_release.outputs.output1}}
+
+  check-merge-release-into-develop:
+    name: Check that the release branch merges into develop
+    needs: get_release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Setup git user
+        run: |
+          git config --global user.name "ci"
+          git config --global user.email "ci@localhost"
+      - name: Check merge release branch into develop
+        run: |
+          ./.github/workflows/support-files/git-merge-check.sh origin/develop $branch1
+        env:
+          branch1: ${{needs.get_release.outputs.output1}}

.github/workflows/nc-android-apk.yml

@@ -0,0 +1,134 @@
+name: NC Android APK Release
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - "release/nc-android-v[0-9].[0-9].[0-9]*"
+
+jobs:
+  build:
+    name: Build APK
+    runs-on: custom-runner-linux
+    env:
+      ANDROID_HOME: ${{ github.workspace }}/android-sdk
+      NDK_VERSION: 25.1.8937393
+      NDK_HOME: ${{ github.workspace }}/android-sdk/ndk/25.1.8937393
+      SDK_PLATFORM_VERSION: android-33
+      SDK_BUILDTOOLS_VERSION: 33.0.1
+
+    steps:
+      - name: Install Dependencies (Linux)
+        # https://next--tauri.netlify.app/next/guides/getting-started/prerequisites/linux/#1-system-dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install \
+          libwebkit2gtk-4.0-dev \
+          build-essential \
+          unzip \
+          curl \
+          wget \
+          libssl-dev \
+          libgtk-3-dev \
+          squashfs-tools \
+          libayatana-appindicator3-dev \
+          librsvg2-dev
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: "temurin"
+          java-version: "17"
+
+      - name: Install Android SDK manager
+        # https://developer.android.com/studio/command-line/sdkmanager
+        run: |
+          curl -sS https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip -o cmdline-tools.zip
+          unzip cmdline-tools.zip
+          mkdir -p $ANDROID_HOME/cmdline-tools/latest
+          mv cmdline-tools/* $ANDROID_HOME/cmdline-tools/latest
+          rm -rf cmdline-tools
+
+      - name: Install Android S/NDK
+        run: |
+          echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses
+          echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager \
+            "platforms;$SDK_PLATFORM_VERSION" \
+            "platform-tools" \
+            "ndk;$NDK_VERSION" \
+            "build-tools;$SDK_BUILDTOOLS_VERSION"
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install tauri cli
+        run: cargo install tauri-cli --version "^2.0.0-alpha.2"
+
+      - name: Install rust android targets
+        run: |
+          rustup target add aarch64-linux-android \
+            armv7-linux-androideabi \
+            i686-linux-android \
+            x86_64-linux-android
+
+      - name: Setup Nodejs
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Install yarn
+        run: |
+          npm i -g yarn
+          yarn --version
+
+      - name: Build frontend code
+        run: |
+          yarn install --frozen-lockfile
+          yarn build
+          yarn workspace @nym/nym-connect-android webpack:prod
+
+      - name: Build APK
+        working-directory: nym-connect-android
+        env:
+          ANDROID_SDK_ROOT: ${{ env.ANDROID_HOME }}
+          WRY_ANDROID_PACKAGE: net.nymtech.nym_connect_android
+          WRY_ANDROID_LIBRARY: nym_connect_android
+        # TODO build with release profile (--release), it will requires
+        # to sign the APK. For now build with debug profile to avoid that
+        run: cargo tauri android build --debug --apk --split-per-abi -t aarch64
+
+      # TODO add the version number to APK name
+      - name: Rename APK artifact
+        run: |
+          mkdir apk/
+          mv nym-connect-android/src-tauri/gen/android/nym_connect_android/app/build/outputs/apk/arm64/debug/app-arm64-debug.apk \
+            apk/nym-connect-arm64-debug.apk
+          mv nym-connect-android/src-tauri/gen/android/nym_connect_android/app/build/outputs/apk/x86_64/debug/app-x86_64-debug.apk \
+            apk/nym-connect-x86_64-debug.apk
+
+      - name: Upload APK artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: nc-apk-debug
+          path: |
+            apk/nym-connect-arm64-debug.apk
+            apk/nym-connect-x86_64-debug.apk
+
+  # publish:
+  #   name: Publish APK
+  #   needs: build
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v3
+  #     - name: Download binary artifact
+  #       uses: actions/download-artifact@v3
+  #       with:
+  #         name: nc-apk-debug
+  #         path: apk
+  #     # TODO add a step to upload the APK somewhere
+  #     - name: Publish
+  #       uses: ???

.github/workflows/nightly_build.yml

@@ -10,7 +10,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       # creates the matrix strategy from nightly_build_matrix_includes.json
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - id: set-matrix
         uses: JoshuaTheMiller/conditional-build-matrix@main
         with:
@@ -29,7 +29,7 @@ jobs:
         if: matrix.os == 'ubuntu-20.04'
 
       - name: Check out repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install rust toolchain
         uses: actions-rs/toolchain@v1
@@ -147,7 +147,7 @@ jobs:
       - name: Collect jobs status
         uses: technote-space/workflow-conclusion-action@v2
       - name: Check out repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: install npm
         uses: actions/setup-node@v3
         if: env.WORKFLOW_CONCLUSION == 'failure'

.github/workflows/nightly_build_release.yml

@@ -54,6 +54,12 @@ jobs:
           override: true
           components: rustfmt, clippy
 
+      - name: Check formatting
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
       - name: Build all binaries
         uses: actions-rs/cargo@v1
         with:
@@ -66,6 +72,18 @@ jobs:
         with:
           command: clean
 
+      - name: Build all examples
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --workspace --examples
+
+      - name: Reclaim some disk space (because Windows is being annoying)
+        uses: actions-rs/cargo@v1
+        if: ${{ matrix.os == 'windows-latest' }}
+        with:
+          command: clean
+
       - name: Run all tests
         uses: actions-rs/cargo@v1
         with:
@@ -74,7 +92,7 @@ jobs:
 
       - name: Reclaim some disk space (because Windows is being annoying)
         uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' }}
+        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-20.04' }}
         with:
           command: clean
 
@@ -83,13 +101,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --workspace --all-features -- --ignored
-
-      - name: Check formatting
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
+          args: --workspace -- --ignored
 
       - name: Reclaim some disk space (because Windows is being annoying)
         uses: actions-rs/cargo@v1
@@ -102,7 +114,7 @@ jobs:
         continue-on-error: true
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-features
+          args: --workspace
 
       - name: Run clippy
         uses: actions-rs/cargo@v1

.github/workflows/nightly_build_release2.yml

@@ -54,6 +54,12 @@ jobs:
           override: true
           components: rustfmt, clippy
 
+      - name: Check formatting
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
       - name: Build all binaries
         uses: actions-rs/cargo@v1
         with:
@@ -66,6 +72,18 @@ jobs:
         with:
           command: clean
 
+      - name: Build all examples
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --workspace --examples
+
+      - name: Reclaim some disk space (because Windows is being annoying)
+        uses: actions-rs/cargo@v1
+        if: ${{ matrix.os == 'windows-latest' }}
+        with:
+          command: clean
+
       - name: Run all tests
         uses: actions-rs/cargo@v1
         with:
@@ -74,7 +92,7 @@ jobs:
 
       - name: Reclaim some disk space (because Windows is being annoying)
         uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' }}
+        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-20.04' }}
         with:
           command: clean
 
@@ -83,13 +101,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --workspace --all-features -- --ignored
-
-      - name: Check formatting
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
+          args: --workspace -- --ignored
 
       - name: Reclaim some disk space (because Windows is being annoying)
         uses: actions-rs/cargo@v1
@@ -102,7 +114,7 @@ jobs:
         continue-on-error: true
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-features
+          args: --workspace
 
       - name: Run clippy
         uses: actions-rs/cargo@v1

.github/workflows/support-files/git-merge-check.sh

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+
+#
+# Basic usage:
+#   ./git-merge-check origin/develop origin/release/v1.1.9
+#
+
+set -x
+
+set -o nounset
+set -o pipefail
+
+# Start from branch ...
+branch1=$1
+
+# ... and try to merge in
+branch2=$2
+
+echo "Checking if $branch2 merges without conflicts into $branch1..."
+
+git checkout -q $branch1 || exit 1
+
+# There are two options here as far as I see on what we should check for. Either
+#
+#  (A) check for CONFLICT in any file except whitelist (such as .lock files)
+#  (B) check for "Automatic merge failed"
+#
+# Both of these options have drawbacks.
+#
+# The first (A) has the problem in that maybe we don't want to fail if the
+# changes can be automatically merged (duh), but at least we are not pestered
+# about constant lock file changes.
+# The second (B) has the problem that it's difficult to filter out automatic
+# merge fails for files we don't care about (.lock files).
+#
+# The ideal solution would be to check for automatic merge fails for files
+# except those on a whitelist (e.g. lock files).
+
+# For now I choose to use (B) here, because I hope it might be less noisy
+
+# Alternative A
+#output=$(git merge --no-commit --no-ff $branch2 | grep -v .lock)
+#merge_failed=$(echo $output | grep -v "CONFLICT")
+#return_code=$?
+
+# Alternative B
+output=$(git merge --no-commit --no-ff $branch2)
+merge_failed=$(echo $output | grep -v "Automatic merge failed")
+return_code=$?
+
+# Restore
+
+git merge --abort
+git checkout -q -
+
+if [ $return_code -eq 0 ]; then
+    echo "Merge check success"
+else
+    echo "Merge check failed"
+fi
+
+exit $return_code

.gitignore

@@ -42,4 +42,4 @@ envs/qwerty.env
 Cargo.lock
 nym-connect/Cargo.lock
 .parcel-cache
-.DS_Store
+**/.DS_Store

CHANGELOG.md

@@ -4,18 +4,49 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 
 # [Unreleased]
 
+### Added
+
+- dkg resharing mode ([#2936])
+
+[#2936]: https://github.com/nymtech/nym/pull/2936
+
+
+# [v1.1.9] (2023-02-07)
 
 ### Added
 
-- dkg rerun from scratch and dkg-specific epochs ([#2839])
-- nym-sdk: add support for surb storage ([#2870])
-- nym-sdk: enable reply-SURBs by default ([#2874])
-- remove coconut feature and unify builds ([#2890])
+- Separate `nym-api` endpoints with values of "total-supply" and "circulating-supply" in `nym` ([#2964])
+- Add `host` option to client init ([#2912])
+- Remove Coconut feature flag ([#2793])
+- Don't drop in mixnet connection handler ([#2963])
+
+### Changed
+- native-client: is now capable of listening for requests on sockets different than `127.0.0.1` ([#2939]). This can be specified via `--host` flag during `init` or `run`. Alternatively a custom `host` can be set in `config.toml` file under `socket` section.
+- mixnode, gateway: fix unexpected shutdown on corrupted connection ([#2963])
+
+[#2939]: https://github.com/nymtech/nym/pull/2939
+[#2963]: https://github.com/nymtech/nym/pull/2963
+
+
+# [v1.1.8] (2023-01-31)
+
+### Added
+
+- Rust SDK - Support SURBS (anonymous send + storage) ([#2754])
+- dkg rerun from scratch and dkg-specific epochs ([#2810])
+- Rename `'initial_supply'` field to `'total_supply'` in the circulating supply endpoint ([#2931])
+- Circulating supply api endpoint (read the note inside before testing/deploying) ([#1902])
+
+### Changed
+
+- nym-api: an `--id` flag is now always explicitly required ([#2873])
+
+[#2754]: https://github.com/nymtech/nym/issues/2754
+[#2810]: https://github.com/nymtech/nym/issues/2810
+[#2931]: https://github.com/nymtech/nym/issues/2931
+[#1902]: https://github.com/nymtech/nym/issues/1902
+[#2873]: https://github.com/nymtech/nym/issues/2873
 
-[#2839]: https://github.com/nymtech/nym/pull/2839
-[#2870]: https://github.com/nymtech/nym/pull/2870
-[#2874]: https://github.com/nymtech/nym/pull/2874
-[#2890]: https://github.com/nymtech/nym/pull/2890
 
 # [v1.1.7] (2023-01-24)
 

Cargo.lock

@@ -99,9 +99,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "anyhow"
-version = "1.0.68"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
+checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
 
 [[package]]
 name = "arrayref"
@@ -138,9 +138,9 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.63"
+version = "0.1.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff18d764974428cf3a9328e23fc5c986f5fbed46e6cd4cdf42544df5d297ec1"
+checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -290,15 +290,6 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72"
 
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "bip32"
 version = "0.3.0"
@@ -458,7 +449,8 @@ dependencies = [
 name = "build-information"
 version = "0.1.0"
 dependencies = [
- "vergen 7.5.0",
+ "serde",
+ "vergen 7.5.1",
 ]
 
 [[package]]
@@ -481,9 +473,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "bytes"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
 
 [[package]]
 name = "cast"
@@ -493,9 +485,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.0.78"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
 dependencies = [
  "jobserver",
 ]
@@ -628,9 +620,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.1.3"
+version = "4.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8d93d855ce6a0aa87b8473ef9169482f40abaa2e9e0993024c35c902cbd5920"
+checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76"
 dependencies = [
  "bitflags",
  "clap_derive",
@@ -647,7 +639,7 @@ version = "4.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d6540eedc41f8a5a76cf3d8d458057dcdf817be4158a55b5f861f7a5483de75"
 dependencies = [
- "clap 4.1.3",
+ "clap 4.1.4",
 ]
 
 [[package]]
@@ -656,7 +648,7 @@ version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf0c76d8fcf782a1102ccfcd10ca8246e7fdd609c1cd6deddbb96cb638e9bb5c"
 dependencies = [
- "clap 4.1.3",
+ "clap 4.1.4",
  "clap_complete",
 ]
 
@@ -666,7 +658,7 @@ version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
 dependencies = [
- "heck 0.4.0",
+ "heck 0.4.1",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -701,7 +693,7 @@ dependencies = [
 
 [[package]]
 name = "client-core"
-version = "1.1.7"
+version = "1.1.8"
 dependencies = [
  "async-trait",
  "client-connections",
@@ -817,7 +809,7 @@ dependencies = [
 name = "completions"
 version = "0.1.0"
 dependencies = [
- "clap 4.1.3",
+ "clap 4.1.4",
  "clap_complete",
  "clap_complete_fig",
 ]
@@ -977,9 +969,9 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-derive"
-version = "1.1.9"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fca30d51f7e5fbfa6440d8b10d7df0231bdf77e97fd3fe5d0cb79cc4822e50c"
+checksum = "d5abeeb891e6d0098402e4d3d042f90451db52651d2fe14b170e69a1dd3e4115"
 dependencies = [
  "syn",
 ]
@@ -1021,9 +1013,9 @@ dependencies = [
 
 [[package]]
 name = "crc"
-version = "3.0.0"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3"
+checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe"
 dependencies = [
  "crc-catalog 2.2.0",
 ]
@@ -1054,13 +1046,15 @@ name = "credential"
 version = "0.1.0"
 dependencies = [
  "bip39",
- "clap 4.1.3",
+ "clap 4.1.4",
  "coconut-interface",
  "completions",
  "config",
  "credential-storage",
  "credentials",
  "crypto",
+ "log",
+ "logging",
  "network-defaults",
  "pemstore",
  "rand 0.7.3",
@@ -1470,9 +1464,9 @@ dependencies = [
 
 [[package]]
 name = "cxx"
-version = "1.0.87"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b61a7545f753a88bcbe0a70de1fcc0221e10bfc752f576754fa91e663db1622e"
+checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -1482,9 +1476,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.87"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f464457d494b5ed6905c63b0c4704842aba319084a0a3561cdc1359536b53200"
+checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -1497,15 +1491,15 @@ dependencies = [
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.87"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43c7119ce3a3701ed81aca8410b9acf6fc399d2629d057b87e2efa4e63a3aaea"
+checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.87"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e07508b90551e610910fa648a1878991d367064997a596135b86df30daf07e"
+checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1567,7 +1561,7 @@ dependencies = [
  "hashbrown 0.12.3",
  "lock_api",
  "once_cell",
- "parking_lot_core 0.9.6",
+ "parking_lot_core 0.9.7",
 ]
 
 [[package]]
@@ -1761,9 +1755,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
+checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 
 [[package]]
 name = "elliptic-curve"
@@ -1785,9 +1779,9 @@ dependencies = [
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.31"
+version = "0.8.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
+checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
 dependencies = [
  "cfg-if",
 ]
@@ -1891,10 +1885,10 @@ dependencies = [
 
 [[package]]
 name = "explorer-api"
-version = "1.1.7"
+version = "1.1.8"
 dependencies = [
  "chrono",
- "clap 4.1.3",
+ "clap 4.1.4",
  "contracts-common",
  "dotenv",
  "humantime-serde",
@@ -2005,7 +1999,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "pin-project",
- "spin 0.9.4",
+ "spin 0.9.5",
 ]
 
 [[package]]
@@ -2058,9 +2052,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
+checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2073,9 +2067,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
+checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2083,15 +2077,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
+checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
+checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2111,15 +2105,15 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
+checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
+checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2128,21 +2122,21 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
+checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364"
 
 [[package]]
 name = "futures-task"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
+checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"
 
 [[package]]
 name = "futures-util"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
+checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2294,19 +2288,6 @@ dependencies = [
  "polyval",
 ]
 
-[[package]]
-name = "git2"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1"
-dependencies = [
- "bitflags",
- "libc",
- "libgit2-sys",
- "log",
- "url",
-]
-
 [[package]]
 name = "git2"
 version = "0.16.1"
@@ -2495,9 +2476,9 @@ dependencies = [
 
 [[package]]
 name = "heck"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 dependencies = [
  "unicode-segmentation",
 ]
@@ -2520,6 +2501,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -2649,9 +2636,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.14.23"
+version = "0.14.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c"
+checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2838,12 +2825,12 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
+checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3"
 dependencies = [
  "libc",
- "windows-sys",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -2872,14 +2859,14 @@ dependencies = [
 
 [[package]]
 name = "is-terminal"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
+checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef"
 dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi 0.3.1",
  "io-lifetimes",
  "rustix",
- "windows-sys",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -3214,7 +3201,7 @@ dependencies = [
  "libc",
  "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -3297,7 +3284,7 @@ dependencies = [
  "log",
  "memchr",
  "mime",
- "spin 0.9.4",
+ "spin 0.9.5",
  "tokio",
  "tokio-util",
  "version_check",
@@ -3314,6 +3301,7 @@ dependencies = [
  "cw4",
  "schemars",
  "serde",
+ "thiserror",
 ]
 
 [[package]]
@@ -3377,9 +3365,9 @@ dependencies = [
 
 [[package]]
 name = "ntapi"
-version = "0.3.7"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
+checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc"
 dependencies = [
  "winapi",
 ]
@@ -3437,7 +3425,7 @@ dependencies = [
 
 [[package]]
 name = "nym-api"
-version = "1.1.7"
+version = "1.1.9"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3445,7 +3433,7 @@ dependencies = [
  "bs58",
  "build-information",
  "cfg-if",
- "clap 4.1.3",
+ "clap 4.1.4",
  "coconut-bandwidth-contract-common",
  "coconut-dkg-common",
  "coconut-interface",
@@ -3535,13 +3523,13 @@ dependencies = [
 
 [[package]]
 name = "nym-cli"
-version = "1.1.7"
+version = "1.1.8"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
  "bip39",
  "bs58",
- "clap 4.1.3",
+ "clap 4.1.4",
  "clap_complete",
  "clap_complete_fig",
  "dotenv",
@@ -3565,7 +3553,7 @@ dependencies = [
  "bip39",
  "bs58",
  "cfg-if",
- "clap 4.1.3",
+ "clap 4.1.4",
  "coconut-bandwidth-contract-common",
  "coconut-dkg-common",
  "comfy-table",
@@ -3593,10 +3581,10 @@ dependencies = [
 
 [[package]]
 name = "nym-client"
-version = "1.1.7"
+version = "1.1.8"
 dependencies = [
  "build-information",
- "clap 4.1.3",
+ "clap 4.1.4",
  "client-connections",
  "client-core",
  "coconut-interface",
@@ -3633,7 +3621,7 @@ dependencies = [
 
 [[package]]
 name = "nym-gateway"
-version = "1.1.7"
+version = "1.1.8"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3641,7 +3629,7 @@ dependencies = [
  "bip39",
  "bs58",
  "build-information",
- "clap 4.1.3",
+ "clap 4.1.4",
  "coconut-interface",
  "colored",
  "completions",
@@ -3685,13 +3673,13 @@ dependencies = [
 
 [[package]]
 name = "nym-mixnode"
-version = "1.1.8"
+version = "1.1.9"
 dependencies = [
  "anyhow",
  "atty",
  "bs58",
  "build-information",
- "clap 4.1.3",
+ "clap 4.1.4",
  "colored",
  "completions",
  "config",
@@ -3730,10 +3718,11 @@ dependencies = [
 
 [[package]]
 name = "nym-network-requester"
-version = "1.1.7"
+version = "1.1.8"
 dependencies = [
  "async-trait",
- "clap 4.1.3",
+ "build-information",
+ "clap 4.1.4",
  "client-connections",
  "completions",
  "dirs",
@@ -3750,6 +3739,7 @@ dependencies = [
  "rand 0.7.3",
  "reqwest",
  "serde",
+ "service-providers-common",
  "socks5-requests",
  "sqlx 0.6.2",
  "statistics-common",
@@ -3762,7 +3752,7 @@ dependencies = [
 
 [[package]]
 name = "nym-network-statistics"
-version = "1.1.7"
+version = "1.1.8"
 dependencies = [
  "dirs",
  "log",
@@ -3819,10 +3809,10 @@ dependencies = [
 
 [[package]]
 name = "nym-socks5-client"
-version = "1.1.7"
+version = "1.1.8"
 dependencies = [
  "build-information",
- "clap 4.1.3",
+ "clap 4.1.4",
  "client-connections",
  "client-core",
  "coconut-interface",
@@ -3849,6 +3839,7 @@ dependencies = [
  "rand 0.7.3",
  "serde",
  "serde_json",
+ "service-providers-common",
  "socks5-requests",
  "tap",
  "task",
@@ -3910,7 +3901,6 @@ dependencies = [
 name = "nymcoconut"
 version = "0.5.0"
 dependencies = [
- "bincode",
  "bls12_381 0.6.0",
  "bs58",
  "criterion 0.3.6",
@@ -4194,7 +4184,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.6",
+ "parking_lot_core 0.9.7",
 ]
 
 [[package]]
@@ -4213,15 +4203,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.6"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf"
+checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec 1.10.0",
- "windows-sys",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -4315,9 +4305,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 
 [[package]]
 name = "pest"
-version = "2.5.3"
+version = "2.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4257b4a04d91f7e9e6290be5d3da4804dd5784fafde3a497d73eb2b4a158c30a"
+checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660"
 dependencies = [
  "thiserror",
  "ucd-trie",
@@ -4325,9 +4315,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.5.3"
+version = "2.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241cda393b0cdd65e62e07e12454f1f25d57017dcc514b1514cd3c4645e3a0a6"
+checksum = "2ac3922aac69a40733080f53c1ce7f91dcf57e1a5f6c52f421fadec7fbdc4b69"
 dependencies = [
  "pest",
  "pest_generator",
@@ -4335,9 +4325,9 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.5.3"
+version = "2.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46b53634d8c8196302953c74d5352f33d0c512a9499bd2ce468fc9f4128fa27c"
+checksum = "d06646e185566b5961b4058dd107e0a7f56e77c3f484549fb119867773c0f202"
 dependencies = [
  "pest",
  "pest_meta",
@@ -4348,9 +4338,9 @@ dependencies = [
 
 [[package]]
 name = "pest_meta"
-version = "2.5.3"
+version = "2.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef4f1332a8d4678b41966bb4cc1d0676880e84183a1ecc3f4b69f03e99c7a51"
+checksum = "e6f60b2ba541577e2a0c307c8f39d1439108120eb7903adeb6497fa880c59616"
 dependencies = [
  "once_cell",
  "pest",
@@ -4499,9 +4489,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.50"
+version = "1.0.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
+checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
 dependencies = [
  "unicode-ident",
 ]
@@ -5173,16 +5163,16 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.36.7"
+version = "0.36.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
+checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644"
 dependencies = [
  "bitflags",
  "errno",
  "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -5258,7 +5248,7 @@ version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
 dependencies = [
- "windows-sys",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -5339,9 +5329,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.8.0"
+version = "2.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645926f31b250a2dca3c232496c2d898d91036e45ca0e97e0e2390c54e11be36"
+checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
 dependencies = [
  "bitflags",
  "core-foundation",
@@ -5419,9 +5409,9 @@ dependencies = [
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.8"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819"
+checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294"
 dependencies = [
  "serde",
 ]
@@ -5460,9 +5450,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.91"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
+checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
 dependencies = [
  "itoa 1.0.5",
  "ryu",
@@ -5492,6 +5482,22 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "service-providers-common"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "build-information",
+ "log",
+ "nym-sdk",
+ "nymsphinx-anonymous-replies",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+]
+
 [[package]]
 name = "sha-1"
 version = "0.9.8"
@@ -5652,7 +5658,7 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "475b3bbe5245c26f2d8a6f62d67c1f30eb9fffeccee721c45d162c3ebbdf81b2"
 dependencies = [
- "heck 0.4.0",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
  "syn",
@@ -5673,6 +5679,9 @@ name = "socks5-requests"
 version = "0.1.0"
 dependencies = [
  "nymsphinx-addressing",
+ "serde",
+ "serde_json",
+ "service-providers-common",
  "thiserror",
 ]
 
@@ -5707,9 +5716,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "spin"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09"
+checksum = "7dccf47db1b41fa1573ed27ccf5e08e3ca771cb994f776668c5ebda893b248fc"
 dependencies = [
  "lock_api",
 ]
@@ -5824,7 +5833,7 @@ dependencies = [
  "byteorder",
  "bytes",
  "chrono",
- "crc 3.0.0",
+ "crc 3.0.1",
  "crossbeam-queue",
  "dotenvy",
  "either",
@@ -5867,7 +5876,7 @@ checksum = "bc0fba2b0cae21fc00fe6046f8baa4c7fcb49e379f0f592b04696607f69ed2e1"
 dependencies = [
  "dotenv",
  "either",
- "heck 0.4.0",
+ "heck 0.4.1",
  "once_cell",
  "proc-macro2",
  "quote",
@@ -5886,7 +5895,7 @@ checksum = "b850fa514dc11f2ee85be9d055c512aa866746adfacd1cb42d867d68e6a5b0d9"
 dependencies = [
  "dotenvy",
  "either",
- "heck 0.4.0",
+ "heck 0.4.1",
  "once_cell",
  "proc-macro2",
  "quote",
@@ -6007,7 +6016,7 @@ version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
 dependencies = [
- "heck 0.4.0",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
  "rustversion",
@@ -6048,9 +6057,9 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
 [[package]]
 name = "synstructure"
@@ -6066,9 +6075,9 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.24.7"
+version = "0.27.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54cb4ebf3d49308b99e6e9dc95e989e2fdbdc210e4f67c39db0bb89ba927001c"
+checksum = "975fe381e0ecba475d4acff52466906d95b153a40324956552e027b2a9eaa89e"
 dependencies = [
  "cfg-if",
  "core-foundation-sys",
@@ -6311,9 +6320,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.24.2"
+version = "1.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb"
+checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af"
 dependencies = [
  "autocfg 1.1.0",
  "bytes",
@@ -6327,7 +6336,7 @@ dependencies = [
  "socket2",
  "tokio-macros",
  "tracing",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -6353,9 +6362,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-native-tls"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
 dependencies = [
  "native-tls",
  "tokio",
@@ -6796,9 +6805,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
 
 [[package]]
 name = "unicode-width"
@@ -6921,7 +6930,7 @@ dependencies = [
  "chrono",
  "enum-iterator 0.8.1",
  "getset",
- "git2 0.16.1",
+ "git2",
  "rustc_version 0.4.0",
  "rustversion",
  "thiserror",
@@ -6929,15 +6938,15 @@ dependencies = [
 
 [[package]]
 name = "vergen"
-version = "7.5.0"
+version = "7.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "571b69f690c855821462709b6f41d42ceccc316fbd17b60bd06d06928cfe6a99"
+checksum = "f21b881cd6636ece9735721cf03c1fe1e774fe258683d084bb2812ab67435749"
 dependencies = [
  "anyhow",
  "cfg-if",
  "enum-iterator 1.2.0",
  "getset",
- "git2 0.15.0",
+ "git2",
  "rustc_version 0.4.0",
  "rustversion",
  "thiserror",
@@ -7231,6 +7240,30 @@ dependencies = [
  "windows_x86_64_msvc 0.42.1",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc 0.42.1",
+ "windows_i686_gnu 0.42.1",
+ "windows_i686_msvc 0.42.1",
+ "windows_x86_64_gnu 0.42.1",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc 0.42.1",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.1"

Cargo.toml

@@ -76,6 +76,7 @@ members = [
     "integrations/bity",
     "mixnode",
     "sdk/rust/nym-sdk",
+    "service-providers/common",
     "service-providers/network-requester",
     "service-providers/network-statistics",
     "nym-api",
@@ -105,4 +106,12 @@ homepage = "https://nymtech.net"
 edition = "2021"
 
 [workspace.dependencies]
+async-trait = "0.1.63"
+lazy_static = "1.4.0"
 log = "0.4"
+serde = "1.0.152"
+serde_json = "1.0.91"
+tap = "1.0.1"
+thiserror = "1.0.38"
+tokio = "1.24.1"
+url = "2.2"

clients/client-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "client-core"
-version = "1.1.7"
+version = "1.1.8"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2021"
 rust-version = "1.66"

clients/client-core/src/client/base_client/mod.rs

@@ -51,11 +51,22 @@ pub mod non_wasm_helpers;
 
 pub mod helpers;
 
+#[derive(Clone)]
 pub struct ClientInput {
     pub connection_command_sender: ConnectionCommandSender,
     pub input_sender: InputMessageSender,
 }
 
+impl ClientInput {
+    pub async fn send(
+        &self,
+        message: InputMessage,
+    ) -> Result<(), tokio::sync::mpsc::error::SendError<InputMessage>> {
+        self.input_sender.send(message).await
+    }
+}
+
+#[derive(Clone)]
 pub struct ClientOutput {
     pub received_buffer_request_sender: ReceivedBufferRequestSender,
 }
@@ -303,6 +314,7 @@ where
         let shared_key = if self.key_manager.is_gateway_key_set() {
             Some(self.key_manager.gateway_shared_key())
         } else {
+            log::info!("Gateway key not set! Will proceed anyway.");
             None
         };
 

clients/client-core/src/client/inbound_messages.rs

@@ -77,4 +77,12 @@ impl InputMessage {
             lane,
         }
     }
+
+    pub fn lane(&self) -> &TransmissionLane {
+        match self {
+            InputMessage::Regular { lane, .. }
+            | InputMessage::Anonymous { lane, .. }
+            | InputMessage::Reply { lane, .. } => lane,
+        }
+    }
 }

clients/client-core/src/client/replies/reply_storage/backend/browser_backend.rs

@@ -5,6 +5,8 @@ use crate::client::replies::reply_storage::backend::Empty;
 use crate::client::replies::reply_storage::{CombinedReplyStorage, ReplyStorageBackend};
 use async_trait::async_trait;
 
+use std::path::PathBuf;
+
 // well, right now we don't have the browser storage : (
 // so we keep everything in memory
 #[derive(Debug)]
@@ -27,6 +29,18 @@ impl Backend {
 impl ReplyStorageBackend for Backend {
     type StorageError = <Empty as ReplyStorageBackend>::StorageError;
 
+    async fn new(
+        debug_config: &crate::config::DebugConfig,
+        _db_path: Option<PathBuf>,
+    ) -> Result<Self, Self::StorageError> {
+        Ok(Backend {
+            empty: Empty {
+                min_surb_threshold: debug_config.minimum_reply_surb_storage_threshold,
+                max_surb_threshold: debug_config.maximum_reply_surb_storage_threshold,
+            },
+        })
+    }
+
     async fn flush_surb_storage(
         &mut self,
         storage: &CombinedReplyStorage,

clients/client-core/src/client/replies/reply_storage/backend/fs_backend/error.rs

@@ -56,4 +56,9 @@ pub enum StorageError {
         details: String,
         // err: Option<Box<dyn std::error::Error>>
     },
+
+    #[error("failed to create storage")]
+    FailedToCreateStorage {
+        source: Box<dyn std::error::Error + Send + Sync>,
+    },
 }

clients/client-core/src/client/replies/reply_storage/backend/fs_backend/mod.rs

@@ -1,6 +1,7 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::client::base_client::non_wasm_helpers;
 use crate::client::replies::reply_storage::backend::fs_backend::manager::StorageManager;
 use crate::client::replies::reply_storage::backend::fs_backend::models::{
     ReplySurbStorageMetadata, StoredReplyKey, StoredReplySurb, StoredSenderTag, StoredSurbSender,
@@ -367,6 +368,20 @@ impl Backend {
 impl ReplyStorageBackend for Backend {
     type StorageError = error::StorageError;
 
+    async fn new(
+        debug_config: &crate::config::DebugConfig,
+        db_path: Option<PathBuf>,
+    ) -> Result<Self, Self::StorageError> {
+        non_wasm_helpers::setup_fs_reply_surb_backend(db_path, debug_config)
+            .await
+            .map_err(|err| {
+                log::error!("Failed to create storage: {err}");
+                Self::StorageError::FailedToCreateStorage {
+                    source: Box::new(err),
+                }
+            })
+    }
+
     fn is_active(&self) -> bool {
         self.manager.is_active()
     }

clients/client-core/src/client/replies/reply_storage/backend/mod.rs

@@ -3,7 +3,7 @@
 
 use crate::client::replies::reply_storage::CombinedReplyStorage;
 use async_trait::async_trait;
-use std::error::Error;
+use std::{error::Error, path::PathBuf};
 use thiserror::Error;
 
 #[cfg(target_arch = "wasm32")]
@@ -30,6 +30,16 @@ pub struct Empty {
 impl ReplyStorageBackend for Empty {
     type StorageError = UndefinedError;
 
+    async fn new(
+        debug_config: &crate::config::DebugConfig,
+        _db_path: Option<PathBuf>,
+    ) -> Result<Self, Self::StorageError> {
+        Ok(Self {
+            min_surb_threshold: debug_config.minimum_reply_surb_storage_threshold,
+            max_surb_threshold: debug_config.maximum_reply_surb_storage_threshold,
+        })
+    }
+
     async fn flush_surb_storage(
         &mut self,
         _storage: &CombinedReplyStorage,
@@ -63,6 +73,11 @@ impl ReplyStorageBackend for Empty {
 pub trait ReplyStorageBackend: Sized {
     type StorageError: Error + 'static;
 
+    async fn new(
+        debug_config: &crate::config::DebugConfig,
+        db_path: Option<PathBuf>,
+    ) -> Result<Self, Self::StorageError>;
+
     fn is_active(&self) -> bool {
         true
     }

clients/client-core/src/config/mod.rs

@@ -171,10 +171,15 @@ impl<T> Config<T> {
         self
     }
 
-    pub fn with_gateway_endpoint(&mut self, gateway_endpoint: GatewayEndpointConfig) {
+    pub fn set_gateway_endpoint(&mut self, gateway_endpoint: GatewayEndpointConfig) {
         self.client.gateway_endpoint = gateway_endpoint;
     }
 
+    pub fn with_gateway_endpoint(mut self, gateway_endpoint: GatewayEndpointConfig) -> Self {
+        self.client.gateway_endpoint = gateway_endpoint;
+        self
+    }
+
     pub fn with_gateway_id<S: Into<String>>(&mut self, id: S) {
         self.client.gateway_endpoint.gateway_id = id.into();
     }
@@ -546,35 +551,35 @@ impl<T: NymConfig> Default for Client<T> {
 
 impl<T: NymConfig> Client<T> {
     fn default_private_identity_key_file(id: &str) -> PathBuf {
-        T::default_data_directory(Some(id)).join("private_identity.pem")
+        T::default_data_directory(id).join("private_identity.pem")
     }
 
     fn default_public_identity_key_file(id: &str) -> PathBuf {
-        T::default_data_directory(Some(id)).join("public_identity.pem")
+        T::default_data_directory(id).join("public_identity.pem")
     }
 
     fn default_private_encryption_key_file(id: &str) -> PathBuf {
-        T::default_data_directory(Some(id)).join("private_encryption.pem")
+        T::default_data_directory(id).join("private_encryption.pem")
     }
 
     fn default_public_encryption_key_file(id: &str) -> PathBuf {
-        T::default_data_directory(Some(id)).join("public_encryption.pem")
+        T::default_data_directory(id).join("public_encryption.pem")
     }
 
     fn default_gateway_shared_key_file(id: &str) -> PathBuf {
-        T::default_data_directory(Some(id)).join("gateway_shared.pem")
+        T::default_data_directory(id).join("gateway_shared.pem")
     }
 
     fn default_ack_key_file(id: &str) -> PathBuf {
-        T::default_data_directory(Some(id)).join("ack_key.pem")
+        T::default_data_directory(id).join("ack_key.pem")
     }
 
     fn default_reply_surb_database_path(id: &str) -> PathBuf {
-        T::default_data_directory(Some(id)).join("persistent_reply_store.sqlite")
+        T::default_data_directory(id).join("persistent_reply_store.sqlite")
     }
 
     fn default_database_path(id: &str) -> PathBuf {
-        T::default_data_directory(Some(id)).join(DB_FILE_NAME)
+        T::default_data_directory(id).join(DB_FILE_NAME)
     }
 }
 

clients/client-core/src/init/mod.rs

@@ -149,7 +149,7 @@ pub fn load_existing_gateway_config<T>(id: &str) -> Result<GatewayEndpointConfig
 where
     T: NymConfig + ClientCoreConfigTrait,
 {
-    T::load_from_file(Some(id))
+    T::load_from_file(id)
         .map(|existing_config| existing_config.get_gateway_endpoint().clone())
         .map_err(|err| {
             log::error!(

clients/credential/Cargo.toml

@@ -8,6 +8,7 @@ edition = "2021"
 [dependencies]
 bip39 = "1.0.1"
 clap = { version = "4.0", features = ["cargo", "derive"] }
+log = "0.4"
 rand = "0.7.3"
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
@@ -20,6 +21,7 @@ completions = { path = "../../common/completions" }
 credentials = { path = "../../common/credentials" }
 credential-storage = { path = "../../common/credential-storage" }
 crypto = { path = "../../common/crypto", features = ["rand", "asymmetric", "symmetric", "aes", "hashing"] }
+logging = { path = "../../common/logging"}
 network-defaults = { path = "../../common/network-defaults" }
 pemstore = { path = "../../common/pemstore" }
 validator-client = { path = "../../common/client-libs/validator-client", features = ["nyxd-client"] }

clients/credential/src/commands.rs

@@ -1,8 +1,9 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use clap::{Args, Subcommand};
+use clap::{ArgGroup, Args, Subcommand};
 use completions::ArgShell;
+use log::*;
 use rand::rngs::OsRng;
 use std::str::FromStr;
 
@@ -12,18 +13,20 @@ use credential_storage::PersistentStorage;
 use credentials::coconut::bandwidth::{BandwidthVoucher, TOTAL_ATTRIBUTES};
 use credentials::coconut::utils::obtain_aggregate_signature;
 use crypto::asymmetric::{encryption, identity};
-use network_defaults::{NymNetworkDetails, VOUCHER_INFO};
+use network_defaults::VOUCHER_INFO;
 use validator_client::nyxd::traits::DkgQueryClient;
 use validator_client::nyxd::tx::Hash;
-use validator_client::{CoconutApiClient, Config};
+use validator_client::nyxd::CosmWasmClient;
+use validator_client::CoconutApiClient;
 
 use crate::client::Client;
 use crate::error::{CredentialClientError, Result};
+use crate::recovery_storage::RecoveryStorage;
 use crate::state::{KeyPair, State};
 
 #[derive(Subcommand)]
 pub(crate) enum Command {
-    /// Run the binary
+    /// Run the binary to obtain a credential
     Run(Run),
 
     /// Generate shell completions
@@ -34,6 +37,11 @@ pub(crate) enum Command {
 }
 
 #[derive(Args)]
+#[clap(group(
+ArgGroup::new("recov")
+.required(true)
+.args(&["amount", "recovery_mode"]),
+))]
 pub(crate) struct Run {
     /// Home directory of the client that is supposed to use the credential.
     #[clap(long)]
@@ -47,15 +55,25 @@ pub(crate) struct Run {
     #[clap(long)]
     pub(crate) mnemonic: String,
 
-    /// The amount of utokens the credential will hold
-    #[clap(long)]
+    /// The amount of utokens the credential will hold. If recovery mode is enabled, this value
+    /// is not needed
+    #[clap(long, default_value = "0")]
     pub(crate) amount: u64,
+
+    /// Path to a directory used to store recovery files for unconsumed deposits
+    #[clap(long)]
+    pub(crate) recovery_dir: std::path::PathBuf,
+
+    /// Recovery mode, when enabled, tries to recover any deposit data dumped in recovery_dir
+    #[clap(long)]
+    pub(crate) recovery_mode: bool,
 }
 
 pub(crate) async fn deposit(nyxd_url: &str, mnemonic: &str, amount: u64) -> Result<State> {
     let mut rng = OsRng;
     let signing_keypair = KeyPair::from(identity::KeyPair::new(&mut rng));
     let encryption_keypair = KeyPair::from(encryption::KeyPair::new(&mut rng));
+    let params = Parameters::new(TOTAL_ATTRIBUTES).unwrap();
 
     let client = Client::new(nyxd_url, mnemonic);
     let tx_hash = client
@@ -67,46 +85,47 @@ pub(crate) async fn deposit(nyxd_url: &str, mnemonic: &str, amount: u64) -> Resu
         )
         .await?;
 
-    let state = State {
-        amount,
-        tx_hash,
-        signing_keypair,
-        encryption_keypair,
-    };
+    let voucher = BandwidthVoucher::new(
+        &params,
+        amount.to_string(),
+        VOUCHER_INFO.to_string(),
+        Hash::from_str(&tx_hash).map_err(|_| CredentialClientError::InvalidTxHash)?,
+        identity::PrivateKey::from_base58_string(&signing_keypair.private_key)?,
+        encryption::PrivateKey::from_base58_string(&encryption_keypair.private_key)?,
+    );
+
+    let state = State { voucher, params };
 
     Ok(state)
 }
 
-pub(crate) async fn get_credential(state: &State, shared_storage: PersistentStorage) -> Result<()> {
-    let network_details = NymNetworkDetails::new_from_env();
-    let config = Config::try_from_nym_network_details(&network_details)?;
-    let client = validator_client::Client::new_query(config)?;
+pub(crate) async fn get_credential<C: Clone + CosmWasmClient + Send + Sync>(
+    state: &State,
+    client: validator_client::Client<C>,
+    shared_storage: PersistentStorage,
+) -> Result<()> {
     let epoch_id = client.nyxd.get_current_epoch().await?.epoch_id;
+    let threshold = client
+        .nyxd
+        .get_current_epoch_threshold()
+        .await?
+        .ok_or(CredentialClientError::NoThreshold)?;
     let coconut_api_clients = CoconutApiClient::all_coconut_api_clients(&client, epoch_id).await?;
 
-    let params = Parameters::new(TOTAL_ATTRIBUTES).unwrap();
-    let bandwidth_credential_attributes = BandwidthVoucher::new(
-        &params,
-        state.amount.to_string(),
-        VOUCHER_INFO.to_string(),
-        Hash::from_str(&state.tx_hash).map_err(|_| CredentialClientError::InvalidTxHash)?,
-        identity::PrivateKey::from_base58_string(&state.signing_keypair.private_key)?,
-        encryption::PrivateKey::from_base58_string(&state.encryption_keypair.private_key)?,
-    );
-
     let signature = obtain_aggregate_signature(
-        &params,
-        &bandwidth_credential_attributes,
+        &state.params,
+        &state.voucher,
         &coconut_api_clients,
+        threshold,
     )
     .await?;
-    println!("Signature: {:?}", signature.to_bs58());
+    info!("Signature: {:?}", signature.to_bs58());
     shared_storage
         .insert_coconut_credential(
-            state.amount.to_string(),
+            state.voucher.get_voucher_value(),
             VOUCHER_INFO.to_string(),
-            bandwidth_credential_attributes.get_private_attributes()[0].to_bs58(),
-            bandwidth_credential_attributes.get_private_attributes()[1].to_bs58(),
+            state.voucher.get_private_attributes()[0].to_bs58(),
+            state.voucher.get_private_attributes()[1].to_bs58(),
             signature.to_bs58(),
             epoch_id.to_string(),
         )
@@ -114,3 +133,33 @@ pub(crate) async fn get_credential(state: &State, shared_storage: PersistentStor
 
     Ok(())
 }
+
+pub(crate) async fn recover_credentials<C: Clone + CosmWasmClient + Send + Sync>(
+    client: validator_client::Client<C>,
+    recovery_storage: &RecoveryStorage,
+    shared_storage: PersistentStorage,
+) -> Result<()> {
+    for voucher in recovery_storage.unconsumed_vouchers()? {
+        let state = State {
+            voucher,
+            params: Parameters::new(TOTAL_ATTRIBUTES).unwrap(),
+        };
+        if let Err(e) = get_credential(&state, client.clone(), shared_storage.clone()).await {
+            error!(
+                "Could not recover deposit {} due to {:?}, try again later",
+                state.voucher.tx_hash(),
+                e
+            )
+        } else {
+            info!(
+                "Converted deposit {} to a credential, removing recovery data for it",
+                state.voucher.tx_hash()
+            );
+            if let Err(e) = recovery_storage.remove_voucher(state.voucher.tx_hash().to_string()) {
+                warn!("Could not remove recovery data - {:?}", e);
+            }
+        }
+    }
+
+    Ok(())
+}

clients/credential/src/error.rs

@@ -1,6 +1,7 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use std::time::SystemTimeError;
 use thiserror::Error;
 
 use credential_storage::error::StorageError;
@@ -14,6 +15,9 @@ pub type Result<T> = std::result::Result<T, CredentialClientError>;
 
 #[derive(Error, Debug)]
 pub enum CredentialClientError {
+    #[error("IO error: {0}")]
+    IOError(#[from] std::io::Error),
+
     #[error("Nyxd error: {0}")]
     Nyxd(#[from] NyxdError),
 
@@ -34,4 +38,10 @@ pub enum CredentialClientError {
 
     #[error("Could not use shared storage")]
     SharedStorageError(#[from] StorageError),
+
+    #[error("Could not get system time")]
+    SysTimeError(#[from] SystemTimeError),
+
+    #[error("Threshold not set yet")]
+    NoThreshold,
 }

clients/credential/src/main.rs

@@ -4,15 +4,25 @@
 mod client;
 mod commands;
 mod error;
+mod recovery_storage;
 mod state;
 
 use commands::*;
 use completions::fig_generate;
 use config::{DATA_DIR, DB_FILE_NAME};
 use error::Result;
-use network_defaults::setup_env;
+use log::*;
+use network_defaults::{setup_env, NymNetworkDetails};
+use std::process::exit;
+use std::time::{Duration, SystemTime};
 
 use clap::{CommandFactory, Parser};
+use logging::setup_logging;
+use validator_client::nyxd::traits::DkgQueryClient;
+use validator_client::nyxd::CosmWasmClient;
+use validator_client::Config;
+
+const SAFETY_BUFFER_SECS: u64 = 60; // 1 minute
 
 #[derive(Parser)]
 #[clap(author = "Nymtech", version, about)]
@@ -25,9 +35,36 @@ struct Cli {
     pub(crate) command: Command,
 }
 
+async fn block_until_coconut_is_available<C: Clone + CosmWasmClient + Send + Sync>(
+    client: &validator_client::Client<C>,
+) -> Result<()> {
+    loop {
+        let epoch = client.nyxd.get_current_epoch().await?;
+        let current_timestamp_secs = SystemTime::now()
+            .duration_since(SystemTime::UNIX_EPOCH)?
+            .as_secs();
+        if epoch.state.is_final() {
+            if current_timestamp_secs + SAFETY_BUFFER_SECS >= epoch.finish_timestamp.seconds() {
+                info!("In the next {} minute(s), a transition will take place in the coconut system. Deposits should be halted in this time for safety reasons.", SAFETY_BUFFER_SECS / 60);
+                exit(0);
+            }
+
+            break;
+        } else {
+            // Use 20 additional seconds to avoid the exact moment of going into the final epoch state
+            let secs_until_final = epoch.final_timestamp_secs() + 20 - current_timestamp_secs;
+            info!("Approximately {} seconds until coconut is available. Sleeping until then. You can safely kill the process at any moment.", secs_until_final);
+            std::thread::sleep(Duration::from_secs(secs_until_final));
+        }
+    }
+
+    Ok(())
+}
+
 #[tokio::main]
 async fn main() -> Result<()> {
     let args = Cli::parse();
+    setup_logging();
     setup_env(args.config_env_file.as_ref());
     let bin_name = "nym-credential-client";
 
@@ -35,9 +72,34 @@ async fn main() -> Result<()> {
         Command::Run(r) => {
             let db_path = r.client_home_directory.join(DATA_DIR).join(DB_FILE_NAME);
             let shared_storage = credential_storage::initialise_storage(db_path).await;
+            let recovery_storage = recovery_storage::RecoveryStorage::new(r.recovery_dir)?;
 
-            let state = deposit(&r.nyxd_url, &r.mnemonic, r.amount).await?;
-            get_credential(&state, shared_storage).await?;
+            let network_details = NymNetworkDetails::new_from_env();
+            let config = Config::try_from_nym_network_details(&network_details)?;
+            let client = validator_client::Client::new_query(config)?;
+
+            block_until_coconut_is_available(&client).await?;
+            info!("Starting depositing funds, don't kill the process");
+
+            if !r.recovery_mode {
+                let state = deposit(&r.nyxd_url, &r.mnemonic, r.amount).await?;
+                if get_credential(&state, client, shared_storage)
+                    .await
+                    .is_err()
+                {
+                    warn!("Failed to obtain credential. Dumping recovery data.",);
+                    match recovery_storage.insert_voucher(&state.voucher) {
+                        Ok(file_path) => {
+                            warn!("Dumped recovery data to {:?}. Try using recovery mode to convert it to a credential", file_path);
+                        }
+                        Err(e) => {
+                            error!("Could not dump recovery data to file system due to {:?}, the deposit will be lost!", e)
+                        }
+                    }
+                }
+            } else {
+                recover_credentials(client, &recovery_storage, shared_storage).await?;
+            }
         }
         Command::Completions(c) => c.generate(&mut crate::Cli::command(), bin_name),
         Command::GenerateFigSpec => fig_generate(&mut crate::Cli::command(), bin_name),

clients/credential/src/recovery_storage.rs

@@ -0,0 +1,56 @@
+// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use credentials::coconut::bandwidth::BandwidthVoucher;
+use std::fs::{create_dir_all, read_dir, File};
+use std::io::{Read, Write};
+use std::path::PathBuf;
+
+pub struct RecoveryStorage {
+    recovery_dir: PathBuf,
+}
+
+impl RecoveryStorage {
+    pub fn new(recovery_dir: PathBuf) -> std::io::Result<Self> {
+        create_dir_all(&recovery_dir)?;
+        Ok(Self { recovery_dir })
+    }
+
+    pub fn unconsumed_vouchers(&self) -> std::io::Result<impl Iterator<Item = BandwidthVoucher>> {
+        Ok(read_dir(&self.recovery_dir)?
+            .filter_map(|entry| entry.ok())
+            .filter_map(|entry| {
+                let path = entry.path();
+                if path.is_file() {
+                    Some(path)
+                } else {
+                    None
+                }
+            })
+            .filter_map(|path| File::open(path).ok())
+            .filter_map(|mut f| {
+                let mut buff = Vec::new();
+                if f.read_to_end(&mut buff).is_ok() {
+                    Some(buff)
+                } else {
+                    None
+                }
+            })
+            .filter_map(|buff| BandwidthVoucher::try_from_bytes(&buff).ok()))
+    }
+
+    pub fn insert_voucher(&self, voucher: &BandwidthVoucher) -> std::io::Result<PathBuf> {
+        let file_name = voucher.tx_hash().to_string();
+        let file_path = self.recovery_dir.join(file_name);
+        let mut file = File::create(&file_path)?;
+        let buff = voucher.to_bytes();
+        file.write_all(&buff)?;
+
+        Ok(file_path)
+    }
+
+    pub fn remove_voucher(&self, file_name: String) -> std::io::Result<()> {
+        let file_path = self.recovery_dir.join(file_name);
+        std::fs::remove_file(file_path)
+    }
+}

clients/credential/src/state.rs

@@ -1,11 +1,11 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use serde::{Deserialize, Serialize};
+use coconut_interface::Parameters;
+use credentials::coconut::bandwidth::BandwidthVoucher;
 
 use crypto::asymmetric::{encryption, identity};
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
 pub(crate) struct KeyPair {
     pub public_key: String,
     pub private_key: String,
@@ -29,10 +29,7 @@ impl From<encryption::KeyPair> for KeyPair {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
 pub(crate) struct State {
-    pub amount: u64,
-    pub tx_hash: String,
-    pub signing_keypair: KeyPair,
-    pub encryption_keypair: KeyPair,
+    pub voucher: BandwidthVoucher,
+    pub params: Parameters,
 }

clients/native/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.7"
+version = "1.1.8"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"

clients/native/src/client/config/mod.rs

@@ -2,16 +2,19 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::client::config::template::config_template;
-pub use client_core::config::Config as BaseConfig;
-pub use client_core::config::MISSING_VALUE;
-use client_core::config::{ClientCoreConfigTrait, DebugConfig};
+use client_core::config::ClientCoreConfigTrait;
 use config::defaults::DEFAULT_WEBSOCKET_LISTENING_PORT;
 use config::{NymConfig, OptionalSet};
 use serde::{Deserialize, Serialize};
 use std::fmt::Debug;
+use std::net::{IpAddr, Ipv4Addr};
 use std::path::PathBuf;
 use std::str::FromStr;
 
+pub use client_core::config::Config as BaseConfig;
+pub use client_core::config::MISSING_VALUE;
+pub use client_core::config::{DebugConfig, GatewayEndpointConfig};
+
 mod template;
 
 #[derive(Debug, Deserialize, PartialEq, Eq, Serialize, Clone, Copy)]
@@ -104,6 +107,11 @@ impl Config {
         self
     }
 
+    pub fn with_host(mut self, host: IpAddr) -> Self {
+        self.socket.host = host;
+        self
+    }
+
     pub fn with_port(mut self, port: u16) -> Self {
         self.socket.listening_port = port;
         self
@@ -130,6 +138,10 @@ impl Config {
         self.socket.socket_type
     }
 
+    pub fn get_listening_ip(&self) -> IpAddr {
+        self.socket.host
+    }
+
     pub fn get_listening_port(&self) -> u16 {
         self.socket.listening_port
     }
@@ -180,9 +192,10 @@ impl Config {
 }
 
 #[derive(Debug, Deserialize, PartialEq, Eq, Serialize)]
-#[serde(deny_unknown_fields)]
+#[serde(default, deny_unknown_fields)]
 pub struct Socket {
     socket_type: SocketType,
+    host: IpAddr,
     listening_port: u16,
 }
 
@@ -190,6 +203,7 @@ impl Default for Socket {
     fn default() -> Self {
         Socket {
             socket_type: SocketType::WebSocket,
+            host: IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)),
             listening_port: DEFAULT_WEBSOCKET_LISTENING_PORT,
         }
     }

clients/native/src/client/config/template.rs

@@ -93,6 +93,9 @@ socket_type = '{{ socket.socket_type }}'
 # will be listening for incoming requests
 listening_port = {{ socket.listening_port }}
 
+# if applicable (for the case of 'WebSocket'), the ip address on which the client
+# will be listening for incoming requests
+host = '{{ socket.host }}'
 
 ##### logging configuration options #####
 

clients/native/src/client/mod.rs

@@ -11,19 +11,22 @@ use client_core::client::base_client::{
     non_wasm_helpers, BaseClientBuilder, ClientInput, ClientOutput, ClientState,
 };
 use client_core::client::inbound_messages::InputMessage;
-use client_core::client::key_manager::KeyManager;
-use client_core::client::received_buffer::{ReceivedBufferMessage, ReconstructedMessagesReceiver};
+use client_core::client::received_buffer::{
+    ReceivedBufferMessage, ReceivedBufferRequestSender, ReconstructedMessagesReceiver,
+};
 use client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
 use futures::channel::mpsc;
 use gateway_client::bandwidth::BandwidthController;
 use log::*;
-use nymsphinx::addressing::clients::Recipient;
 use nymsphinx::anonymous_replies::requests::AnonymousSenderTag;
-use nymsphinx::receiver::ReconstructedMessage;
 use task::TaskManager;
+use tokio::sync::watch::error::SendError;
 use validator_client::nyxd::QueryNyxdClient;
 
-pub(crate) mod config;
+pub use client_core::client::key_manager::KeyManager;
+pub use nymsphinx::addressing::clients::Recipient;
+pub use nymsphinx::receiver::ReconstructedMessage;
+pub mod config;
 
 pub struct SocketClient {
     /// Client configuration options, including, among other things, packet sending rates,
@@ -45,6 +48,13 @@ impl SocketClient {
         }
     }
 
+    pub fn new_with_keys(config: Config, key_manager: KeyManager) -> Self {
+        SocketClient {
+            config,
+            key_manager,
+        }
+    }
+
     async fn create_bandwidth_controller(config: &Config) -> BandwidthController<QueryNyxdClient> {
         let details = network_defaults::NymNetworkDetails::new_from_env();
         let mut client_config = validator_client::Config::try_from_nym_network_details(&details)
@@ -102,7 +112,8 @@ impl SocketClient {
             reply_controller_sender,
         );
 
-        websocket::Listener::new(config.get_listening_port()).start(websocket_handler, shutdown);
+        websocket::Listener::new(config.get_listening_ip(), config.get_listening_port())
+            .start(websocket_handler, shutdown);
     }
 
     /// blocking version of `start_socket` method. Will run forever (or until SIGINT is sent)
@@ -119,10 +130,17 @@ impl SocketClient {
             return Err(ClientError::InvalidSocketMode);
         }
 
+        // don't create bandwidth controller if credentials are disabled
+        let bandwidth_controller = if self.config.get_base().get_disabled_credentials_mode() {
+            None
+        } else {
+            Some(Self::create_bandwidth_controller(&self.config).await)
+        };
+
         let base_builder = BaseClientBuilder::new_from_base_config(
             self.config.get_base(),
             self.key_manager,
-            Some(Self::create_bandwidth_controller(&self.config).await),
+            bandwidth_controller,
             non_wasm_helpers::setup_fs_reply_surb_backend(
                 Some(self.config.get_base().get_reply_surb_database_path()),
                 self.config.get_debug_settings(),
@@ -156,10 +174,17 @@ impl SocketClient {
             return Err(ClientError::InvalidSocketMode);
         }
 
+        // don't create bandwidth controller if credentials are disabled
+        let bandwidth_controller = if self.config.get_base().get_disabled_credentials_mode() {
+            None
+        } else {
+            Some(Self::create_bandwidth_controller(&self.config).await)
+        };
+
         let base_client = BaseClientBuilder::new_from_base_config(
             self.config.get_base(),
             self.key_manager,
-            Some(Self::create_bandwidth_controller(&self.config).await),
+            bandwidth_controller,
             non_wasm_helpers::setup_fs_reply_surb_backend(
                 Some(self.config.get_base().get_reply_surb_database_path()),
                 self.config.get_debug_settings(),
@@ -167,6 +192,8 @@ impl SocketClient {
             .await?,
         );
 
+        let address = base_client.as_mix_recipient();
+
         let mut started_client = base_client.start_base().await?;
         let client_input = started_client.client_input.register_producer();
         let client_output = started_client.client_output.register_consumer();
@@ -184,21 +211,38 @@ impl SocketClient {
 
         Ok(DirectClient {
             client_input,
+            _received_buffer_request_sender: client_output.received_buffer_request_sender,
             reconstructed_receiver,
-            _shutdown_notifier: started_client.task_manager,
+            address,
+            shutdown_notifier: started_client.task_manager,
         })
     }
 }
 
 pub struct DirectClient {
     client_input: ClientInput,
+    // make sure to not drop the channel
+    _received_buffer_request_sender: ReceivedBufferRequestSender,
     reconstructed_receiver: ReconstructedMessagesReceiver,
+    address: Recipient,
 
     // we need to keep reference to this guy otherwise things will start dropping
-    _shutdown_notifier: TaskManager,
+    shutdown_notifier: TaskManager,
 }
 
 impl DirectClient {
+    pub fn address(&self) -> &Recipient {
+        &self.address
+    }
+
+    pub fn signal_shutdown(&self) -> Result<(), SendError<()>> {
+        self.shutdown_notifier.signal_shutdown()
+    }
+
+    pub async fn wait_for_shutdown(&mut self) {
+        self.shutdown_notifier.wait_for_shutdown().await
+    }
+
     /// EXPERIMENTAL DIRECT RUST API
     /// It's untested and there are absolutely no guarantees about it (but seems to have worked
     /// well enough in local tests)

clients/native/src/commands/init.rs

@@ -12,6 +12,7 @@ use crypto::asymmetric::identity;
 use nymsphinx::addressing::clients::Recipient;
 use serde::Serialize;
 use std::fmt::Display;
+use std::net::IpAddr;
 use tap::TapFallible;
 
 #[derive(Args, Clone)]
@@ -30,7 +31,7 @@ pub(crate) struct Init {
     force_register_gateway: bool,
 
     /// Comma separated list of rest endpoints of the nyxd validators
-    #[clap(long, alias = "nymd_validators", value_delimiter = ',')]
+    #[clap(long, alias = "nyxd_validators", value_delimiter = ',', hide = true)]
     nyxd_urls: Option<Vec<url::Url>>,
 
     /// Comma separated list of rest endpoints of the API validators
@@ -46,6 +47,10 @@ pub(crate) struct Init {
     #[clap(short, long)]
     port: Option<u16>,
 
+    /// Ip for the socket (if applicable) to listen for requests.
+    #[clap(long)]
+    host: Option<IpAddr>,
+
     /// Mostly debug-related option to increase default traffic rate so that you would not need to
     /// modify config post init
     #[clap(long, hide = true)]
@@ -57,7 +62,7 @@ pub(crate) struct Init {
 
     /// Set this client to work in a enabled credentials mode that would attempt to use gateway
     /// with bandwidth credential requirement.
-    #[clap(long)]
+    #[clap(long, hide = true)]
     enabled_credentials_mode: Option<bool>,
 
     /// Save a summary of the initialization to a json file
@@ -71,6 +76,7 @@ impl From<Init> for OverrideConfig {
             nym_apis: init_config.nym_apis,
             disable_socket: init_config.disable_socket,
             port: init_config.port,
+            host: init_config.host,
             fastmode: init_config.fastmode,
             no_cover: init_config.no_cover,
 
@@ -108,7 +114,7 @@ pub(crate) async fn execute(args: &Init) -> Result<(), ClientError> {
 
     let id = &args.id;
 
-    let already_init = Config::default_config_file_path(Some(id)).exists();
+    let already_init = Config::default_config_file_path(id).exists();
     if already_init {
         println!("Client \"{id}\" was already initialised before");
     }
@@ -141,7 +147,7 @@ pub(crate) async fn execute(args: &Init) -> Result<(), ClientError> {
     .await
     .tap_err(|err| eprintln!("Failed to setup gateway\nError: {err}"))?;
 
-    config.get_base_mut().with_gateway_endpoint(gateway);
+    config.get_base_mut().set_gateway_endpoint(gateway);
 
     config.save_to_file(None).tap_err(|_| {
         log::error!("Failed to save the config file");

clients/native/src/commands/mod.rs

@@ -9,6 +9,7 @@ use completions::{fig_generate, ArgShell};
 use config::OptionalSet;
 use lazy_static::lazy_static;
 use std::error::Error;
+use std::net::IpAddr;
 
 pub(crate) mod init;
 pub(crate) mod run;
@@ -56,6 +57,7 @@ pub(crate) struct OverrideConfig {
     nym_apis: Option<Vec<url::Url>>,
     disable_socket: Option<bool>,
     port: Option<u16>,
+    host: Option<IpAddr>,
     fastmode: bool,
     no_cover: bool,
     nyxd_urls: Option<Vec<url::Url>>,
@@ -81,6 +83,7 @@ pub(crate) fn override_config(config: Config, args: OverrideConfig) -> Config {
         .with_base(BaseConfig::with_high_default_traffic_volume, args.fastmode)
         .with_base(BaseConfig::with_disabled_cover_traffic, args.no_cover)
         .with_optional(Config::with_port, args.port)
+        .with_optional(Config::with_host, args.host)
         .with_optional_custom_env_ext(
             BaseConfig::with_custom_nym_apis,
             args.nym_apis,

clients/native/src/commands/run.rs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use std::error::Error;
+use std::net::IpAddr;
 
 use crate::{
     client::{config::Config, SocketClient},
@@ -22,7 +23,7 @@ pub(crate) struct Run {
     id: String,
 
     /// Comma separated list of rest endpoints of the nyxd validators
-    #[clap(long, alias = "nymd_validators", value_delimiter = ',')]
+    #[clap(long, alias = "nyxd_validators", value_delimiter = ',', hide = true)]
     nyxd_urls: Option<Vec<url::Url>>,
 
     /// Comma separated list of rest endpoints of the API validators
@@ -43,6 +44,10 @@ pub(crate) struct Run {
     #[clap(short, long)]
     port: Option<u16>,
 
+    /// Ip for the socket (if applicable) to listen for requests.
+    #[clap(long)]
+    host: Option<IpAddr>,
+
     /// Mostly debug-related option to increase default traffic rate so that you would not need to
     /// modify config post init
     #[clap(long, hide = true)]
@@ -54,7 +59,7 @@ pub(crate) struct Run {
 
     /// Set this client to work in a enabled credentials mode that would attempt to use gateway
     /// with bandwidth credential requirement.
-    #[clap(long)]
+    #[clap(long, hide = true)]
     enabled_credentials_mode: Option<bool>,
 }
 
@@ -64,6 +69,7 @@ impl From<Run> for OverrideConfig {
             nym_apis: run_config.nym_apis,
             disable_socket: run_config.disable_socket,
             port: run_config.port,
+            host: run_config.host,
             fastmode: run_config.fastmode,
             no_cover: run_config.no_cover,
             nyxd_urls: run_config.nyxd_urls,
@@ -94,7 +100,7 @@ fn version_check(cfg: &Config) -> bool {
 pub(crate) async fn execute(args: &Run) -> Result<(), Box<dyn Error + Send + Sync>> {
     let id = &args.id;
 
-    let mut config = match Config::load_from_file(Some(id)) {
+    let mut config = match Config::load_from_file(id) {
         Ok(cfg) => cfg,
         Err(err) => {
             error!("Failed to load config for {}. Are you sure you have run `init` before? (Error was: {err})", id);

clients/native/src/commands/upgrade.rs

@@ -131,7 +131,7 @@ pub(crate) fn execute(args: &Upgrade) {
 
     let id = &args.id;
 
-    let existing_config = Config::load_from_file(Some(id)).unwrap_or_else(|err| {
+    let existing_config = Config::load_from_file(id).unwrap_or_else(|err| {
         eprintln!("failed to load existing config file! - {err}");
         process::exit(1)
     });

clients/native/src/websocket/listener.rs

@@ -3,6 +3,7 @@
 
 use super::handler::HandlerBuilder;
 use log::*;
+use std::net::IpAddr;
 use std::{net::SocketAddr, process, sync::Arc};
 use tokio::io::AsyncWriteExt;
 use tokio::{sync::Notify, task::JoinHandle};
@@ -24,10 +25,9 @@ pub(crate) struct Listener {
 }
 
 impl Listener {
-    pub(crate) fn new(port: u16) -> Self {
+    pub(crate) fn new(host: IpAddr, port: u16) -> Self {
         Listener {
-            // unless we find compelling reason not to, just listen on local only
-            address: SocketAddr::new("127.0.0.1".parse().unwrap(), port),
+            address: SocketAddr::new(host, port),
             state: State::AwaitingConnection,
         }
     }

clients/socks5/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.7"
+version = "1.1.8"
 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"
@@ -19,8 +19,8 @@ log = { workspace = true }
 pin-project = "1.0"
 pretty_env_logger = "0.4"
 rand = { version = "0.7.3", features = ["wasm-bindgen"] }
-serde = { version = "1.0", features = ["derive"] } # for config serialization/deserialization
-serde_json = "1.0.89"
+serde = { workspace = true, features = ["derive"] } # for config serialization/deserialization
+serde_json = { workspace = true }
 tap = "1.0.1"
 thiserror = "1.0.34"
 tokio = { version = "1.24.1", features = ["rt-multi-thread", "net", "signal"] }
@@ -45,6 +45,7 @@ nymsphinx = { path = "../../common/nymsphinx" }
 ordered-buffer = { path = "../../common/socks5/ordered-buffer" }
 pemstore = { path = "../../common/pemstore" }
 proxy-helpers = { path = "../../common/socks5/proxy-helpers" }
+service-providers-common = { path = "../../service-providers/common" }
 socks5-requests = { path = "../../common/socks5/requests" }
 task = { path = "../../common/task" }
 topology = { path = "../../common/topology" }

clients/socks5/src/client/config/mod.rs

@@ -1,4 +1,4 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::client::config::template::config_template;
@@ -9,6 +9,8 @@ use config::defaults::DEFAULT_SOCKS5_LISTENING_PORT;
 use config::{NymConfig, OptionalSet};
 use nymsphinx::addressing::clients::Recipient;
 use serde::{Deserialize, Serialize};
+use service_providers_common::interface::ProviderInterfaceVersion;
+use socks5_requests::Socks5ProtocolVersion;
 use std::fmt::Debug;
 use std::path::PathBuf;
 use std::str::FromStr;
@@ -90,6 +92,16 @@ impl Config {
         self
     }
 
+    pub fn with_provider_interface_version(mut self, version: ProviderInterfaceVersion) -> Self {
+        self.socks5.provider_interface_version = version;
+        self
+    }
+
+    pub fn with_socks5_protocol_version(mut self, version: Socks5ProtocolVersion) -> Self {
+        self.socks5.socks5_protocol_version = version;
+        self
+    }
+
     pub fn with_anonymous_replies(mut self, anonymous_replies: bool) -> Self {
         self.socks5.send_anonymously = anonymous_replies;
         self
@@ -117,6 +129,14 @@ impl Config {
             .expect("malformed provider address")
     }
 
+    pub fn get_provider_interface_version(&self) -> ProviderInterfaceVersion {
+        self.socks5.provider_interface_version
+    }
+
+    pub fn get_socks5_protocol_version(&self) -> Socks5ProtocolVersion {
+        self.socks5.socks5_protocol_version
+    }
+
     pub fn get_send_anonymously(&self) -> bool {
         self.socks5.send_anonymously
     }
@@ -187,6 +207,15 @@ pub struct Socks5 {
     /// The mix address of the provider to which all requests are going to be sent.
     provider_mix_address: String,
 
+    /// The version of the 'service provider' this client is going to use in its communication with the
+    /// specified socks5 provider.
+    // if in doubt, use the legacy version as initially nobody will be using the updated binaries
+    #[serde(default = "ProviderInterfaceVersion::new_legacy")]
+    provider_interface_version: ProviderInterfaceVersion,
+
+    #[serde(default = "Socks5ProtocolVersion::new_legacy")]
+    socks5_protocol_version: Socks5ProtocolVersion,
+
     /// Specifies whether this client is going to use an anonymous sender tag for communication with the service provider.
     /// While this is going to hide its actual address information, it will make the actual communication
     /// slower and consume nearly double the bandwidth as it will require sending reply SURBs.
@@ -201,6 +230,8 @@ impl Socks5 {
         Socks5 {
             listening_port: DEFAULT_SOCKS5_LISTENING_PORT,
             provider_mix_address: provider_mix_address.into(),
+            provider_interface_version: ProviderInterfaceVersion::Legacy,
+            socks5_protocol_version: Socks5ProtocolVersion::Legacy,
             send_anonymously: false,
         }
     }
@@ -211,6 +242,8 @@ impl Default for Socks5 {
         Socks5 {
             listening_port: DEFAULT_SOCKS5_LISTENING_PORT,
             provider_mix_address: "".into(),
+            provider_interface_version: ProviderInterfaceVersion::Legacy,
+            socks5_protocol_version: Socks5ProtocolVersion::Legacy,
             send_anonymously: false,
         }
     }

clients/socks5/src/client/mod.rs

@@ -18,6 +18,7 @@ use client_core::client::key_manager::KeyManager;
 use client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
 use futures::channel::mpsc;
 use futures::StreamExt;
+#[cfg(not(feature = "mobile"))]
 use gateway_client::bandwidth::BandwidthController;
 use log::*;
 use nymsphinx::addressing::clients::Recipient;
@@ -69,6 +70,7 @@ impl NymClient {
         }
     }
 
+    #[cfg(not(feature = "mobile"))]
     async fn create_bandwidth_controller(config: &Config) -> BandwidthController<QueryNyxdClient> {
         let details = network_defaults::NymNetworkDetails::new_from_env();
         let mut client_config = validator_client::Config::try_from_nym_network_details(&details)
@@ -132,6 +134,8 @@ impl NymClient {
             self_address,
             shared_lane_queue_lengths,
             socks::client::Config::new(
+                config.get_provider_interface_version(),
+                config.get_socks5_protocol_version(),
                 config.get_send_anonymously(),
                 config.get_connection_start_surbs(),
                 config.get_per_request_surbs(),

clients/socks5/src/commands/init.rs

@@ -43,7 +43,7 @@ pub(crate) struct Init {
     force_register_gateway: bool,
 
     /// Comma separated list of rest endpoints of the nyxd validators
-    #[clap(long, alias = "nymd_validators", value_delimiter = ',')]
+    #[clap(long, alias = "nyxd_validators", value_delimiter = ',', hide = true)]
     nyxd_urls: Option<Vec<url::Url>>,
 
     /// Comma separated list of rest endpoints of the API validators
@@ -66,7 +66,7 @@ pub(crate) struct Init {
 
     /// Set this client to work in a enabled credentials mode that would attempt to use gateway
     /// with bandwidth credential requirement.
-    #[clap(long)]
+    #[clap(long, hide = true)]
     enabled_credentials_mode: Option<bool>,
 
     /// Save a summary of the initialization to a json file
@@ -117,7 +117,7 @@ pub(crate) async fn execute(args: &Init) -> Result<(), Socks5ClientError> {
     let id = &args.id;
     let provider_address = &args.provider;
 
-    let already_init = Config::default_config_file_path(Some(id)).exists();
+    let already_init = Config::default_config_file_path(id).exists();
     if already_init {
         println!("SOCKS5 client \"{id}\" was already initialised before");
     }
@@ -153,7 +153,9 @@ pub(crate) async fn execute(args: &Init) -> Result<(), Socks5ClientError> {
     .await
     .tap_err(|err| eprintln!("Failed to setup gateway\nError: {err}"))?;
 
-    config.get_base_mut().with_gateway_endpoint(gateway);
+    config.get_base_mut().set_gateway_endpoint(gateway);
+
+    // TODO: ask the service provider we specified for its interface version and set it in the config
 
     config.save_to_file(None).tap_err(|_| {
         log::error!("Failed to save the config file");

clients/socks5/src/commands/run.rs

@@ -43,7 +43,7 @@ pub(crate) struct Run {
     gateway: Option<identity::PublicKey>,
 
     /// Comma separated list of rest endpoints of the nyxd validators
-    #[clap(long, alias = "nymd_validators", value_delimiter = ',')]
+    #[clap(long, alias = "nyxd_validators", value_delimiter = ',', hide = true)]
     nyxd_urls: Option<Vec<url::Url>>,
 
     /// Comma separated list of rest endpoints of the Nym APIs
@@ -65,7 +65,7 @@ pub(crate) struct Run {
 
     /// Set this client to work in a enabled credentials mode that would attempt to use gateway
     /// with bandwidth credential requirement.
-    #[clap(long)]
+    #[clap(long, hide = true)]
     enabled_credentials_mode: Option<bool>,
 }
 
@@ -108,7 +108,7 @@ fn version_check(cfg: &Config) -> bool {
 pub(crate) async fn execute(args: &Run) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     let id = &args.id;
 
-    let mut config = match Config::load_from_file(Some(id)) {
+    let mut config = match Config::load_from_file(id) {
         Ok(cfg) => cfg,
         Err(err) => {
             error!("Failed to load config for {}. Are you sure you have run `init` before? (Error was: {err})", id);

clients/socks5/src/commands/upgrade.rs

@@ -144,7 +144,7 @@ pub(crate) fn execute(args: &Upgrade) {
 
     let id = &args.id;
 
-    let existing_config = Config::load_from_file(Some(id)).unwrap_or_else(|err| {
+    let existing_config = Config::load_from_file(id).unwrap_or_else(|err| {
         eprintln!("failed to load existing config file! - {err}");
         process::exit(1)
     });

clients/socks5/src/error.rs

@@ -1,6 +1,6 @@
 use crate::socks::types::SocksProxyError;
 use client_core::error::ClientCoreError;
-use socks5_requests::ConnectionId;
+use socks5_requests::{ConnectionError, ConnectionId};
 
 #[derive(thiserror::Error, Debug)]
 pub enum Socks5ClientError {
@@ -28,3 +28,12 @@ pub enum Socks5ClientError {
         error: String,
     },
 }
+
+impl From<ConnectionError> for Socks5ClientError {
+    fn from(value: ConnectionError) -> Self {
+        Socks5ClientError::NetworkRequesterError {
+            connection_id: value.connection_id,
+            error: value.network_requester_error,
+        }
+    }
+}

clients/socks5/src/socks/client.rs

@@ -16,7 +16,10 @@ use proxy_helpers::connection_controller::{
 };
 use proxy_helpers::proxy_runner::ProxyRunner;
 use rand::RngCore;
-use socks5_requests::{ConnectionId, Message, RemoteAddress, Request};
+use service_providers_common::interface::{ProviderInterfaceVersion, RequestVersion};
+use socks5_requests::{
+    ConnectionId, RemoteAddress, Socks5ProtocolVersion, Socks5ProviderRequest, Socks5Request,
+};
 use std::io;
 use std::net::SocketAddr;
 use std::pin::Pin;
@@ -128,6 +131,8 @@ impl AsyncWrite for StreamState {
 
 #[derive(Debug, Copy, Clone)]
 pub(crate) struct Config {
+    provider_interface_version: ProviderInterfaceVersion,
+    socks5_protocol_version: Socks5ProtocolVersion,
     use_surbs_for_responses: bool,
     connection_start_surbs: u32,
     per_request_surbs: u32,
@@ -135,16 +140,27 @@ pub(crate) struct Config {
 
 impl Config {
     pub(crate) fn new(
+        provider_interface_version: ProviderInterfaceVersion,
+        socks5_protocol_version: Socks5ProtocolVersion,
         use_surbs_for_responses: bool,
         connection_start_surbs: u32,
         per_request_surbs: u32,
     ) -> Self {
         Self {
+            provider_interface_version,
+            socks5_protocol_version,
             use_surbs_for_responses,
             connection_start_surbs,
             per_request_surbs,
         }
     }
+
+    fn request_version(&self) -> RequestVersion<Socks5Request> {
+        RequestVersion {
+            provider_interface: self.provider_interface_version,
+            provider_protocol: self.socks5_protocol_version,
+        }
+    }
 }
 
 /// A client connecting to the Socks proxy server, because
@@ -173,7 +189,9 @@ impl Drop for SocksClient {
         // if we never managed to start a proxy, the entry will not exist in the controller
         if self.started_proxy {
             self.controller_sender
-                .unbounded_send(ControllerCommand::Remove(self.connection_id))
+                .unbounded_send(ControllerCommand::Remove {
+                    connection_id: self.connection_id,
+                })
                 .unwrap();
         }
     }
@@ -248,19 +266,26 @@ impl SocksClient {
 
     // Send an error back to the client
     pub async fn send_error_v4(&mut self, r: ResponseCodeV4) -> Result<(), SocksProxyError> {
-        self.stream.write_all(&[SOCKS4_VERSION, r as u8]).await?;
-        Ok(())
+        self.stream
+            .write_all(&[SOCKS4_VERSION, r as u8])
+            .await
+            .map_err(|source| SocksProxyError::SocketWriteError { source })
     }
 
     pub async fn send_error_v5(&mut self, r: ResponseCodeV5) -> Result<(), SocksProxyError> {
-        self.stream.write_all(&[SOCKS5_VERSION, r as u8]).await?;
-        Ok(())
+        self.stream
+            .write_all(&[SOCKS5_VERSION, r as u8])
+            .await
+            .map_err(|source| SocksProxyError::SocketWriteError { source })
     }
 
     /// Shutdown the `TcpStream` to the client and end the session
     pub async fn shutdown(&mut self) -> Result<(), SocksProxyError> {
         info!("client is shutting down its TCP stream");
-        self.stream.shutdown().await?;
+        self.stream
+            .shutdown()
+            .await
+            .map_err(|source| SocksProxyError::SocketShutdownFailure { source })?;
         self.shutdown_listener.mark_as_success();
         Ok(())
     }
@@ -268,11 +293,20 @@ impl SocksClient {
     /// Initializes the new client, checking that the correct Socks version (5)
     /// is in use and that the client is authenticated, then runs the request.
     pub async fn run(&mut self) -> Result<(), SocksProxyError> {
-        debug!("New connection from: {}", self.stream.peer_addr()?.ip());
+        debug!(
+            "New connection from: {}",
+            self.stream
+                .peer_addr()
+                .map_err(|source| SocksProxyError::PeerAddrExtractionFailure { source })?
+                .ip()
+        );
 
         // Read a byte from the stream and determine the version being requested
         let mut header = [0u8];
-        self.stream.read_exact(&mut header).await?;
+        self.stream
+            .read_exact(&mut header)
+            .await
+            .map_err(|source| SocksProxyError::SocketReadError { source })?;
 
         self.socks_version = match SocksVersion::try_from(header[0]) {
             Ok(version) => Some(version),
@@ -284,7 +318,10 @@ impl SocksClient {
 
         if self.socks_version == Some(SocksVersion::V5) {
             let mut auth = [0u8];
-            self.stream.read_exact(&mut auth).await?;
+            self.stream
+                .read_exact(&mut auth)
+                .await
+                .map_err(|source| SocksProxyError::SocketReadError { source })?;
             self.auth_nmethods = auth[0];
             self.authenticate_socks5().await?;
         }
@@ -293,8 +330,15 @@ impl SocksClient {
     }
 
     async fn send_anonymous_connect_to_mixnet(&mut self, remote_address: RemoteAddress) {
-        let req = Request::new_connect(self.connection_id, remote_address, None);
-        let msg = Message::Request(req);
+        // TODO: simplify by using `request_version`
+        let req = Socks5Request::new_connect(
+            self.config.socks5_protocol_version,
+            self.connection_id,
+            remote_address,
+            None,
+        );
+        let msg =
+            Socks5ProviderRequest::new_provider_data(self.config.provider_interface_version, req);
 
         let input_message = InputMessage::new_anonymous(
             self.service_provider,
@@ -309,8 +353,15 @@ impl SocksClient {
     }
 
     async fn send_connect_to_mixnet_with_return_address(&mut self, remote_address: RemoteAddress) {
-        let req = Request::new_connect(self.connection_id, remote_address, Some(self.self_address));
-        let msg = Message::Request(req);
+        // TODO: simplify by using `request_version`
+        let req = Socks5Request::new_connect(
+            self.config.socks5_protocol_version,
+            self.connection_id,
+            remote_address,
+            Some(self.self_address),
+        );
+        let msg =
+            Socks5ProviderRequest::new_provider_data(self.config.provider_interface_version, req);
 
         let input_message = InputMessage::new_regular(
             self.service_provider,
@@ -350,6 +401,7 @@ impl SocksClient {
         let input_sender = self.input_sender.clone();
         let anonymous = self.config.use_surbs_for_responses;
         let per_request_surbs = self.config.per_request_surbs;
+        let request_version = self.config.request_version();
 
         let recipient = self.service_provider;
         let (stream, _) = ProxyRunner::new(
@@ -363,8 +415,16 @@ impl SocksClient {
             self.shutdown_listener.clone(),
         )
         .run(move |conn_id, read_data, socket_closed| {
-            let provider_request = Request::new_send(conn_id, read_data, socket_closed);
-            let provider_message = Message::Request(provider_request);
+            let provider_request = Socks5Request::new_send(
+                request_version.provider_protocol,
+                conn_id,
+                read_data,
+                socket_closed,
+            );
+            let provider_message = Socks5ProviderRequest::new_provider_data(
+                request_version.provider_interface,
+                provider_request,
+            );
             let lane = TransmissionLane::ConnectionId(conn_id);
             if anonymous {
                 InputMessage::new_anonymous(
@@ -413,7 +473,10 @@ impl SocksClient {
 
                 self.started_proxy = true;
                 self.controller_sender
-                    .unbounded_send(ControllerCommand::Insert(self.connection_id, mix_sender))
+                    .unbounded_send(ControllerCommand::Insert {
+                        connection_id: self.connection_id,
+                        connection_sender: mix_sender,
+                    })
                     .unwrap();
 
                 info!(
@@ -491,7 +554,13 @@ impl SocksClient {
     /// into the Authenticator (where it'll be more easily testable)
     /// would be a good next step.
     async fn authenticate_socks5(&mut self) -> Result<(), SocksProxyError> {
-        debug!("Authenticating w/ {}", self.stream.peer_addr()?.ip());
+        debug!(
+            "Authenticating w/ {}",
+            self.stream
+                .peer_addr()
+                .map_err(|source| SocksProxyError::PeerAddrExtractionFailure { source })?
+                .ip()
+        );
         // Get valid auth methods
         let methods = self.get_available_methods().await?;
         trace!("methods: {:?}", methods);
@@ -505,27 +574,45 @@ impl SocksClient {
             response[1] = AuthenticationMethods::UserPass as u8;
 
             debug!("Sending USER/PASS packet");
-            self.stream.write_all(&response).await?;
+            self.stream
+                .write_all(&response)
+                .await
+                .map_err(|source| SocksProxyError::SocketWriteError { source })?;
 
             let mut header = [0u8; 2];
 
             // Read a byte from the stream and determine the version being requested
-            self.stream.read_exact(&mut header).await?;
+            self.stream
+                .read_exact(&mut header)
+                .await
+                .map_err(|source| SocksProxyError::SocketReadError { source })?;
 
             // debug!("Auth Header: [{}, {}]", header[0], header[1]);
 
             // Username parsing
             let ulen = header[1];
             let mut username = vec![0; ulen as usize];
-            self.stream.read_exact(&mut username).await?;
+            self.stream
+                .read_exact(&mut username)
+                .await
+                .map_err(|source| SocksProxyError::SocketReadError { source })?;
 
             // Password Parsing
-            let plen = self.stream.read_u8().await?;
+            let plen = self
+                .stream
+                .read_u8()
+                .await
+                .map_err(|source| SocksProxyError::SocketReadError { source })?;
             let mut password = vec![0; plen as usize];
-            self.stream.read_exact(&mut password).await?;
+            self.stream
+                .read_exact(&mut password)
+                .await
+                .map_err(|source| SocksProxyError::SocketReadError { source })?;
 
-            let username_str = String::from_utf8(username)?;
-            let password_str = String::from_utf8(password)?;
+            let username_str = String::from_utf8(username)
+                .map_err(|source| SocksProxyError::MalformedAuthUsername { source })?;
+            let password_str = String::from_utf8(password)
+                .map_err(|source| SocksProxyError::MalformedAuthPassword { source })?;
 
             let user = User {
                 username: username_str,
@@ -536,11 +623,17 @@ impl SocksClient {
             if self.authenticator.is_allowed(&user) {
                 debug!("Access Granted. User: {}", user.username);
                 let response = [1, ResponseCodeV5::Success as u8];
-                self.stream.write_all(&response).await?;
+                self.stream
+                    .write_all(&response)
+                    .await
+                    .map_err(|source| SocksProxyError::SocketWriteError { source })?;
             } else {
                 debug!("Access Denied. User: {}", user.username);
                 let response = [1, ResponseCodeV5::Failure as u8];
-                self.stream.write_all(&response).await?;
+                self.stream
+                    .write_all(&response)
+                    .await
+                    .map_err(|source| SocksProxyError::SocketWriteError { source })?;
 
                 // Shutdown
                 self.shutdown().await?;
@@ -551,12 +644,18 @@ impl SocksClient {
             // set the default auth method (no auth)
             response[1] = AuthenticationMethods::NoAuth as u8;
             debug!("Sending NOAUTH packet");
-            self.stream.write_all(&response).await?;
+            self.stream
+                .write_all(&response)
+                .await
+                .map_err(|source| SocksProxyError::SocketWriteError { source })?;
             Ok(())
         } else {
             warn!("Client has no suitable authentication methods!");
             response[1] = AuthenticationMethods::NoMethods as u8;
-            self.stream.write_all(&response).await?;
+            self.stream
+                .write_all(&response)
+                .await
+                .map_err(|source| SocksProxyError::SocketWriteError { source })?;
             self.shutdown().await?;
             Err(ResponseCodeV5::Failure.into())
         }
@@ -567,7 +666,10 @@ impl SocksClient {
         let mut methods: Vec<u8> = Vec::with_capacity(self.auth_nmethods as usize);
         for _ in 0..self.auth_nmethods {
             let mut method = [0u8; 1];
-            self.stream.read_exact(&mut method).await?;
+            self.stream
+                .read_exact(&mut method)
+                .await
+                .map_err(|source| SocksProxyError::SocketReadError { source })?;
             if self.authenticator.auth_methods.contains(&method[0]) {
                 methods.append(&mut method.to_vec());
             }

clients/socks5/src/socks/mixnet_responses.rs

@@ -5,8 +5,9 @@ use log::*;
 use client_core::client::received_buffer::ReconstructedMessagesReceiver;
 use client_core::client::received_buffer::{ReceivedBufferMessage, ReceivedBufferRequestSender};
 use nymsphinx::receiver::ReconstructedMessage;
-use proxy_helpers::connection_controller::{ControllerCommand, ControllerSender};
-use socks5_requests::Message;
+use proxy_helpers::connection_controller::ControllerSender;
+use service_providers_common::interface::{ControlResponse, ResponseContent};
+use socks5_requests::{Socks5ProviderResponse, Socks5Response, Socks5ResponseContent};
 use task::TaskClient;
 
 use crate::error::Socks5ClientError;
@@ -52,6 +53,39 @@ impl MixnetResponseListener {
         }
     }
 
+    fn on_control_response(
+        &self,
+        control_response: ControlResponse,
+    ) -> Result<(), Socks5ClientError> {
+        error!("received a control response which we don't know how to handle yet!");
+        error!("got: {:?}", control_response);
+
+        // I guess we'd need another channel here to forward those to where they need to go
+
+        Ok(())
+    }
+
+    fn on_provider_data_response(
+        &self,
+        provider_response: Socks5Response,
+    ) -> Result<(), Socks5ClientError> {
+        match provider_response.content {
+            Socks5ResponseContent::ConnectionError(err_response) => {
+                error!(
+                    "Network requester failed on connection id {} with error: {}",
+                    err_response.connection_id, err_response.network_requester_error
+                );
+                Err(err_response.into())
+            }
+            Socks5ResponseContent::NetworkData(response) => {
+                self.controller_sender
+                    .unbounded_send(response.into())
+                    .unwrap();
+                Ok(())
+            }
+        }
+    }
+
     fn on_message(
         &self,
         reconstructed_message: ReconstructedMessage,
@@ -60,38 +94,28 @@ impl MixnetResponseListener {
         if reconstructed_message.sender_tag.is_some() {
             warn!("this message was sent anonymously - it couldn't have come from the service provider");
         }
-
-        let response = match Message::try_from_bytes(&raw_message) {
+        match Socks5ProviderResponse::try_from_bytes(&raw_message) {
             Err(err) => {
-                warn!("failed to parse received response - {err}");
-                return Ok(());
+                warn!("failed to parse received response: {err}");
+                Ok(())
             }
-            Ok(Message::Request(_)) => {
-                warn!("unexpected request");
-                return Ok(());
-            }
-            Ok(Message::Response(data)) => data,
-            Ok(Message::NetworkRequesterResponse(r)) => {
-                error!(
-                    "Network requester failed on connection id {} with error: {}",
-                    r.connection_id, r.network_requester_error
+            Ok(response) => {
+                // as long as the client used the same (or older) interface than the service provider,
+                // the response should have used exactly the same version
+                trace!(
+                    "the received response was sent with {:?} interface version",
+                    response.interface_version
                 );
-                return Err(Socks5ClientError::NetworkRequesterError {
-                    connection_id: r.connection_id,
-                    error: r.network_requester_error,
-                });
+                match response.content {
+                    ResponseContent::Control(control_response) => {
+                        self.on_control_response(control_response)
+                    }
+                    ResponseContent::ProviderData(provider_response) => {
+                        self.on_provider_data_response(provider_response)
+                    }
+                }
             }
-        };
-
-        self.controller_sender
-            .unbounded_send(ControllerCommand::Send(
-                response.connection_id,
-                response.data,
-                response.is_closed,
-            ))
-            .unwrap();
-
-        Ok(())
+        }
     }
 
     pub(crate) async fn run(&mut self) {

clients/socks5/src/socks/mod.rs

@@ -33,7 +33,7 @@ impl TryFrom<u8> for SocksVersion {
         match version {
             SOCKS4_VERSION => Ok(Self::V4),
             SOCKS5_VERSION => Ok(Self::V5),
-            _ => Err(SocksProxyError::UnsupportedProxyVersion(version)),
+            _ => Err(SocksProxyError::UnsupportedProxyVersion { version }),
         }
     }
 }

clients/socks5/src/socks/request.rs

@@ -28,7 +28,10 @@ impl SocksRequest {
         log::trace!("read from stream socks4");
 
         let mut packet = [0u8; 3];
-        stream.read_exact(&mut packet).await?;
+        stream
+            .read_exact(&mut packet)
+            .await
+            .map_err(|source| SocksProxyError::SocketReadError { source })?;
 
         // CD (command)
         let Some(command) = SocksCommand::from(packet[0] as usize) else {
@@ -43,7 +46,10 @@ impl SocksRequest {
 
         // DSTIP
         let mut ip = [0u8; 4];
-        stream.read_exact(&mut ip).await?;
+        stream
+            .read_exact(&mut ip)
+            .await
+            .map_err(|source| SocksProxyError::SocketReadError { source })?;
 
         // USERID
         let _userid = read_until_zero(stream).await;
@@ -76,12 +82,17 @@ impl SocksRequest {
 
         let mut packet = [0u8; 4];
         // Read a byte from the stream and determine the version being requested
-        stream.read_exact(&mut packet).await?;
+        stream
+            .read_exact(&mut packet)
+            .await
+            .map_err(|source| SocksProxyError::SocketReadError { source })?;
 
         // VER
         if packet[0] != SOCKS5_VERSION {
             warn!("Unsupported version: SOCKS{}", packet[0]);
-            return Err(SocksProxyError::UnsupportedProxyVersion(packet[0]));
+            return Err(SocksProxyError::UnsupportedProxyVersion {
+                version: (packet[0]),
+            });
         }
 
         // CMD
@@ -103,26 +114,41 @@ impl SocksRequest {
         let addr = match addr_type {
             AddrType::Domain => {
                 let mut domain_length = [0u8];
-                stream.read_exact(&mut domain_length).await?;
+                stream
+                    .read_exact(&mut domain_length)
+                    .await
+                    .map_err(|source| SocksProxyError::SocketReadError { source })?;
                 let mut domain = vec![0u8; domain_length[0] as usize];
-                stream.read_exact(&mut domain).await?;
+                stream
+                    .read_exact(&mut domain)
+                    .await
+                    .map_err(|source| SocksProxyError::SocketReadError { source })?;
                 domain
             }
             AddrType::V4 => {
                 let mut addr = [0u8; 4];
-                stream.read_exact(&mut addr).await?;
+                stream
+                    .read_exact(&mut addr)
+                    .await
+                    .map_err(|source| SocksProxyError::SocketReadError { source })?;
                 addr.to_vec()
             }
             AddrType::V6 => {
                 let mut addr = [0u8; 16];
-                stream.read_exact(&mut addr).await?;
+                stream
+                    .read_exact(&mut addr)
+                    .await
+                    .map_err(|source| SocksProxyError::SocketReadError { source })?;
                 addr.to_vec()
             }
         };
 
         // DST.PORT
         let mut port = [0u8; 2];
-        stream.read_exact(&mut port).await?;
+        stream
+            .read_exact(&mut port)
+            .await
+            .map_err(|source| SocksProxyError::SocketReadError { source })?;
         let port = merge_u8_into_u16(port[0], port[1]);
 
         Ok(SocksRequest {
@@ -179,7 +205,10 @@ where
     let mut result = Vec::new();
     let mut char = [0u8];
     loop {
-        stream.read_exact(&mut char).await?;
+        stream
+            .read_exact(&mut char)
+            .await
+            .map_err(|source| SocksProxyError::SocketReadError { source })?;
         if char[0] == 0 {
             break;
         }

clients/socks5/src/socks/server.rs

@@ -86,6 +86,11 @@ impl SphinxSocksServer {
             mixnet_response_listener.run().await;
         });
 
+        // TODO:, if required, there should be another task here responsible for control requests.
+        // it should get `input_sender` to send actual requests into the mixnet
+        // and some channel that connects it from `MixnetResponseListener` to receive
+        // any control responses
+
         loop {
             tokio::select! {
                 Ok((stream, _remote)) = listener.accept() => {

clients/socks5/src/socks/types.rs

@@ -1,3 +1,7 @@
+use socks5_requests::Socks5RequestError;
+use std::string::FromUtf8Error;
+use thiserror::Error;
+
 /// SOCKS4 Response codes
 #[allow(dead_code)]
 pub(crate) enum ResponseCodeV4 {
@@ -8,9 +12,8 @@ pub(crate) enum ResponseCodeV4 {
 }
 
 /// Possible SOCKS5 Response Codes
-#[allow(dead_code)]
-#[derive(Debug, thiserror::Error)]
-pub(crate) enum ResponseCodeV5 {
+#[derive(Debug, Error)]
+pub enum ResponseCodeV5 {
     #[error("SOCKS5 Server Success")]
     Success = 0x00,
     #[error("SOCKS5 Server Failure")]
@@ -31,30 +34,55 @@ pub(crate) enum ResponseCodeV5 {
     AddrTypeNotSupported = 0x08,
 }
 
-#[derive(Debug)]
+#[derive(Error, Debug)]
 pub enum SocksProxyError {
-    GenericError(Box<dyn std::error::Error + Send + Sync>),
-    UnsupportedProxyVersion(u8),
-}
+    #[error("{version} of the socks protocol is not supported by this client")]
+    UnsupportedProxyVersion { version: u8 },
 
-impl std::fmt::Display for SocksProxyError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            SocksProxyError::GenericError(err) => write!(f, "GenericError - {err}"),
-            SocksProxyError::UnsupportedProxyVersion(version) => {
-                write!(f, "Unsupported proxy version {}", version)
-            }
-        }
-    }
-}
+    #[error("failed to write to the socket: {source}")]
+    SocketWriteError {
+        #[source]
+        source: std::io::Error,
+    },
 
-impl<E> From<E> for SocksProxyError
-where
-    E: std::error::Error + Send + Sync + 'static,
-{
-    fn from(err: E) -> Self {
-        SocksProxyError::GenericError(Box::new(err))
-    }
+    #[error("failed to read from the socket: {source}")]
+    SocketReadError {
+        #[source]
+        source: std::io::Error,
+    },
+
+    #[error("failed to shutdown underlying socket stream: {source}")]
+    SocketShutdownFailure {
+        #[source]
+        source: std::io::Error,
+    },
+
+    #[error("failed to extract ip address of the connected peer: {source}")]
+    PeerAddrExtractionFailure {
+        #[source]
+        source: std::io::Error,
+    },
+
+    #[error("failed to authenticate user due to malformed username: {source}")]
+    MalformedAuthUsername {
+        #[source]
+        source: FromUtf8Error,
+    },
+
+    #[error("failed to authenticate user due to malformed password: {source}")]
+    MalformedAuthPassword {
+        #[source]
+        source: FromUtf8Error,
+    },
+
+    #[error(transparent)]
+    Socks5ResponseFailure(#[from] ResponseCodeV5),
+
+    #[error("could not complete the provider request: {source}")]
+    ProviderRequestFailure {
+        #[from]
+        source: Socks5RequestError,
+    },
 }
 
 /// DST.addr variant types

common/build-information/Cargo.toml

@@ -6,6 +6,10 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+serde = { workspace = true, features = ["derive"], optional = true }
 
 [build-dependencies]
 vergen = { version = "7", default-features = false, features = ["build", "git", "rustc", "cargo"] }
+
+[features]
+default = []

common/build-information/src/lib.rs

@@ -4,6 +4,7 @@
 // TODO: at a later date this crate should probably also expose `ContractBuildInformation`
 // and be used by our smart contracts
 
+#[derive(Debug)]
 pub struct BinaryBuildInformation {
     // VERGEN_BUILD_TIMESTAMP
     /// Provides the build timestamp, for example `2021-02-23T20:14:46.558472672+00:00`.
@@ -53,6 +54,19 @@ impl BinaryBuildInformation {
         }
     }
 
+    pub fn to_owned(&self) -> BinaryBuildInformationOwned {
+        BinaryBuildInformationOwned {
+            build_timestamp: self.build_timestamp.to_owned(),
+            build_version: self.build_version.to_owned(),
+            commit_sha: self.commit_sha.to_owned(),
+            commit_timestamp: self.commit_timestamp.to_owned(),
+            commit_branch: self.commit_branch.to_owned(),
+            rustc_version: self.rustc_version.to_owned(),
+            rustc_channel: self.rustc_channel.to_owned(),
+            cargo_profile: self.cargo_profile.to_owned(),
+        }
+    }
+
     pub fn pretty_print(&self) -> String {
         format!(
             r#"
@@ -84,3 +98,39 @@ impl BinaryBuildInformation {
         )
     }
 }
+
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub struct BinaryBuildInformationOwned {
+    // VERGEN_BUILD_TIMESTAMP
+    /// Provides the build timestamp, for example `2021-02-23T20:14:46.558472672+00:00`.
+    pub build_timestamp: String,
+
+    // VERGEN_BUILD_SEMVER
+    /// Provides the build version, for example `0.1.0-9-g46f83e1`.
+    pub build_version: String,
+
+    // VERGEN_GIT_SHA
+    /// Provides the hash of the commit that was used for the build, for example `46f83e112520533338245862d366f6a02cef07d4`.
+    pub commit_sha: String,
+
+    // VERGEN_GIT_COMMIT_TIMESTAMP
+    /// Provides the timestamp of the commit that was used for the build, for example `2021-02-23T08:08:02-05:00`.
+    pub commit_timestamp: String,
+
+    // VERGEN_GIT_BRANCH
+    /// Provides the name of the git branch that was used for the build, for example `master`.
+    pub commit_branch: String,
+
+    // VERGEN_RUSTC_SEMVER
+    /// Provides the rustc version that was used for the build, for example `1.52.0-nightly`.
+    pub rustc_version: String,
+
+    // VERGEN_RUSTC_CHANNEL
+    /// Provides the rustc channel that was used for the build, for example `nightly`.
+    pub rustc_channel: String,
+
+    // VERGEN_CARGO_PROFILE
+    /// Provides the cargo profile that was used for the build, for example `debug`.
+    pub cargo_profile: String,
+}

common/client-libs/gateway-client/src/client.rs

@@ -441,6 +441,7 @@ where
         }
 
         debug_assert!(self.connection.is_available());
+        log::trace!("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

common/client-libs/validator-client/src/client.rs

@@ -934,16 +934,6 @@ impl NymApiClient {
         Ok(self.nym_api_client.blind_sign(request_body).await?)
     }
 
-    pub async fn partial_bandwidth_credential(
-        &self,
-        request_body: &str,
-    ) -> Result<BlindedSignatureResponse, ValidatorClientError> {
-        Ok(self
-            .nym_api_client
-            .partial_bandwidth_credential(request_body)
-            .await?)
-    }
-
     pub async fn verify_bandwidth_credential(
         &self,
         request_body: &VerifyCredentialBody,

common/client-libs/validator-client/src/nym_api/mod.rs

@@ -449,23 +449,6 @@ impl Client {
         .await
     }
 
-    pub async fn partial_bandwidth_credential(
-        &self,
-        request_body: &str,
-    ) -> Result<BlindedSignatureResponse, NymAPIError> {
-        self.post_nym_api(
-            &[
-                routes::API_VERSION,
-                routes::COCONUT_ROUTES,
-                routes::BANDWIDTH,
-                routes::COCONUT_PARTIAL_BANDWIDTH_CREDENTIAL,
-            ],
-            NO_PARAMS,
-            request_body,
-        )
-        .await
-    }
-
     pub async fn verify_bandwidth_credential(
         &self,
         request_body: &VerifyCredentialBody,

common/client-libs/validator-client/src/nym_api/routes.rs

@@ -14,7 +14,6 @@ pub const COCONUT_ROUTES: &str = "coconut";
 pub const BANDWIDTH: &str = "bandwidth";
 
 pub const COCONUT_BLIND_SIGN: &str = "blind-sign";
-pub const COCONUT_PARTIAL_BANDWIDTH_CREDENTIAL: &str = "partial-bandwidth-credential";
 pub const COCONUT_VERIFY_BANDWIDTH_CREDENTIAL: &str = "verify-bandwidth-credential";
 
 pub const STATUS_ROUTES: &str = "status";

common/client-libs/validator-client/src/nyxd/traits/dkg_query_client.rs

@@ -8,7 +8,7 @@ use coconut_dkg_common::dealer::{
     DealerDetailsResponse, PagedDealerResponse, PagedDealingsResponse,
 };
 use coconut_dkg_common::msg::QueryMsg as DkgQueryMsg;
-use coconut_dkg_common::types::{Epoch, EpochId};
+use coconut_dkg_common::types::{Epoch, EpochId, InitialReplacementData};
 use coconut_dkg_common::verification_key::PagedVKSharesResponse;
 use cosmrs::AccountId;
 
@@ -16,6 +16,7 @@ use cosmrs::AccountId;
 pub trait DkgQueryClient {
     async fn get_current_epoch(&self) -> Result<Epoch, NyxdError>;
     async fn get_current_epoch_threshold(&self) -> Result<Option<u64>, NyxdError>;
+    async fn get_initial_dealers(&self) -> Result<Option<InitialReplacementData>, NyxdError>;
     async fn get_dealer_details(
         &self,
         address: &AccountId,
@@ -62,6 +63,14 @@ where
             .query_contract_smart(self.coconut_dkg_contract_address(), &request)
             .await
     }
+
+    async fn get_initial_dealers(&self) -> Result<Option<InitialReplacementData>, NyxdError> {
+        let request = DkgQueryMsg::GetInitialDealers {};
+        self.client
+            .query_contract_smart(self.coconut_dkg_contract_address(), &request)
+            .await
+    }
+
     async fn get_dealer_details(
         &self,
         address: &AccountId,

common/client-libs/validator-client/src/nyxd/traits/dkg_signing_client.rs

@@ -17,18 +17,21 @@ pub trait DkgSigningClient {
         &self,
         bte_key: EncodedBTEPublicKeyWithProof,
         announce_address: String,
+        resharing: bool,
         fee: Option<Fee>,
     ) -> Result<ExecuteResult, NyxdError>;
 
     async fn submit_dealing_bytes(
         &self,
         commitment: ContractSafeBytes,
+        resharing: bool,
         fee: Option<Fee>,
     ) -> Result<ExecuteResult, NyxdError>;
 
     async fn submit_verification_key_share(
         &self,
         share: VerificationKeyShare,
+        resharing: bool,
         fee: Option<Fee>,
     ) -> Result<ExecuteResult, NyxdError>;
 }
@@ -57,11 +60,13 @@ where
         &self,
         bte_key: EncodedBTEPublicKeyWithProof,
         announce_address: String,
+        resharing: bool,
         fee: Option<Fee>,
     ) -> Result<ExecuteResult, NyxdError> {
         let req = DkgExecuteMsg::RegisterDealer {
             bte_key_with_proof: bte_key,
             announce_address,
+            resharing,
         };
 
         self.client
@@ -79,9 +84,13 @@ where
     async fn submit_dealing_bytes(
         &self,
         dealing_bytes: ContractSafeBytes,
+        resharing: bool,
         fee: Option<Fee>,
     ) -> Result<ExecuteResult, NyxdError> {
-        let req = DkgExecuteMsg::CommitDealing { dealing_bytes };
+        let req = DkgExecuteMsg::CommitDealing {
+            dealing_bytes,
+            resharing,
+        };
 
         self.client
             .execute(
@@ -98,9 +107,10 @@ where
     async fn submit_verification_key_share(
         &self,
         share: VerificationKeyShare,
+        resharing: bool,
         fee: Option<Fee>,
     ) -> Result<ExecuteResult, NyxdError> {
-        let req = DkgExecuteMsg::CommitVerificationKeyShare { share };
+        let req = DkgExecuteMsg::CommitVerificationKeyShare { share, resharing };
 
         self.client
             .execute(

common/commands/src/validator/cosmwasm/generators/coconut_bandwidth.rs

@@ -1,10 +1,13 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use std::str::FromStr;
+
 use clap::Parser;
 use log::{debug, info};
 
 use coconut_bandwidth_contract_common::msg::InstantiateMsg;
+use validator_client::nyxd::AccountId;
 
 #[derive(Debug, Parser)]
 pub struct Args {
@@ -12,7 +15,7 @@ pub struct Args {
     pub pool_addr: String,
 
     #[clap(long)]
-    pub multisig_addr: Option<String>,
+    pub multisig_addr: Option<AccountId>,
 
     #[clap(long)]
     pub mix_denom: Option<String>,
@@ -24,8 +27,10 @@ pub async fn generate(args: Args) {
     debug!("Received arguments: {:?}", args);
 
     let multisig_addr = args.multisig_addr.unwrap_or_else(|| {
-        std::env::var(network_defaults::var_names::REWARDING_VALIDATOR_ADDRESS)
-            .expect("Multisig address has to be set")
+        let address = std::env::var(network_defaults::var_names::REWARDING_VALIDATOR_ADDRESS)
+            .expect("Multisig address has to be set");
+        AccountId::from_str(address.as_str())
+            .expect("Failed converting multisig address to AccountId")
     });
 
     let mix_denom = args.mix_denom.unwrap_or_else(|| {
@@ -34,7 +39,7 @@ pub async fn generate(args: Args) {
 
     let instantiate_msg = InstantiateMsg {
         pool_addr: args.pool_addr,
-        multisig_addr,
+        multisig_addr: multisig_addr.to_string(),
         mix_denom,
     };
 

common/commands/src/validator/cosmwasm/generators/coconut_dkg.rs

@@ -7,6 +7,7 @@ use std::str::FromStr;
 
 use coconut_dkg_common::msg::InstantiateMsg;
 use coconut_dkg_common::types::TimeConfiguration;
+use validator_client::nyxd::AccountId;
 
 #[derive(Debug, Parser)]
 pub struct Args {
@@ -14,7 +15,7 @@ pub struct Args {
     pub group_addr: String,
 
     #[clap(long)]
-    pub multisig_addr: Option<String>,
+    pub multisig_addr: Option<AccountId>,
 
     #[clap(long)]
     pub public_key_submission_time_secs: Option<u64>,
@@ -44,8 +45,10 @@ pub async fn generate(args: Args) {
     debug!("Received arguments: {:?}", args);
 
     let multisig_addr = args.multisig_addr.unwrap_or_else(|| {
-        std::env::var(network_defaults::var_names::REWARDING_VALIDATOR_ADDRESS)
-            .expect("Multisig address has to be set")
+        let address = std::env::var(network_defaults::var_names::REWARDING_VALIDATOR_ADDRESS)
+            .expect("Multisig address has to be set");
+        AccountId::from_str(address.as_str())
+            .expect("Failed converting multisig address to AccountId")
     });
 
     let mix_denom = args.mix_denom.unwrap_or_else(|| {
@@ -86,7 +89,7 @@ pub async fn generate(args: Args) {
 
     let instantiate_msg = InstantiateMsg {
         group_addr: args.group_addr,
-        multisig_addr,
+        multisig_addr: multisig_addr.to_string(),
         time_configuration: Some(time_configuration),
         mix_denom,
     };

common/commands/src/validator/cosmwasm/generators/mixnet.rs

@@ -6,15 +6,17 @@ use log::{debug, info};
 
 use cosmwasm_std::Decimal;
 use mixnet_contract_common::{InitialRewardingParams, InstantiateMsg, Percent};
+use std::str::FromStr;
 use std::time::Duration;
+use validator_client::nyxd::AccountId;
 
 #[derive(Debug, Parser)]
 pub struct Args {
     #[clap(long)]
-    pub rewarding_validator_address: Option<String>,
+    pub rewarding_validator_address: Option<AccountId>,
 
     #[clap(long)]
-    pub vesting_contract_address: Option<String>,
+    pub vesting_contract_address: Option<AccountId>,
 
     #[clap(long)]
     pub rewarding_denom: Option<String>,
@@ -77,13 +79,17 @@ pub async fn generate(args: Args) {
     debug!("initial_rewarding_params: {:?}", initial_rewarding_params);
 
     let rewarding_validator_address = args.rewarding_validator_address.unwrap_or_else(|| {
-        std::env::var(network_defaults::var_names::REWARDING_VALIDATOR_ADDRESS)
-            .expect("Rewarding validator address has to be set")
+        let address = std::env::var(network_defaults::var_names::REWARDING_VALIDATOR_ADDRESS)
+            .expect("Rewarding validator address has to be set");
+        AccountId::from_str(address.as_str())
+            .expect("Failed converting rewarding validator address to AccountId")
     });
 
     let vesting_contract_address = args.vesting_contract_address.unwrap_or_else(|| {
-        std::env::var(network_defaults::var_names::VESTING_CONTRACT_ADDRESS)
-            .expect("Vesting contract address has to be set")
+        let address = std::env::var(network_defaults::var_names::VESTING_CONTRACT_ADDRESS)
+            .expect("Vesting contract address has to be set");
+        AccountId::from_str(address.as_str())
+            .expect("Failed converting vesting contract address to AccountId")
     });
 
     let rewarding_denom = args.rewarding_denom.unwrap_or_else(|| {
@@ -92,8 +98,8 @@ pub async fn generate(args: Args) {
     });
 
     let instantiate_msg = InstantiateMsg {
-        rewarding_validator_address,
-        vesting_contract_address,
+        rewarding_validator_address: rewarding_validator_address.to_string(),
+        vesting_contract_address: vesting_contract_address.to_string(),
         rewarding_denom,
         epochs_in_interval: args.epochs_in_interval,
         epoch_duration: Duration::from_secs(args.epoch_duration),

common/commands/src/validator/cosmwasm/generators/multisig.rs

@@ -1,12 +1,14 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use clap::Parser;
-use log::{debug, info};
+use std::str::FromStr;
 
+use clap::Parser;
 use cosmwasm_std::Decimal;
 use cw_utils::{Duration, Threshold};
+use log::{debug, info};
 use multisig_contract_common::msg::InstantiateMsg;
+use validator_client::nyxd::AccountId;
 
 #[derive(Debug, Parser)]
 pub struct Args {
@@ -20,10 +22,10 @@ pub struct Args {
     pub max_voting_period: u64,
 
     #[clap(long)]
-    pub coconut_bandwidth_contract_address: Option<String>,
+    pub coconut_bandwidth_contract_address: Option<AccountId>,
 
     #[clap(long)]
-    pub coconut_dkg_contract_address: Option<String>,
+    pub coconut_dkg_contract_address: Option<AccountId>,
 }
 
 pub async fn generate(args: Args) {
@@ -33,13 +35,18 @@ pub async fn generate(args: Args) {
 
     let coconut_bandwidth_contract_address =
         args.coconut_bandwidth_contract_address.unwrap_or_else(|| {
-            std::env::var(network_defaults::var_names::COCONUT_BANDWIDTH_CONTRACT_ADDRESS)
-                .expect("Coconut bandwidth contract address has to be set")
+            let address =
+                std::env::var(network_defaults::var_names::COCONUT_BANDWIDTH_CONTRACT_ADDRESS)
+                    .expect("Coconut bandwidth contract address has to be set");
+            AccountId::from_str(address.as_str())
+                .expect("Failed converting bandwidth contract address to AccountId")
         });
 
     let coconut_dkg_contract_address = args.coconut_dkg_contract_address.unwrap_or_else(|| {
-        std::env::var(network_defaults::var_names::COCONUT_DKG_CONTRACT_ADDRESS)
-            .expect("Coconut DKG contract address has to be set")
+        let address = std::env::var(network_defaults::var_names::COCONUT_DKG_CONTRACT_ADDRESS)
+            .expect("Coconut DKG contract address has to be set");
+        AccountId::from_str(address.as_str())
+            .expect("Failed converting DKG contract address to AccountId")
     });
 
     let instantiate_msg = InstantiateMsg {
@@ -49,8 +56,8 @@ pub async fn generate(args: Args) {
                 .expect("threshold can't be converted to Decimal"),
         },
         max_voting_period: Duration::Time(args.max_voting_period),
-        coconut_bandwidth_contract_address,
-        coconut_dkg_contract_address,
+        coconut_bandwidth_contract_address: coconut_bandwidth_contract_address.to_string(),
+        coconut_dkg_contract_address: coconut_dkg_contract_address.to_string(),
     };
 
     debug!("instantiate_msg: {:?}", instantiate_msg);

common/commands/src/validator/cosmwasm/generators/vesting.rs

@@ -1,15 +1,18 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use std::str::FromStr;
+
 use clap::Parser;
 use log::{debug, info};
 
+use validator_client::nyxd::AccountId;
 use vesting_contract_common::InitMsg;
 
 #[derive(Debug, Parser)]
 pub struct Args {
     #[clap(long)]
-    pub mixnet_contract_address: Option<String>,
+    pub mixnet_contract_address: Option<AccountId>,
 
     #[clap(long)]
     pub mix_denom: Option<String>,
@@ -21,8 +24,10 @@ pub async fn generate(args: Args) {
     debug!("Received arguments: {:?}", args);
 
     let mixnet_contract_address = args.mixnet_contract_address.unwrap_or_else(|| {
-        std::env::var(network_defaults::var_names::MIXNET_CONTRACT_ADDRESS)
-            .expect("Mixnet contract address has to be set")
+        let address = std::env::var(network_defaults::var_names::MIXNET_CONTRACT_ADDRESS)
+            .expect("Mixnet contract address has to be set");
+        AccountId::from_str(address.as_str())
+            .expect("Failed converting mixnet address to AccountId")
     });
 
     let mix_denom = args.mix_denom.unwrap_or_else(|| {
@@ -30,7 +35,7 @@ pub async fn generate(args: Args) {
     });
 
     let instantiate_msg = InitMsg {
-        mixnet_contract_address,
+        mixnet_contract_address: mixnet_contract_address.to_string(),
         mix_denom,
     };
 

common/config/src/lib.rs

@@ -30,23 +30,15 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
     fn default_root_directory() -> PathBuf;
 
     // default, most probable, implementations; can be easily overridden where required
-    fn default_config_directory(id: Option<&str>) -> PathBuf {
-        if let Some(id) = id {
-            Self::default_root_directory().join(id).join(CONFIG_DIR)
-        } else {
-            Self::default_root_directory().join(CONFIG_DIR)
-        }
+    fn default_config_directory(id: &str) -> PathBuf {
+        Self::default_root_directory().join(id).join(CONFIG_DIR)
     }
 
-    fn default_data_directory(id: Option<&str>) -> PathBuf {
-        if let Some(id) = id {
-            Self::default_root_directory().join(id).join(DATA_DIR)
-        } else {
-            Self::default_root_directory().join(DATA_DIR)
-        }
+    fn default_data_directory(id: &str) -> PathBuf {
+        Self::default_root_directory().join(id).join(DATA_DIR)
     }
 
-    fn default_config_file_path(id: Option<&str>) -> PathBuf {
+    fn default_config_file_path(id: &str) -> PathBuf {
         Self::default_config_directory(id).join(Self::config_file_name())
     }
 
@@ -54,23 +46,15 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
 
     fn try_default_root_directory() -> Option<PathBuf>;
 
-    fn try_default_config_directory(id: Option<&str>) -> Option<PathBuf> {
-        if let Some(id) = id {
-            Self::try_default_root_directory().map(|d| d.join(id).join(CONFIG_DIR))
-        } else {
-            Self::try_default_root_directory().map(|d| d.join(CONFIG_DIR))
-        }
+    fn try_default_config_directory(id: &str) -> Option<PathBuf> {
+        Self::try_default_root_directory().map(|d| d.join(id).join(CONFIG_DIR))
     }
 
-    fn try_default_data_directory(id: Option<&str>) -> Option<PathBuf> {
-        if let Some(id) = id {
-            Self::try_default_root_directory().map(|d| d.join(id).join(DATA_DIR))
-        } else {
-            Self::try_default_root_directory().map(|d| d.join(DATA_DIR))
-        }
+    fn try_default_data_directory(id: &str) -> Option<PathBuf> {
+        Self::try_default_root_directory().map(|d| d.join(id).join(DATA_DIR))
     }
 
-    fn try_default_config_file_path(id: Option<&str>) -> Option<PathBuf> {
+    fn try_default_config_file_path(id: &str) -> Option<PathBuf> {
         Self::try_default_config_directory(id).map(|d| d.join(Self::config_file_name()))
     }
 
@@ -113,7 +97,7 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
         Ok(())
     }
 
-    fn load_from_file(id: Option<&str>) -> io::Result<Self> {
+    fn load_from_file(id: &str) -> io::Result<Self> {
         let file = Self::default_config_file_path(id);
         log::trace!("Loading from file: {:#?}", file);
         let config_contents = fs::read_to_string(file)?;

common/cosmwasm-smart-contracts/coconut-dkg/src/msg.rs

@@ -21,18 +21,22 @@ pub enum ExecuteMsg {
     RegisterDealer {
         bte_key_with_proof: EncodedBTEPublicKeyWithProof,
         announce_address: String,
+        resharing: bool,
     },
 
     CommitDealing {
         dealing_bytes: ContractSafeBytes,
+        resharing: bool,
     },
 
     CommitVerificationKeyShare {
         share: VerificationKeyShare,
+        resharing: bool,
     },
 
     VerifyVerificationKeyShare {
         owner: Addr,
+        resharing: bool,
     },
 
     SurpassedThreshold {},
@@ -45,6 +49,7 @@ pub enum ExecuteMsg {
 pub enum QueryMsg {
     GetCurrentEpochState {},
     GetCurrentEpochThreshold {},
+    GetInitialDealers {},
     GetDealerDetails {
         dealer_address: String,
     },

common/cosmwasm-smart-contracts/coconut-dkg/src/types.rs

@@ -18,6 +18,12 @@ pub type EpochId = u64;
 // 2 public attributes, 2 private attributes, 1 fixed for coconut credential
 pub const TOTAL_DEALINGS: usize = 2 + 2 + 1;
 
+#[derive(Serialize, Deserialize, Default, Clone, Debug, PartialEq, Eq, Ord, PartialOrd)]
+pub struct InitialReplacementData {
+    pub initial_dealers: Vec<Addr>,
+    pub initial_height: Option<u64>,
+}
+
 #[derive(
     Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq, Ord, PartialOrd, JsonSchema,
 )]
@@ -86,15 +92,17 @@ impl Epoch {
         current_timestamp: Timestamp,
     ) -> Self {
         let duration = match state {
-            EpochState::PublicKeySubmission => time_configuration.public_key_submission_time_secs,
-            EpochState::DealingExchange => time_configuration.dealing_exchange_time_secs,
-            EpochState::VerificationKeySubmission => {
+            EpochState::PublicKeySubmission { .. } => {
+                time_configuration.public_key_submission_time_secs
+            }
+            EpochState::DealingExchange { .. } => time_configuration.dealing_exchange_time_secs,
+            EpochState::VerificationKeySubmission { .. } => {
                 time_configuration.verification_key_submission_time_secs
             }
-            EpochState::VerificationKeyValidation => {
+            EpochState::VerificationKeyValidation { .. } => {
                 time_configuration.verification_key_validation_time_secs
             }
-            EpochState::VerificationKeyFinalization => {
+            EpochState::VerificationKeyFinalization { .. } => {
                 time_configuration.verification_key_finalization_time_secs
             }
             EpochState::InProgress => time_configuration.in_progress_time_secs,
@@ -106,6 +114,33 @@ impl Epoch {
             finish_timestamp: current_timestamp.plus_seconds(duration),
         }
     }
+
+    pub fn final_timestamp_secs(&self) -> u64 {
+        let mut finish = self.finish_timestamp.seconds();
+        let time_configuration = self.time_configuration;
+        let mut curr_epoch_state = self.state;
+        while let Some(state) = curr_epoch_state.next() {
+            curr_epoch_state = state;
+            let adding = match curr_epoch_state {
+                EpochState::PublicKeySubmission { .. } => {
+                    time_configuration.public_key_submission_time_secs
+                }
+                EpochState::DealingExchange { .. } => time_configuration.dealing_exchange_time_secs,
+                EpochState::VerificationKeySubmission { .. } => {
+                    time_configuration.verification_key_submission_time_secs
+                }
+                EpochState::VerificationKeyValidation { .. } => {
+                    time_configuration.verification_key_validation_time_secs
+                }
+                EpochState::VerificationKeyFinalization { .. } => {
+                    time_configuration.verification_key_finalization_time_secs
+                }
+                EpochState::InProgress { .. } => 0,
+            };
+            finish += adding;
+        }
+        finish
+    }
 }
 
 // currently (it is still extremely likely to change, we might be able to get rid of verification key-related complaints),
@@ -123,28 +158,36 @@ impl Epoch {
 #[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq, Ord, PartialOrd)]
 #[serde(rename_all = "snake_case")]
 pub enum EpochState {
-    PublicKeySubmission,
-    DealingExchange,
-    VerificationKeySubmission,
-    VerificationKeyValidation,
-    VerificationKeyFinalization,
+    PublicKeySubmission { resharing: bool },
+    DealingExchange { resharing: bool },
+    VerificationKeySubmission { resharing: bool },
+    VerificationKeyValidation { resharing: bool },
+    VerificationKeyFinalization { resharing: bool },
     InProgress,
 }
 
 impl Default for EpochState {
     fn default() -> Self {
-        Self::PublicKeySubmission
+        Self::PublicKeySubmission { resharing: false }
     }
 }
 
 impl Display for EpochState {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
-            EpochState::PublicKeySubmission => write!(f, "PublicKeySubmission"),
-            EpochState::DealingExchange => write!(f, "DealingExchange"),
-            EpochState::VerificationKeySubmission => write!(f, "VerificationKeySubmission"),
-            EpochState::VerificationKeyValidation => write!(f, "VerificationKeyValidation"),
-            EpochState::VerificationKeyFinalization => write!(f, "VerificationKeyFinalization"),
+            EpochState::PublicKeySubmission { resharing } => {
+                write!(f, "PublicKeySubmission with resharing {resharing}")
+            }
+            EpochState::DealingExchange { resharing } => write!(f, "DealingExchange {resharing}"),
+            EpochState::VerificationKeySubmission { resharing } => {
+                write!(f, "VerificationKeySubmission with resharing {resharing}")
+            }
+            EpochState::VerificationKeyValidation { resharing } => {
+                write!(f, "VerificationKeyValidation with resharing {resharing}")
+            }
+            EpochState::VerificationKeyFinalization { resharing } => {
+                write!(f, "VerificationKeyFinalization with resharing {resharing}")
+            }
             EpochState::InProgress => write!(f, "InProgress"),
         }
     }
@@ -153,11 +196,19 @@ impl Display for EpochState {
 impl EpochState {
     pub fn next(self) -> Option<Self> {
         match self {
-            EpochState::PublicKeySubmission => Some(EpochState::DealingExchange),
-            EpochState::DealingExchange => Some(EpochState::VerificationKeySubmission),
-            EpochState::VerificationKeySubmission => Some(EpochState::VerificationKeyValidation),
-            EpochState::VerificationKeyValidation => Some(EpochState::VerificationKeyFinalization),
-            EpochState::VerificationKeyFinalization => Some(EpochState::InProgress),
+            EpochState::PublicKeySubmission { resharing } => {
+                Some(EpochState::DealingExchange { resharing })
+            }
+            EpochState::DealingExchange { resharing } => {
+                Some(EpochState::VerificationKeySubmission { resharing })
+            }
+            EpochState::VerificationKeySubmission { resharing } => {
+                Some(EpochState::VerificationKeyValidation { resharing })
+            }
+            EpochState::VerificationKeyValidation { resharing } => {
+                Some(EpochState::VerificationKeyFinalization { resharing })
+            }
+            EpochState::VerificationKeyFinalization { .. } => Some(EpochState::InProgress),
             EpochState::InProgress => None,
         }
     }
@@ -171,4 +222,8 @@ impl EpochState {
 
         states
     }
+
+    pub fn is_final(&self) -> bool {
+        *self == EpochState::InProgress
+    }
 }

common/cosmwasm-smart-contracts/coconut-dkg/src/verification_key.rs

@@ -30,11 +30,12 @@ pub struct PagedVKSharesResponse {
 
 pub fn to_cosmos_msg(
     owner: Addr,
+    resharing: bool,
     coconut_dkg_addr: String,
     multisig_addr: String,
     expiration_time: Timestamp,
 ) -> StdResult<CosmosMsg> {
-    let verify_vk_share_req = ExecuteMsg::VerifyVerificationKeyShare { owner };
+    let verify_vk_share_req = ExecuteMsg::VerifyVerificationKeyShare { owner, resharing };
     let verify_vk_share_msg = CosmosMsg::Wasm(WasmMsg::Execute {
         contract_addr: coconut_dkg_addr,
         msg: to_binary(&verify_vk_share_req)?,
@@ -62,7 +63,8 @@ pub fn owner_from_cosmos_msgs(msgs: &[CosmosMsg]) -> Option<Addr> {
         funds: _,
     })) = msgs.get(0)
     {
-        if let Ok(ExecuteMsg::VerifyVerificationKeyShare { owner }) = from_binary::<ExecuteMsg>(msg)
+        if let Ok(ExecuteMsg::VerifyVerificationKeyShare { owner, .. }) =
+            from_binary::<ExecuteMsg>(msg)
         {
             return Some(owner);
         }

common/cosmwasm-smart-contracts/multisig-contract/Cargo.toml

@@ -13,3 +13,4 @@ cw4 = { version = "0.13.4" }
 cosmwasm-std = "1.0.0"
 schemars = "0.8"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
+thiserror = { version = "1.0.23" }

common/cosmwasm-smart-contracts/multisig-contract/src/error.rs

@@ -1,3 +1,6 @@
+// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
 use cosmwasm_std::StdError;
 use cw_utils::ThresholdError;
 

common/cosmwasm-smart-contracts/multisig-contract/src/lib.rs

@@ -1 +1,2 @@
+pub mod error;
 pub mod msg;

common/credentials/src/coconut/bandwidth.rs

@@ -42,41 +42,9 @@ pub struct BandwidthVoucher {
     encryption_key: encryption::PrivateKey,
     pedersen_commitments_openings: Vec<Attribute>,
     blind_sign_request: BlindSignRequest,
-    use_request: bool,
 }
 
 impl BandwidthVoucher {
-    pub fn new_with_blind_sign_req(
-        private_attributes: [PrivateAttribute; PRIVATE_ATTRIBUTES as usize],
-        public_attributes_plain: [&str; PUBLIC_ATTRIBUTES as usize],
-        tx_hash: Hash,
-        signing_key: identity::PrivateKey,
-        encryption_key: encryption::PrivateKey,
-        pedersen_commitments_openings: Vec<Attribute>,
-        blind_sign_request: BlindSignRequest,
-    ) -> Self {
-        let voucher_value = public_attributes_plain[0];
-        let voucher_info = public_attributes_plain[1];
-        let voucher_value_plain = voucher_value.to_string();
-        let voucher_info_plain = voucher_info.to_string();
-        let voucher_value = hash_to_scalar(voucher_value.as_bytes());
-        let voucher_info = hash_to_scalar(voucher_info.as_bytes());
-
-        BandwidthVoucher {
-            serial_number: private_attributes[0],
-            binding_number: private_attributes[1],
-            voucher_value,
-            voucher_value_plain,
-            voucher_info,
-            voucher_info_plain,
-            tx_hash,
-            signing_key,
-            encryption_key,
-            pedersen_commitments_openings,
-            blind_sign_request,
-            use_request: false,
-        }
-    }
     pub fn new(
         params: &Parameters,
         voucher_value: String,
@@ -109,10 +77,135 @@ impl BandwidthVoucher {
             encryption_key,
             pedersen_commitments_openings,
             blind_sign_request,
-            use_request: true,
         }
     }
 
+    pub fn to_bytes(&self) -> Vec<u8> {
+        let serial_number_b = self.serial_number.to_bytes();
+        let binding_number_b = self.binding_number.to_bytes();
+        let voucher_value_plain_b = self.voucher_value_plain.as_bytes();
+        let voucher_info_plain_b = self.voucher_info_plain.as_bytes();
+        let tx_hash_b = self.tx_hash.as_bytes();
+        let signing_key_b = self.signing_key.to_bytes();
+        let encryption_key_b = self.encryption_key.to_bytes();
+        let blind_sign_request_b = self.blind_sign_request.to_bytes();
+
+        let mut ret = Vec::new();
+
+        ret.extend_from_slice(&serial_number_b);
+        ret.extend_from_slice(&binding_number_b);
+        ret.extend_from_slice(tx_hash_b);
+        ret.extend_from_slice(&signing_key_b);
+        ret.extend_from_slice(&encryption_key_b);
+        ret.extend_from_slice(&(voucher_value_plain_b.len() as u64).to_be_bytes());
+        ret.extend_from_slice(&(voucher_info_plain_b.len() as u64).to_be_bytes());
+        ret.extend_from_slice(&(blind_sign_request_b.len() as u64).to_be_bytes());
+        ret.extend_from_slice(&(self.pedersen_commitments_openings.len() as u64).to_be_bytes());
+        ret.extend_from_slice(voucher_value_plain_b);
+        ret.extend_from_slice(voucher_info_plain_b);
+        ret.extend_from_slice(&blind_sign_request_b);
+        for commitment in self.pedersen_commitments_openings.iter() {
+            ret.extend_from_slice(&commitment.to_bytes());
+        }
+
+        ret
+    }
+
+    pub fn try_from_bytes(bytes: &[u8]) -> Result<Self, Error> {
+        if bytes.len() < 32 * 5 + 4 * 8 {
+            return Err(Error::BandwidthVoucherDeserializationError(format!(
+                "Less then {} bytes needed",
+                32 * 5 + 4 * 8
+            )));
+        }
+        let mut buff = [0u8; 32];
+        let mut small_buff = [0u8; 8];
+        let scalar_err =
+            || Error::BandwidthVoucherDeserializationError(String::from("Invalid Scalar"));
+        buff.copy_from_slice(&bytes[..32]);
+        let serial_number = Option::<PrivateAttribute>::from(PrivateAttribute::from_bytes(&buff))
+            .ok_or_else(scalar_err)?;
+        buff.copy_from_slice(&bytes[32..2 * 32]);
+        let binding_number = Option::<PrivateAttribute>::from(PrivateAttribute::from_bytes(&buff))
+            .ok_or_else(scalar_err)?;
+        buff.copy_from_slice(&bytes[2 * 32..3 * 32]);
+        let tx_hash = Hash::new(buff);
+        buff.copy_from_slice(&bytes[3 * 32..4 * 32]);
+        let signing_key = identity::PrivateKey::from_bytes(&buff).map_err(|_| {
+            Error::BandwidthVoucherDeserializationError(String::from("Invalid key"))
+        })?;
+        buff.copy_from_slice(&bytes[4 * 32..5 * 32]);
+        let encryption_key = encryption::PrivateKey::from_bytes(&buff).map_err(|_| {
+            Error::BandwidthVoucherDeserializationError(String::from("Invalid key"))
+        })?;
+        small_buff.copy_from_slice(&bytes[5 * 32..5 * 32 + 8]);
+        let voucher_value_plain_no = u64::from_be_bytes(small_buff) as usize;
+        small_buff.copy_from_slice(&bytes[5 * 32 + 8..5 * 32 + 2 * 8]);
+        let voucher_info_plain_no = u64::from_be_bytes(small_buff) as usize;
+        small_buff.copy_from_slice(&bytes[5 * 32 + 2 * 8..5 * 32 + 3 * 8]);
+        let blind_sign_request_no = u64::from_be_bytes(small_buff) as usize;
+        small_buff.copy_from_slice(&bytes[5 * 32 + 3 * 8..5 * 32 + 4 * 8]);
+        let pedersen_commitments_openings_no = u64::from_be_bytes(small_buff) as usize;
+
+        let total_length = 32 * 5
+            + 4 * 8
+            + voucher_value_plain_no
+            + voucher_info_plain_no
+            + blind_sign_request_no
+            + pedersen_commitments_openings_no * 32;
+        if bytes.len() != total_length {
+            return Err(Error::BandwidthVoucherDeserializationError(format!(
+                "Expected {total_length} bytes",
+            )));
+        }
+
+        let utf_err = |_| {
+            Err(Error::BandwidthVoucherDeserializationError(String::from(
+                "Invalid UTF8 string",
+            )))
+        };
+        let mut var_length_pointer = 5 * 32 + 4 * 8;
+        let voucher_value_plain = String::from_utf8(
+            bytes[var_length_pointer..var_length_pointer + voucher_value_plain_no].to_vec(),
+        )
+        .or_else(utf_err)?;
+        let voucher_value = hash_to_scalar(&voucher_value_plain);
+        var_length_pointer += voucher_value_plain_no;
+        let voucher_info_plain = String::from_utf8(
+            bytes[var_length_pointer..var_length_pointer + voucher_info_plain_no].to_vec(),
+        )
+        .or_else(utf_err)?;
+        let voucher_info = hash_to_scalar(&voucher_info_plain);
+        var_length_pointer += voucher_info_plain_no;
+        let blind_sign_request = BlindSignRequest::from_bytes(
+            &bytes[var_length_pointer..var_length_pointer + blind_sign_request_no],
+        )?;
+        var_length_pointer += blind_sign_request_no;
+
+        let mut pedersen_commitments_openings = Vec::new();
+        for _ in 0..pedersen_commitments_openings_no {
+            buff.copy_from_slice(&bytes[var_length_pointer..var_length_pointer + 32]);
+            let commitment =
+                Option::<Attribute>::from(Attribute::from_bytes(&buff)).ok_or_else(scalar_err)?;
+            var_length_pointer += 32;
+            pedersen_commitments_openings.push(commitment);
+        }
+
+        Ok(Self {
+            serial_number,
+            binding_number,
+            voucher_value,
+            voucher_value_plain,
+            voucher_info,
+            voucher_info_plain,
+            tx_hash,
+            signing_key,
+            encryption_key,
+            pedersen_commitments_openings,
+            blind_sign_request,
+        })
+    }
+
     /// Check if the plain values correspond to the PublicAttributes
     pub fn verify_against_plain(values: &[PublicAttribute], plain_values: &[String]) -> bool {
         values.len() == 2
@@ -141,8 +234,8 @@ impl BandwidthVoucher {
         &self.blind_sign_request
     }
 
-    pub fn use_request(&self) -> bool {
-        self.use_request
+    pub fn get_voucher_value(&self) -> String {
+        self.voucher_value_plain.clone()
     }
 
     pub fn get_public_attributes_plain(&self) -> Vec<String> {
@@ -189,13 +282,13 @@ pub fn prepare_for_spending(
 #[cfg(test)]
 mod test {
     use super::*;
+    use coconut_interface::Base58;
     use rand::rngs::OsRng;
 
-    #[test]
-    fn voucher_consistency() {
+    fn voucher_fixture() -> BandwidthVoucher {
         let params = Parameters::new(4).unwrap();
         let mut rng = OsRng;
-        let voucher = BandwidthVoucher::new(
+        BandwidthVoucher::new(
             &params,
             "1234".to_string(),
             "voucher info".to_string(),
@@ -210,7 +303,48 @@ mod test {
                 &encryption::KeyPair::new(&mut rng).private_key().to_bytes(),
             )
             .unwrap(),
+        )
+    }
+
+    #[test]
+    fn serde_voucher() {
+        let voucher = voucher_fixture();
+        let bytes = voucher.to_bytes();
+        let deserialized_voucher = BandwidthVoucher::try_from_bytes(&bytes).unwrap();
+        assert_eq!(voucher.serial_number, deserialized_voucher.serial_number);
+        assert_eq!(voucher.binding_number, deserialized_voucher.binding_number);
+        assert_eq!(voucher.voucher_value, deserialized_voucher.voucher_value);
+        assert_eq!(
+            voucher.voucher_value_plain,
+            deserialized_voucher.voucher_value_plain
         );
+        assert_eq!(voucher.voucher_info, deserialized_voucher.voucher_info);
+        assert_eq!(
+            voucher.voucher_info_plain,
+            deserialized_voucher.voucher_info_plain
+        );
+        assert_eq!(voucher.tx_hash, deserialized_voucher.tx_hash);
+        assert_eq!(
+            voucher.signing_key.to_string(),
+            deserialized_voucher.signing_key.to_string()
+        );
+        assert_eq!(
+            voucher.encryption_key.to_string(),
+            deserialized_voucher.encryption_key.to_string()
+        );
+        assert_eq!(
+            voucher.pedersen_commitments_openings,
+            deserialized_voucher.pedersen_commitments_openings
+        );
+        assert_eq!(
+            voucher.blind_sign_request.to_bs58(),
+            deserialized_voucher.blind_sign_request.to_bs58()
+        );
+    }
+
+    #[test]
+    fn voucher_consistency() {
+        let voucher = voucher_fixture();
         assert!(!BandwidthVoucher::verify_against_plain(
             &[],
             &voucher.get_public_attributes_plain()

common/credentials/src/coconut/utils.rs

@@ -45,21 +45,15 @@ async fn obtain_partial_credential(
     let private_attributes = attributes.get_private_attributes();
     let blind_sign_request = attributes.blind_sign_request();
 
-    let response = if attributes.use_request() {
-        let blind_sign_request_body = BlindSignRequestBody::new(
-            blind_sign_request,
-            attributes.tx_hash().to_string(),
-            attributes.sign(blind_sign_request).to_base58_string(),
-            &public_attributes,
-            public_attributes_plain,
-            (public_attributes.len() + private_attributes.len()) as u32,
-        );
-        client.blind_sign(&blind_sign_request_body).await?
-    } else {
-        client
-            .partial_bandwidth_credential(&attributes.tx_hash().to_string())
-            .await?
-    };
+    let blind_sign_request_body = BlindSignRequestBody::new(
+        blind_sign_request,
+        attributes.tx_hash().to_string(),
+        attributes.sign(blind_sign_request).to_base58_string(),
+        &public_attributes,
+        public_attributes_plain,
+        (public_attributes.len() + private_attributes.len()) as u32,
+    );
+    let response = client.blind_sign(&blind_sign_request_body).await?;
     let encrypted_signature = response.encrypted_signature;
     let remote_key = PublicKey::from_bytes(&response.remote_key)?;
 
@@ -92,6 +86,7 @@ pub async fn obtain_aggregate_signature(
     params: &Parameters,
     attributes: &BandwidthVoucher,
     coconut_api_clients: &[CoconutApiClient],
+    threshold: u64,
 ) -> Result<Signature, Error> {
     if coconut_api_clients.is_empty() {
         return Err(Error::NoValidatorsAvailable);
@@ -108,32 +103,32 @@ pub async fn obtain_aggregate_signature(
         .iter()
         .map(|api_client| api_client.node_id)
         .collect();
+    let verification_key =
+        aggregate_verification_keys(&validators_partial_vks, Some(indices.as_ref()))?;
 
     for coconut_api_client in coconut_api_clients.iter() {
-        let signature = obtain_partial_credential(
+        if let Ok(signature) = obtain_partial_credential(
             params,
             attributes,
             &coconut_api_client.api_client,
             &coconut_api_client.verification_key,
         )
-        .await?;
-        let share = SignatureShare::new(signature, coconut_api_client.node_id);
-        shares.push(share)
+        .await
+        {
+            let share = SignatureShare::new(signature, coconut_api_client.node_id);
+            shares.push(share)
+        }
+    }
+    if shares.len() < threshold as usize {
+        return Err(Error::NotEnoughShares);
     }
 
     let mut attributes = Vec::with_capacity(private_attributes.len() + public_attributes.len());
     attributes.extend_from_slice(&private_attributes);
     attributes.extend_from_slice(&public_attributes);
 
-    let verification_key =
-        aggregate_verification_keys(&validators_partial_vks, Some(indices.as_ref()))?;
-
-    Ok(aggregate_signature_shares(
-        params,
-        &verification_key,
-        &attributes,
-        &shares,
-    )?)
+    aggregate_signature_shares(params, &verification_key, &attributes, &shares)
+        .map_err(Error::SignatureAggregationError)
 }
 
 // TODO: better type flow

common/credentials/src/error.rs

@@ -9,6 +9,9 @@ use thiserror::Error;
 
 #[derive(Debug, Error)]
 pub enum Error {
+    #[error("IO error")]
+    IOError(#[from] std::io::Error),
+
     #[error("The detailed description is yet to be determined")]
     BandwidthCredentialError,
 
@@ -29,4 +32,13 @@ pub enum Error {
 
     #[error("Could not parse the key - {0}")]
     ParsePublicKey(#[from] KeyRecoveryError),
+
+    #[error("Could not gather enough signature shares. Try again using the recovery command")]
+    NotEnoughShares,
+
+    #[error("Could not aggregate signature shares - {0}. Try again using the recovery command")]
+    SignatureAggregationError(CoconutError),
+
+    #[error("Could not deserialize bandwidth voucher - {0}")]
+    BandwidthVoucherDeserializationError(String),
 }

common/nymcoconut/Cargo.toml

@@ -33,9 +33,6 @@ criterion = { version="0.3", features=["html_reports"] }
 doc-comment = "0.3"
 rand_chacha = "0.3"
 
-[dev-dependencies.bincode]
-version = "1"
-
 [[bench]]
 name = "benchmarks"
 harness = false

common/nymcoconut/src/scheme/keygen.rs

@@ -93,6 +93,10 @@ impl SecretKey {
         Self { x, ys }
     }
 
+    pub fn into_raw(&self) -> (Scalar, Vec<Scalar>) {
+        (self.x, self.ys.clone())
+    }
+
     /// Derive verification key using this secret key.
     pub fn verification_key(&self, params: &Parameters) -> VerificationKey {
         let g1 = params.gen1();

common/nymsphinx/anonymous-replies/Cargo.toml

@@ -12,7 +12,7 @@ bs58 = "0.4"
 serde = "1.0"
 thiserror = "1"
 
-crypto = { path = "../../crypto" }
+crypto = { path = "../../crypto", features = ["symmetric", "rand"] }
 nymsphinx-addressing = { path = "../addressing" }
 nymsphinx-params = { path = "../params" }
 nymsphinx-types = { path = "../types" }

common/socks5/proxy-helpers/src/connection_controller.rs

@@ -6,7 +6,7 @@ use futures::channel::mpsc;
 use futures::StreamExt;
 use log::*;
 use ordered_buffer::{OrderedMessage, OrderedMessageBuffer, ReadContiguousData};
-use socks5_requests::ConnectionId;
+use socks5_requests::{ConnectionId, NetworkData, SendRequest};
 use std::{
     collections::{HashMap, HashSet},
     time::Duration,
@@ -36,9 +36,38 @@ pub type ControllerSender = mpsc::UnboundedSender<ControllerCommand>;
 pub type ControllerReceiver = mpsc::UnboundedReceiver<ControllerCommand>;
 
 pub enum ControllerCommand {
-    Insert(ConnectionId, ConnectionSender),
-    Remove(ConnectionId),
-    Send(ConnectionId, Vec<u8>, bool),
+    Insert {
+        connection_id: ConnectionId,
+        connection_sender: ConnectionSender,
+    },
+    Remove {
+        connection_id: ConnectionId,
+    },
+    Send {
+        connection_id: ConnectionId,
+        data: Vec<u8>,
+        is_closed: bool,
+    },
+}
+
+impl From<NetworkData> for ControllerCommand {
+    fn from(value: NetworkData) -> Self {
+        ControllerCommand::Send {
+            connection_id: value.connection_id,
+            data: value.data,
+            is_closed: value.is_closed,
+        }
+    }
+}
+
+impl From<SendRequest> for ControllerCommand {
+    fn from(value: SendRequest) -> Self {
+        ControllerCommand::Send {
+            connection_id: value.conn_id,
+            data: value.data,
+            is_closed: value.local_closed,
+        }
+    }
 }
 
 struct ActiveConnection {
@@ -235,13 +264,13 @@ impl Controller {
         loop {
             tokio::select! {
                 command = self.receiver.next() => match command {
-                    Some(ControllerCommand::Send(conn_id, data, is_closed)) => {
-                        self.send_to_connection(conn_id, data, is_closed)
+                    Some(ControllerCommand::Send{connection_id, data, is_closed}) => {
+                        self.send_to_connection(connection_id, data, is_closed)
                     }
-                    Some(ControllerCommand::Insert(conn_id, sender)) => {
-                        self.insert_connection(conn_id, sender)
+                    Some(ControllerCommand::Insert{connection_id, connection_sender}) => {
+                        self.insert_connection(connection_id, connection_sender)
                     }
-                    Some(ControllerCommand::Remove(conn_id)) => self.remove_connection(conn_id),
+                    Some(ControllerCommand::Remove{ connection_id }) => self.remove_connection(connection_id),
                     None => {
                         log::trace!("SOCKS5 Controller: Stopping since channel closed");
                         break;

common/socks5/requests/Cargo.toml

@@ -7,5 +7,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+thiserror = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+
 nymsphinx-addressing = { path = "../../../common/nymsphinx/addressing" }
-thiserror = "1"
+service-providers-common = { path = "../../../service-providers/common" }

common/socks5/requests/src/lib.rs

@@ -1,12 +1,128 @@
-// Copyright 2020-2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2020-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-pub mod msg;
-pub mod network_requester_response;
-pub mod request;
-pub mod response;
+use service_providers_common::interface;
+use service_providers_common::interface::ServiceProviderMessagingError;
+use thiserror::Error;
 
-pub use msg::*;
-pub use network_requester_response::*;
 pub use request::*;
 pub use response::*;
+pub use version::*;
+
+pub mod request;
+pub mod response;
+pub mod version;
+
+pub type Socks5ProviderRequest = interface::Request<Socks5Request>;
+pub type Socks5ProviderResponse = interface::Response<Socks5Request>;
+
+#[derive(Debug, Error)]
+pub enum Socks5RequestError {
+    #[error("failed to deserialize received request: {source}")]
+    RequestDeserialization {
+        #[from]
+        source: RequestDeserializationError,
+    },
+
+    #[error("failed to deserialize received response: {source}")]
+    ResponseDeserialization {
+        #[from]
+        source: ResponseDeserializationError,
+    },
+
+    #[error(transparent)]
+    ProviderInterfaceError(#[from] ServiceProviderMessagingError),
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use service_providers_common::interface::RequestContent;
+
+    #[cfg(test)]
+    mod interface_backwards_compatibility {
+        use super::*;
+        use service_providers_common::interface::ProviderInterfaceVersion;
+
+        #[test]
+        fn old_client_vs_new_service_provider() {
+            let old_serialized_connect = vec![
+                0, 0, 2, 254, 34, 100, 192, 20, 13, 171, 0, 16, 56, 48, 46, 50, 52, 57, 46, 57, 57,
+                46, 49, 52, 56, 58, 56, 48, 34, 112, 17, 182, 225, 6, 174, 216, 160, 41, 72, 236,
+                160, 90, 156, 3, 250, 41, 243, 53, 191, 178, 218, 53, 170, 14, 185, 33, 94, 153,
+                25, 41, 6, 82, 169, 187, 88, 246, 211, 57, 68, 225, 228, 231, 116, 29, 119, 235,
+                160, 14, 156, 205, 66, 1, 75, 204, 204, 220, 14, 150, 191, 203, 174, 88, 121, 173,
+                83, 219, 188, 164, 194, 212, 238, 228, 4, 128, 48, 105, 224, 83, 17, 246, 233, 16,
+                235, 223, 68, 87, 13, 40, 34, 186, 218, 204, 126, 145,
+            ];
+
+            let new_deserialized =
+                Socks5ProviderRequest::try_from_bytes(&old_serialized_connect).unwrap();
+
+            match new_deserialized.content {
+                RequestContent::ProviderData(req) => match req.content {
+                    Socks5RequestContent::Connect(connect_req) => {
+                        assert_eq!(connect_req.remote_addr, "80.249.99.148:80".to_string());
+                        assert_eq!(connect_req.conn_id, 215647648274976171);
+                        assert_eq!(connect_req.return_address, Some("3KRydEpanwjFhq5GAraVjRUF1Tno7w7oc4EwJYTGNo5J.RgZ7uMJHruBQqD5hC9Ghi3sqiTn6NycfM5qCfJz6yoM@9Byd9VAtyYMnbVAcqdoQxJnq76XEg2dbxbiF5Aa5Jj9J".parse().unwrap()));
+                    }
+                    _ => panic!("unexpected request"),
+                },
+                _ => panic!("unexpected request"),
+            }
+
+            let old_serialized_send = vec![
+                0, 1, 108, 102, 28, 19, 50, 178, 37, 241, 0, 0, 0, 0, 0, 0, 0, 0, 0, 71, 69, 84,
+                32, 47, 49, 77, 66, 46, 122, 105, 112, 32, 72, 84, 84, 80, 47, 49, 46, 49, 13, 10,
+                72, 111, 115, 116, 58, 32, 105, 112, 118, 52, 46, 100, 111, 119, 110, 108, 111, 97,
+                100, 46, 116, 104, 105, 110, 107, 98, 114, 111, 97, 100, 98, 97, 110, 100, 46, 99,
+                111, 109, 13, 10, 85, 115, 101, 114, 45, 65, 103, 101, 110, 116, 58, 32, 99, 117,
+                114, 108, 47, 55, 46, 54, 56, 46, 48, 13, 10, 65, 99, 99, 101, 112, 116, 58, 32,
+                42, 47, 42, 13, 10, 13, 10,
+            ];
+
+            let new_deserialized =
+                Socks5ProviderRequest::try_from_bytes(&old_serialized_send).unwrap();
+
+            match new_deserialized.content {
+                RequestContent::ProviderData(req) => match req.content {
+                    Socks5RequestContent::Send(send_req) => {
+                        assert_eq!(send_req.conn_id, 7810961472501196273);
+                        assert_eq!(send_req.data.len(), 111);
+                        assert!(!send_req.local_closed);
+                    }
+                    _ => panic!("unexpected request"),
+                },
+                _ => panic!("unexpected request"),
+            }
+        }
+
+        #[test]
+        fn new_client_vs_old_service_provider() {
+            let return_address = "3KRydEpanwjFhq5GAraVjRUF1Tno7w7oc4EwJYTGNo5J.RgZ7uMJHruBQqD5hC9Ghi3sqiTn6NycfM5qCfJz6yoM@9Byd9VAtyYMnbVAcqdoQxJnq76XEg2dbxbiF5Aa5Jj9J".parse().unwrap();
+
+            let new_connect = Socks5ProviderRequest::new_provider_data(
+                ProviderInterfaceVersion::Legacy,
+                Socks5Request::new_connect(
+                    Socks5ProtocolVersion::Legacy,
+                    215647648274976171,
+                    "80.249.99.148:80".to_string(),
+                    Some(return_address),
+                ),
+            );
+
+            let legacy_serialised = new_connect.into_bytes();
+            let old_serialized_connect = vec![
+                0, 0, 2, 254, 34, 100, 192, 20, 13, 171, 0, 16, 56, 48, 46, 50, 52, 57, 46, 57, 57,
+                46, 49, 52, 56, 58, 56, 48, 34, 112, 17, 182, 225, 6, 174, 216, 160, 41, 72, 236,
+                160, 90, 156, 3, 250, 41, 243, 53, 191, 178, 218, 53, 170, 14, 185, 33, 94, 153,
+                25, 41, 6, 82, 169, 187, 88, 246, 211, 57, 68, 225, 228, 231, 116, 29, 119, 235,
+                160, 14, 156, 205, 66, 1, 75, 204, 204, 220, 14, 150, 191, 203, 174, 88, 121, 173,
+                83, 219, 188, 164, 194, 212, 238, 228, 4, 128, 48, 105, 224, 83, 17, 246, 233, 16,
+                235, 223, 68, 87, 13, 40, 34, 186, 218, 204, 126, 145,
+            ];
+
+            assert_eq!(legacy_serialised, old_serialized_connect);
+        }
+    }
+}

common/socks5/requests/src/msg.rs

@@ -1,97 +0,0 @@
-// Copyright 2020-2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use thiserror::Error;
-
-use crate::network_requester_response::{Error as NrError, NetworkRequesterResponse};
-use crate::request::{Request, RequestError};
-use crate::response::{Response, ResponseError};
-
-#[derive(Debug, Error)]
-pub enum MessageError {
-    #[error(transparent)]
-    Request(RequestError),
-
-    #[error("{0:?}")]
-    Response(ResponseError),
-
-    #[error(transparent)]
-    NetworkRequesterResponseError(NrError),
-
-    #[error("no data")]
-    NoData,
-
-    #[error("unknown message type received")]
-    UnknownMessageType,
-}
-
-#[derive(Debug)]
-pub enum Message {
-    Request(Request),
-    Response(Response),
-    NetworkRequesterResponse(NetworkRequesterResponse),
-}
-
-impl Message {
-    const REQUEST_FLAG: u8 = 0;
-    const RESPONSE_FLAG: u8 = 1;
-    const NR_RESPONSE_FLAG: u8 = 2;
-
-    pub fn conn_id(&self) -> u64 {
-        match self {
-            Message::Request(req) => match req {
-                Request::Connect(c) => c.conn_id,
-                Request::Send(conn_id, _, _) => *conn_id,
-            },
-            Message::Response(resp) => resp.connection_id,
-            Message::NetworkRequesterResponse(resp) => resp.connection_id,
-        }
-    }
-
-    pub fn size(&self) -> usize {
-        match self {
-            Message::Request(req) => match req {
-                Request::Connect(_) => 0,
-                Request::Send(_, data, _) => data.len(),
-            },
-            Message::Response(resp) => resp.data.len(),
-            Message::NetworkRequesterResponse(_) => 0,
-        }
-    }
-
-    pub fn try_from_bytes(b: &[u8]) -> Result<Message, MessageError> {
-        if b.is_empty() {
-            return Err(MessageError::NoData);
-        }
-
-        if b[0] == Self::REQUEST_FLAG {
-            Request::try_from_bytes(&b[1..])
-                .map(Message::Request)
-                .map_err(MessageError::Request)
-        } else if b[0] == Self::RESPONSE_FLAG {
-            Response::try_from_bytes(&b[1..])
-                .map(Message::Response)
-                .map_err(MessageError::Response)
-        } else if b[0] == Self::NR_RESPONSE_FLAG {
-            NetworkRequesterResponse::try_from_bytes(&b[1..])
-                .map(Message::NetworkRequesterResponse)
-                .map_err(MessageError::NetworkRequesterResponseError)
-        } else {
-            Err(MessageError::UnknownMessageType)
-        }
-    }
-
-    pub fn into_bytes(self) -> Vec<u8> {
-        match self {
-            Self::Request(r) => std::iter::once(Self::REQUEST_FLAG)
-                .chain(r.into_bytes().iter().cloned())
-                .collect(),
-            Self::Response(r) => std::iter::once(Self::RESPONSE_FLAG)
-                .chain(r.into_bytes().iter().cloned())
-                .collect(),
-            Self::NetworkRequesterResponse(r) => std::iter::once(Self::NR_RESPONSE_FLAG)
-                .chain(r.into_bytes().iter().cloned())
-                .collect(),
-        }
-    }
-}

common/socks5/requests/src/network_requester_response.rs

@@ -1,112 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::ConnectionId;
-
-#[derive(Debug)]
-pub struct NetworkRequesterResponse {
-    pub connection_id: ConnectionId,
-    pub network_requester_error: String,
-}
-
-#[derive(Debug, thiserror::Error, PartialEq, Eq)]
-pub enum Error {
-    #[error("no data provided")]
-    NoData,
-
-    #[error("not enough bytes to recover the connection id")]
-    ConnectionIdTooShort,
-
-    #[error("message is not utf8 encoded")]
-    MalformedErrorMessage(#[from] std::string::FromUtf8Error),
-}
-
-impl NetworkRequesterResponse {
-    pub fn new(connection_id: ConnectionId, network_requester_error: String) -> Self {
-        NetworkRequesterResponse {
-            connection_id,
-            network_requester_error,
-        }
-    }
-
-    pub fn try_from_bytes(b: &[u8]) -> Result<NetworkRequesterResponse, Error> {
-        if b.is_empty() {
-            return Err(Error::NoData);
-        }
-
-        if b.len() < 8 {
-            return Err(Error::ConnectionIdTooShort);
-        }
-
-        let mut connection_id_bytes = b.to_vec();
-        let network_requester_error_bytes = connection_id_bytes.split_off(8);
-
-        let connection_id = u64::from_be_bytes([
-            connection_id_bytes[0],
-            connection_id_bytes[1],
-            connection_id_bytes[2],
-            connection_id_bytes[3],
-            connection_id_bytes[4],
-            connection_id_bytes[5],
-            connection_id_bytes[6],
-            connection_id_bytes[7],
-        ]);
-        let network_requester_error = String::from_utf8(network_requester_error_bytes)?;
-
-        Ok(NetworkRequesterResponse {
-            connection_id,
-            network_requester_error,
-        })
-    }
-
-    pub fn into_bytes(self) -> Vec<u8> {
-        self.connection_id
-            .to_be_bytes()
-            .iter()
-            .copied()
-            .chain(self.network_requester_error.into_bytes().into_iter())
-            .collect()
-    }
-}
-
-#[cfg(test)]
-mod network_requester_response_serde_tests {
-    use super::*;
-
-    #[test]
-    fn simple_serde() {
-        let conn_id = 42;
-        let network_requester_error = String::from("This is a test msg");
-        let response = NetworkRequesterResponse::new(conn_id, network_requester_error.clone());
-        let bytes = response.into_bytes();
-        let deserialized_response = NetworkRequesterResponse::try_from_bytes(&bytes).unwrap();
-
-        assert_eq!(conn_id, deserialized_response.connection_id);
-        assert_eq!(
-            network_requester_error,
-            deserialized_response.network_requester_error
-        );
-    }
-
-    #[test]
-    fn deserialization_errors() {
-        let err = NetworkRequesterResponse::try_from_bytes(&[]).err().unwrap();
-        assert_eq!(err, Error::NoData);
-
-        let bytes: [u8; 5] = [1, 2, 3, 4, 5];
-        let err = NetworkRequesterResponse::try_from_bytes(&bytes)
-            .err()
-            .unwrap();
-        assert_eq!(err, Error::ConnectionIdTooShort);
-
-        let bytes: Vec<u8> = 42u64
-            .to_be_bytes()
-            .into_iter()
-            .chain([0, 159, 146, 150].into_iter())
-            .collect();
-        let err = NetworkRequesterResponse::try_from_bytes(&bytes)
-            .err()
-            .unwrap();
-        assert!(matches!(err, Error::MalformedErrorMessage(_)));
-    }
-}

common/socks5/requests/src/request.rs

@@ -1,7 +1,9 @@
-// Copyright 2020-2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2020-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::{Socks5ProtocolVersion, Socks5RequestError, Socks5Response};
 use nymsphinx_addressing::clients::{Recipient, RecipientFormattingError};
+use service_providers_common::interface::{Serializable, ServiceProviderRequest};
 use std::convert::TryFrom;
 use thiserror::Error;
 
@@ -16,19 +18,19 @@ pub enum RequestFlag {
 }
 
 impl TryFrom<u8> for RequestFlag {
-    type Error = RequestError;
+    type Error = RequestDeserializationError;
 
-    fn try_from(value: u8) -> Result<RequestFlag, RequestError> {
+    fn try_from(value: u8) -> Result<RequestFlag, RequestDeserializationError> {
         match value {
             _ if value == (RequestFlag::Connect as u8) => Ok(Self::Connect),
             _ if value == (RequestFlag::Send as u8) => Ok(Self::Send),
-            _ => Err(RequestError::UnknownRequestFlag),
+            value => Err(RequestDeserializationError::UnknownRequestFlag { value }),
         }
     }
 }
 
 #[derive(Debug, Error)]
-pub enum RequestError {
+pub enum RequestDeserializationError {
     #[error("not enough bytes to recover the length of the address")]
     AddressLengthTooShort,
 
@@ -41,8 +43,8 @@ pub enum RequestError {
     #[error("no data provided")]
     NoData,
 
-    #[error("request of unknown type")]
-    UnknownRequestFlag,
+    #[error("{value} is not a valid request flag")]
+    UnknownRequestFlag { value: u8 },
 
     #[error("too short return address")]
     ReturnAddressTooShort,
@@ -51,13 +53,13 @@ pub enum RequestError {
     MalformedReturnAddress(RecipientFormattingError),
 }
 
-impl RequestError {
+impl RequestDeserializationError {
     pub fn is_malformed_return(&self) -> bool {
-        matches!(self, RequestError::MalformedReturnAddress(_))
+        matches!(self, RequestDeserializationError::MalformedReturnAddress(_))
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct ConnectRequest {
     // TODO: is connection_id redundant now?
     pub conn_id: ConnectionId,
@@ -65,27 +67,128 @@ pub struct ConnectRequest {
     pub return_address: Option<Recipient>,
 }
 
+#[derive(Debug, Clone)]
+pub struct SendRequest {
+    pub conn_id: ConnectionId,
+    pub data: Vec<u8>,
+    pub local_closed: bool,
+}
+
+#[derive(Debug, Clone)]
+pub struct Socks5Request {
+    pub protocol_version: Socks5ProtocolVersion,
+    pub content: Socks5RequestContent,
+}
+
+impl Serializable for Socks5Request {
+    type Error = Socks5RequestError;
+
+    // legacy requests had the format of
+    // 0 (Message::REQUEST_FLAG) || 0 (RequestFlag::Connect) || <data> for connect requests
+    // 0 (Message::REQUEST_FLAG) || 1 (RequestFlag::Send) || <data> for send requests
+    // the updated formats use
+    // 3 (Socks5ProtocolVersion) || 0 (RequestFlag::Connect) || <data> for connect requests
+    // 3 (Socks5ProtocolVersion) || 1 (RequestFlag::Send) || <data> for send requests
+    // in both cases, the actual data is serialized the same way, so the process is quite straight forward
+    fn into_bytes(self) -> Vec<u8> {
+        if let Some(version) = self.protocol_version.as_u8() {
+            std::iter::once(version)
+                .chain(self.content.into_bytes().into_iter())
+                .collect()
+        } else {
+            std::iter::once(Self::LEGACY_TYPE_TAG)
+                .chain(self.content.into_bytes())
+                .collect()
+        }
+    }
+
+    fn try_from_bytes(b: &[u8]) -> Result<Self, Self::Error> {
+        if b.is_empty() {
+            return Err(RequestDeserializationError::NoData.into());
+        }
+
+        let protocol_version = Socks5ProtocolVersion::from(b[0]);
+        Ok(Socks5Request {
+            protocol_version,
+            content: Socks5RequestContent::try_from_bytes(&b[1..])?,
+        })
+    }
+}
+
+impl ServiceProviderRequest for Socks5Request {
+    type ProtocolVersion = Socks5ProtocolVersion;
+    type Response = Socks5Response;
+    type Error = Socks5RequestError;
+
+    fn provider_specific_version(&self) -> Self::ProtocolVersion {
+        self.protocol_version
+    }
+
+    fn max_supported_version() -> Self::ProtocolVersion {
+        Socks5ProtocolVersion::new_current()
+    }
+}
+
+impl Socks5Request {
+    // type tag that used to be prepended to all request messages
+    const LEGACY_TYPE_TAG: u8 = 0x00;
+
+    pub fn new(
+        protocol_version: Socks5ProtocolVersion,
+        content: Socks5RequestContent,
+    ) -> Socks5Request {
+        Socks5Request {
+            protocol_version,
+            content,
+        }
+    }
+
+    pub fn new_connect(
+        protocol_version: Socks5ProtocolVersion,
+        conn_id: ConnectionId,
+        remote_addr: RemoteAddress,
+        return_address: Option<Recipient>,
+    ) -> Socks5Request {
+        Socks5Request {
+            protocol_version,
+            content: Socks5RequestContent::new_connect(conn_id, remote_addr, return_address),
+        }
+    }
+
+    pub fn new_send(
+        protocol_version: Socks5ProtocolVersion,
+        conn_id: ConnectionId,
+        data: Vec<u8>,
+        local_closed: bool,
+    ) -> Socks5Request {
+        Socks5Request {
+            protocol_version,
+            content: Socks5RequestContent::new_send(conn_id, data, local_closed),
+        }
+    }
+}
+
 /// A request from a SOCKS5 client that a Nym Socks5 service provider should
 /// take an action for an application using a (probably local) Nym Socks5 proxy.
-#[derive(Debug)]
-pub enum Request {
+#[derive(Debug, Clone)]
+pub enum Socks5RequestContent {
     /// Start a new TCP connection to the specified `RemoteAddress` and send
     /// the request data up the connection.
     /// All responses produced on this `ConnectionId` should come back to the specified `Recipient`
     Connect(Box<ConnectRequest>),
 
     /// Re-use an existing TCP connection, sending more request data up it.
-    Send(ConnectionId, Vec<u8>, bool),
+    Send(SendRequest),
 }
 
-impl Request {
+impl Socks5RequestContent {
     /// Construct a new Request::Connect instance
     pub fn new_connect(
         conn_id: ConnectionId,
         remote_addr: RemoteAddress,
         return_address: Option<Recipient>,
-    ) -> Request {
-        Request::Connect(Box::new(ConnectRequest {
+    ) -> Socks5RequestContent {
+        Socks5RequestContent::Connect(Box::new(ConnectRequest {
             conn_id,
             remote_addr,
             return_address,
@@ -93,8 +196,16 @@ impl Request {
     }
 
     /// Construct a new Request::Send instance
-    pub fn new_send(conn_id: ConnectionId, data: Vec<u8>, local_closed: bool) -> Request {
-        Request::Send(conn_id, data, local_closed)
+    pub fn new_send(
+        conn_id: ConnectionId,
+        data: Vec<u8>,
+        local_closed: bool,
+    ) -> Socks5RequestContent {
+        Socks5RequestContent::Send(SendRequest {
+            conn_id,
+            data,
+            local_closed,
+        })
     }
 
     /// Deserialize the request type, connection id, destination address and port,
@@ -111,23 +222,23 @@ impl Request {
     /// The request_flag tells us whether this is a new connection request (`new_connect`),
     /// an already-established connection we should send up (`new_send`), or
     /// a request to close an established connection (`new_close`).
-    pub fn try_from_bytes(b: &[u8]) -> Result<Request, RequestError> {
+    pub fn try_from_bytes(b: &[u8]) -> Result<Socks5RequestContent, RequestDeserializationError> {
         // each request needs to at least contain flag and ConnectionId
         if b.is_empty() {
-            return Err(RequestError::NoData);
+            return Err(RequestDeserializationError::NoData);
         }
 
         if b.len() < 9 {
-            return Err(RequestError::ConnectionIdTooShort);
+            return Err(RequestDeserializationError::ConnectionIdTooShort);
         }
-        let connection_id = u64::from_be_bytes([b[1], b[2], b[3], b[4], b[5], b[6], b[7], b[8]]);
+        let conn_id = u64::from_be_bytes([b[1], b[2], b[3], b[4], b[5], b[6], b[7], b[8]]);
         match RequestFlag::try_from(b[0])? {
             RequestFlag::Connect => {
                 let connect_request_bytes = &b[9..];
 
                 // we need to be able to read at least 2 bytes that specify address length
                 if connect_request_bytes.len() < 2 {
-                    return Err(RequestError::AddressLengthTooShort);
+                    return Err(RequestDeserializationError::AddressLengthTooShort);
                 }
 
                 let address_length =
@@ -135,7 +246,7 @@ impl Request {
                         as usize;
 
                 if connect_request_bytes.len() < 2 + address_length {
-                    return Err(RequestError::AddressTooShort);
+                    return Err(RequestDeserializationError::AddressTooShort);
                 }
 
                 let address_start = 2;
@@ -150,19 +261,19 @@ impl Request {
                     None
                 } else {
                     if recipient_data_bytes.len() != Recipient::LEN {
-                        return Err(RequestError::ReturnAddressTooShort);
+                        return Err(RequestDeserializationError::ReturnAddressTooShort);
                     }
 
                     let mut return_bytes = [0u8; Recipient::LEN];
                     return_bytes.copy_from_slice(&recipient_data_bytes[..Recipient::LEN]);
                     Some(
                         Recipient::try_from_bytes(return_bytes)
-                            .map_err(RequestError::MalformedReturnAddress)?,
+                            .map_err(RequestDeserializationError::MalformedReturnAddress)?,
                     )
                 };
 
-                Ok(Request::new_connect(
-                    connection_id,
+                Ok(Socks5RequestContent::new_connect(
+                    conn_id,
                     remote_address,
                     return_address,
                 ))
@@ -171,7 +282,11 @@ impl Request {
                 let local_closed = b[9] != 0;
                 let data = b[10..].to_vec();
 
-                Ok(Request::Send(connection_id, data, local_closed))
+                Ok(Socks5RequestContent::Send(SendRequest {
+                    conn_id,
+                    data,
+                    local_closed,
+                }))
             }
         }
     }
@@ -182,7 +297,7 @@ impl Request {
     pub fn into_bytes(self) -> Vec<u8> {
         match self {
             // connect is: CONN_FLAG || CONN_ID || REMOTE_LEN || REMOTE || RETURN
-            Request::Connect(req) => {
+            Socks5RequestContent::Connect(req) => {
                 let remote_address_bytes = req.remote_addr.into_bytes();
                 let remote_address_bytes_len = remote_address_bytes.len() as u16;
 
@@ -197,10 +312,10 @@ impl Request {
                     iter.collect()
                 }
             }
-            Request::Send(conn_id, data, local_closed) => std::iter::once(RequestFlag::Send as u8)
-                .chain(conn_id.to_be_bytes().into_iter())
-                .chain(std::iter::once(local_closed as u8))
-                .chain(data.into_iter())
+            Socks5RequestContent::Send(req) => std::iter::once(RequestFlag::Send as u8)
+                .chain(req.conn_id.to_be_bytes().into_iter())
+                .chain(std::iter::once(req.local_closed as u8))
+                .chain(req.data.into_iter())
                 .collect(),
         }
     }
@@ -216,8 +331,8 @@ mod request_deserialization_tests {
         #[test]
         fn returns_error_when_zero_bytes() {
             let request_bytes = Vec::new();
-            match Request::try_from_bytes(&request_bytes).unwrap_err() {
-                RequestError::NoData => {}
+            match Socks5RequestContent::try_from_bytes(&request_bytes).unwrap_err() {
+                RequestDeserializationError::NoData => {}
                 _ => unreachable!(),
             }
         }
@@ -225,8 +340,8 @@ mod request_deserialization_tests {
         #[test]
         fn returns_error_when_connection_id_too_short() {
             let request_bytes = [RequestFlag::Connect as u8, 1, 2, 3, 4, 5, 6, 7].to_vec(); // 7 bytes connection id
-            match Request::try_from_bytes(&request_bytes).unwrap_err() {
-                RequestError::ConnectionIdTooShort => {}
+            match Socks5RequestContent::try_from_bytes(&request_bytes).unwrap_err() {
+                RequestDeserializationError::ConnectionIdTooShort => {}
                 _ => unreachable!(),
             }
         }
@@ -241,13 +356,13 @@ mod request_deserialization_tests {
             let request_bytes1 = [RequestFlag::Connect as u8, 1, 2, 3, 4, 5, 6, 7, 8].to_vec(); // 8 bytes connection id, 0 bytes address length (2 were expected)
             let request_bytes2 = [RequestFlag::Connect as u8, 1, 2, 3, 4, 5, 6, 7, 8, 0].to_vec(); // 8 bytes connection id, 1 bytes address length (2 were expected)
 
-            match Request::try_from_bytes(&request_bytes1).unwrap_err() {
-                RequestError::AddressLengthTooShort => {}
+            match Socks5RequestContent::try_from_bytes(&request_bytes1).unwrap_err() {
+                RequestDeserializationError::AddressLengthTooShort => {}
                 _ => unreachable!(),
             }
 
-            match Request::try_from_bytes(&request_bytes2).unwrap_err() {
-                RequestError::AddressLengthTooShort => {}
+            match Socks5RequestContent::try_from_bytes(&request_bytes2).unwrap_err() {
+                RequestDeserializationError::AddressLengthTooShort => {}
                 _ => unreachable!(),
             }
         }
@@ -255,8 +370,8 @@ mod request_deserialization_tests {
         #[test]
         fn returns_error_when_address_too_short_for_given_address_length() {
             let request_bytes = [RequestFlag::Connect as u8, 1, 2, 3, 4, 5, 6, 7, 8, 0, 1].to_vec(); // 8 bytes connection id, 2 bytes address length, missing address
-            match Request::try_from_bytes(&request_bytes).unwrap_err() {
-                RequestError::AddressTooShort => {}
+            match Socks5RequestContent::try_from_bytes(&request_bytes).unwrap_err() {
+                RequestDeserializationError::AddressTooShort => {}
                 _ => unreachable!(),
             }
         }
@@ -295,8 +410,8 @@ mod request_deserialization_tests {
                 .chain(recipient_bytes.iter().take(40).cloned())
                 .collect();
 
-            match Request::try_from_bytes(&request_bytes).unwrap_err() {
-                RequestError::ReturnAddressTooShort => {}
+            match Socks5RequestContent::try_from_bytes(&request_bytes).unwrap_err() {
+                RequestDeserializationError::ReturnAddressTooShort => {}
                 _ => unreachable!(),
             }
         }
@@ -338,7 +453,7 @@ mod request_deserialization_tests {
                 .cloned()
                 .chain(recipient_bytes.into_iter())
                 .collect();
-            assert!(Request::try_from_bytes(&request_bytes)
+            assert!(Socks5RequestContent::try_from_bytes(&request_bytes)
                 .unwrap_err()
                 .is_malformed_return());
         }
@@ -376,9 +491,9 @@ mod request_deserialization_tests {
                 .chain(recipient_bytes.into_iter())
                 .collect();
 
-            let request = Request::try_from_bytes(&request_bytes).unwrap();
+            let request = Socks5RequestContent::try_from_bytes(&request_bytes).unwrap();
             match request {
-                Request::Connect(req) => {
+                Socks5RequestContent::Connect(req) => {
                     assert_eq!("foo.com".to_string(), req.remote_addr);
                     assert_eq!(u64::from_be_bytes([1, 2, 3, 4, 5, 6, 7, 8]), req.conn_id);
                     assert_eq!(
@@ -423,9 +538,9 @@ mod request_deserialization_tests {
                 .chain(recipient_bytes.into_iter())
                 .collect();
 
-            let request = Request::try_from_bytes(&request_bytes).unwrap();
+            let request = Socks5RequestContent::try_from_bytes(&request_bytes).unwrap();
             match request {
-                Request::Connect(req) => {
+                Socks5RequestContent::Connect(req) => {
                     assert_eq!("foo.com".to_string(), req.remote_addr);
                     assert_eq!(u64::from_be_bytes([1, 2, 3, 4, 5, 6, 7, 8]), req.conn_id);
                     assert_eq!(
@@ -446,9 +561,13 @@ mod request_deserialization_tests {
         fn works_when_request_is_sized_properly_even_without_data() {
             // correct 8 bytes of connection_id, 1 byte of local_closed and 0 bytes request data
             let request_bytes = [RequestFlag::Send as u8, 1, 2, 3, 4, 5, 6, 7, 8, 0].to_vec();
-            let request = Request::try_from_bytes(&request_bytes).unwrap();
+            let request = Socks5RequestContent::try_from_bytes(&request_bytes).unwrap();
             match request {
-                Request::Send(conn_id, data, local_closed) => {
+                Socks5RequestContent::Send(SendRequest {
+                    conn_id,
+                    data,
+                    local_closed,
+                }) => {
                     assert_eq!(u64::from_be_bytes([1, 2, 3, 4, 5, 6, 7, 8]), conn_id);
                     assert_eq!(Vec::<u8>::new(), data);
                     assert!(!local_closed)
@@ -477,9 +596,13 @@ mod request_deserialization_tests {
             ]
             .to_vec();
 
-            let request = Request::try_from_bytes(&request_bytes).unwrap();
+            let request = Socks5RequestContent::try_from_bytes(&request_bytes).unwrap();
             match request {
-                Request::Send(conn_id, data, local_closed) => {
+                Socks5RequestContent::Send(SendRequest {
+                    conn_id,
+                    data,
+                    local_closed,
+                }) => {
                     assert_eq!(u64::from_be_bytes([1, 2, 3, 4, 5, 6, 7, 8]), conn_id);
                     assert_eq!(vec![255, 255, 255], data);
                     assert!(!local_closed)

common/socks5/requests/src/response.rs

@@ -1,46 +1,239 @@
-// Copyright 2020-2022 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2020-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::{ConnectionId, Socks5ProtocolVersion, Socks5RequestError};
+use service_providers_common::interface::{Serializable, ServiceProviderResponse};
 use thiserror::Error;
 
-use crate::ConnectionId;
+// don't start tags from 0 for easier backwards compatibility since `NetworkData`
+// used to be a `Response` with tag 1
+// and `ConnectionError` used to be `NetworkRequesterResponse` with tag 2
+#[repr(u8)]
+#[derive(Clone, Copy, Debug)]
+pub enum ResponseFlag {
+    NetworkData = 1,
+    ConnectionError = 2,
+}
+
+impl TryFrom<u8> for ResponseFlag {
+    type Error = ResponseDeserializationError;
+
+    fn try_from(value: u8) -> Result<ResponseFlag, ResponseDeserializationError> {
+        match value {
+            _ if value == (ResponseFlag::NetworkData as u8) => Ok(Self::NetworkData),
+            _ if value == (ResponseFlag::ConnectionError as u8) => Ok(Self::ConnectionError),
+            value => Err(ResponseDeserializationError::UnknownResponseFlag { value }),
+        }
+    }
+}
 
 #[derive(Debug, Error, PartialEq, Eq)]
-pub enum ResponseError {
+pub enum ResponseDeserializationError {
     #[error("not enough bytes to recover the connection id")]
     ConnectionIdTooShort,
+
+    #[error("{value} is not a valid response flag")]
+    UnknownResponseFlag { value: u8 },
+
     #[error("no data provided")]
     NoData,
+
+    #[error("message is not utf8 encoded: {source}")]
+    MalformedErrorMessage {
+        #[from]
+        source: std::string::FromUtf8Error,
+    },
 }
-/// A remote network response retrieved by the Socks5 service provider. This
+
+#[derive(Debug)]
+pub struct Socks5Response {
+    pub protocol_version: Socks5ProtocolVersion,
+    pub content: Socks5ResponseContent,
+}
+
+impl Serializable for Socks5Response {
+    type Error = Socks5RequestError;
+
+    // legacy responses had the format of
+    // 1 (Message::RESPONSE_FLAG) || <data> for data responses
+    // 2 (Message::NR_RESPONSE_FLAG) || <data> for error responses
+    // the updated formats use
+    // 3 (Socks5ProtocolVersion) || 0 (ResponseFlag::NetworkData) || <data> for data responses
+    // 3 (Socks5ProtocolVersion) || 1 (ResponseFlag::ConnectionError) || <data> for error responses
+    // so for serialization an optional version tag is prepended
+    // and in deserialization it's just the case of shifting the buffer in case of non-legacy response payload
+    fn into_bytes(self) -> Vec<u8> {
+        if let Some(version) = self.protocol_version.as_u8() {
+            std::iter::once(version)
+                .chain(self.content.into_bytes().into_iter())
+                .collect()
+        } else {
+            self.content.into_bytes()
+        }
+    }
+
+    fn try_from_bytes(b: &[u8]) -> Result<Self, Self::Error> {
+        if b.is_empty() {
+            return Err(ResponseDeserializationError::NoData.into());
+        }
+
+        let protocol_version = Socks5ProtocolVersion::from(b[0]);
+        let content = if protocol_version.is_legacy() {
+            Socks5ResponseContent::try_from_bytes(b)
+        } else {
+            Socks5ResponseContent::try_from_bytes(&b[1..])
+        }?;
+        Ok(Socks5Response {
+            protocol_version,
+            content,
+        })
+    }
+}
+
+impl ServiceProviderResponse for Socks5Response {}
+
+impl Socks5Response {
+    pub fn new(
+        protocol_version: Socks5ProtocolVersion,
+        content: Socks5ResponseContent,
+    ) -> Socks5Response {
+        Socks5Response {
+            protocol_version,
+            content,
+        }
+    }
+
+    pub fn new_network_data(
+        protocol_version: Socks5ProtocolVersion,
+        connection_id: ConnectionId,
+        data: Vec<u8>,
+        is_closed: bool,
+    ) -> Socks5Response {
+        Socks5Response {
+            protocol_version,
+            content: Socks5ResponseContent::new_network_data(connection_id, data, is_closed),
+        }
+    }
+
+    pub fn new_closed_empty(
+        protocol_version: Socks5ProtocolVersion,
+        connection_id: ConnectionId,
+    ) -> Socks5Response {
+        Socks5Response {
+            protocol_version,
+            content: Socks5ResponseContent::new_closed_empty(connection_id),
+        }
+    }
+
+    pub fn new_connection_error(
+        protocol_version: Socks5ProtocolVersion,
+        connection_id: ConnectionId,
+        error_message: String,
+    ) -> Socks5Response {
+        Socks5Response {
+            protocol_version,
+            content: Socks5ResponseContent::new_connection_error(connection_id, error_message),
+        }
+    }
+}
+
+#[derive(Debug)]
+pub enum Socks5ResponseContent {
+    NetworkData(NetworkData),
+    ConnectionError(ConnectionError),
+}
+
+impl Socks5ResponseContent {
+    pub fn new_network_data(
+        connection_id: ConnectionId,
+        data: Vec<u8>,
+        is_closed: bool,
+    ) -> Socks5ResponseContent {
+        Socks5ResponseContent::NetworkData(NetworkData::new(connection_id, data, is_closed))
+    }
+
+    pub fn new_closed_empty(connection_id: ConnectionId) -> Socks5ResponseContent {
+        Socks5ResponseContent::NetworkData(NetworkData::new_closed_empty(connection_id))
+    }
+
+    pub fn new_connection_error(
+        connection_id: ConnectionId,
+        error_message: String,
+    ) -> Socks5ResponseContent {
+        Socks5ResponseContent::ConnectionError(ConnectionError::new(connection_id, error_message))
+    }
+
+    pub fn into_bytes(self) -> Vec<u8> {
+        match self {
+            Socks5ResponseContent::NetworkData(res) => {
+                std::iter::once(ResponseFlag::NetworkData as u8)
+                    .chain(res.into_bytes().into_iter())
+                    .collect()
+            }
+            Socks5ResponseContent::ConnectionError(res) => {
+                std::iter::once(ResponseFlag::ConnectionError as u8)
+                    .chain(res.into_bytes().into_iter())
+                    .collect()
+            }
+        }
+    }
+
+    pub fn try_from_bytes(b: &[u8]) -> Result<Socks5ResponseContent, ResponseDeserializationError> {
+        if b.is_empty() {
+            // TODO: bad error type since this branch could be reached in the 'versioned' case
+            // after reading 1 byte already
+            return Err(ResponseDeserializationError::NoData);
+        }
+
+        let response_flag = ResponseFlag::try_from(b[0])?;
+        match response_flag {
+            ResponseFlag::NetworkData => Ok(Socks5ResponseContent::NetworkData(
+                NetworkData::try_from_bytes(&b[1..])?,
+            )),
+            ResponseFlag::ConnectionError => Ok(Socks5ResponseContent::ConnectionError(
+                ConnectionError::try_from_bytes(&b[1..])?,
+            )),
+        }
+    }
+}
+
+/// A remote network network data response retrieved by the Socks5 service provider. This
 /// can be serialized and sent back through the mixnet to the requesting
 /// application.
 #[derive(Debug)]
-pub struct Response {
+pub struct NetworkData {
     pub data: Vec<u8>,
     pub connection_id: ConnectionId,
     pub is_closed: bool,
 }
 
-impl Response {
+impl NetworkData {
     /// Constructor for responses
     pub fn new(connection_id: ConnectionId, data: Vec<u8>, is_closed: bool) -> Self {
-        Response {
+        NetworkData {
             data,
             connection_id,
             is_closed,
         }
     }
 
-    pub fn try_from_bytes(b: &[u8]) -> Result<Response, ResponseError> {
+    pub fn new_closed_empty(connection_id: ConnectionId) -> Self {
+        NetworkData {
+            data: vec![],
+            connection_id,
+            is_closed: false,
+        }
+    }
+
+    pub fn try_from_bytes(b: &[u8]) -> Result<NetworkData, ResponseDeserializationError> {
         if b.is_empty() {
-            return Err(ResponseError::NoData);
+            return Err(ResponseDeserializationError::NoData);
         }
 
         let is_closed = b[0] != 0;
 
         if b.len() < 9 {
-            return Err(ResponseError::ConnectionIdTooShort);
+            return Err(ResponseDeserializationError::ConnectionIdTooShort);
         }
 
         let mut connection_id_bytes = b.to_vec();
@@ -57,7 +250,7 @@ impl Response {
             connection_id_bytes[8],
         ]);
 
-        let response = Response::new(connection_id, data, is_closed);
+        let response = NetworkData::new(connection_id, data, is_closed);
         Ok(response)
     }
 
@@ -71,54 +264,154 @@ impl Response {
     }
 }
 
-#[cfg(test)]
-mod constructing_socks5_responses_from_bytes {
-    use super::*;
+#[derive(Debug)]
+pub struct ConnectionError {
+    pub connection_id: ConnectionId,
+    pub network_requester_error: String,
+}
 
-    #[test]
-    fn fails_when_zero_bytes_are_supplied() {
-        let response_bytes = Vec::new();
-
-        assert_eq!(
-            ResponseError::NoData,
-            Response::try_from_bytes(&response_bytes).unwrap_err()
-        );
+impl ConnectionError {
+    pub fn new(connection_id: ConnectionId, network_requester_error: String) -> Self {
+        ConnectionError {
+            connection_id,
+            network_requester_error,
+        }
     }
 
-    #[test]
-    fn fails_when_connection_id_bytes_are_too_short() {
-        let response_bytes = vec![0, 1, 2, 3, 4, 5, 6];
-        assert_eq!(
-            ResponseError::ConnectionIdTooShort,
-            Response::try_from_bytes(&response_bytes).unwrap_err()
-        );
+    pub fn try_from_bytes(b: &[u8]) -> Result<ConnectionError, ResponseDeserializationError> {
+        if b.is_empty() {
+            return Err(ResponseDeserializationError::NoData);
+        }
+
+        if b.len() < 8 {
+            return Err(ResponseDeserializationError::ConnectionIdTooShort);
+        }
+
+        let mut connection_id_bytes = b.to_vec();
+        let network_requester_error_bytes = connection_id_bytes.split_off(8);
+
+        let connection_id = u64::from_be_bytes([
+            connection_id_bytes[0],
+            connection_id_bytes[1],
+            connection_id_bytes[2],
+            connection_id_bytes[3],
+            connection_id_bytes[4],
+            connection_id_bytes[5],
+            connection_id_bytes[6],
+            connection_id_bytes[7],
+        ]);
+        let network_requester_error = String::from_utf8(network_requester_error_bytes)?;
+
+        Ok(ConnectionError {
+            connection_id,
+            network_requester_error,
+        })
     }
 
-    #[test]
-    fn works_when_there_is_no_data() {
-        let response_bytes = vec![0, 0, 1, 2, 3, 4, 5, 6, 7];
-        let expected = Response::new(
-            u64::from_be_bytes([0, 1, 2, 3, 4, 5, 6, 7]),
-            Vec::new(),
-            false,
-        );
-        let actual = Response::try_from_bytes(&response_bytes).unwrap();
-        assert_eq!(expected.connection_id, actual.connection_id);
-        assert_eq!(expected.data, actual.data);
-        assert_eq!(expected.is_closed, actual.is_closed);
-    }
-
-    #[test]
-    fn works_when_there_is_data() {
-        let response_bytes = vec![0, 0, 1, 2, 3, 4, 5, 6, 7, 255, 255, 255];
-        let expected = Response::new(
-            u64::from_be_bytes([0, 1, 2, 3, 4, 5, 6, 7]),
-            vec![255, 255, 255],
-            false,
-        );
-        let actual = Response::try_from_bytes(&response_bytes).unwrap();
-        assert_eq!(expected.connection_id, actual.connection_id);
-        assert_eq!(expected.data, actual.data);
-        assert_eq!(expected.is_closed, actual.is_closed);
+    pub fn into_bytes(self) -> Vec<u8> {
+        self.connection_id
+            .to_be_bytes()
+            .iter()
+            .copied()
+            .chain(self.network_requester_error.into_bytes().into_iter())
+            .collect()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[cfg(test)]
+    mod constructing_socks5_data_responses_from_bytes {
+        use super::*;
+
+        #[test]
+        fn fails_when_zero_bytes_are_supplied() {
+            let response_bytes = Vec::new();
+
+            assert_eq!(
+                ResponseDeserializationError::NoData,
+                NetworkData::try_from_bytes(&response_bytes).unwrap_err()
+            );
+        }
+
+        #[test]
+        fn fails_when_connection_id_bytes_are_too_short() {
+            let response_bytes = vec![0, 1, 2, 3, 4, 5, 6];
+            assert_eq!(
+                ResponseDeserializationError::ConnectionIdTooShort,
+                NetworkData::try_from_bytes(&response_bytes).unwrap_err()
+            );
+        }
+
+        #[test]
+        fn works_when_there_is_no_data() {
+            let response_bytes = vec![0, 0, 1, 2, 3, 4, 5, 6, 7];
+            let expected = NetworkData::new(
+                u64::from_be_bytes([0, 1, 2, 3, 4, 5, 6, 7]),
+                Vec::new(),
+                false,
+            );
+            let actual = NetworkData::try_from_bytes(&response_bytes).unwrap();
+            assert_eq!(expected.connection_id, actual.connection_id);
+            assert_eq!(expected.data, actual.data);
+            assert_eq!(expected.is_closed, actual.is_closed);
+        }
+
+        #[test]
+        fn works_when_there_is_data() {
+            let response_bytes = vec![0, 0, 1, 2, 3, 4, 5, 6, 7, 255, 255, 255];
+            let expected = NetworkData::new(
+                u64::from_be_bytes([0, 1, 2, 3, 4, 5, 6, 7]),
+                vec![255, 255, 255],
+                false,
+            );
+            let actual = NetworkData::try_from_bytes(&response_bytes).unwrap();
+            assert_eq!(expected.connection_id, actual.connection_id);
+            assert_eq!(expected.data, actual.data);
+            assert_eq!(expected.is_closed, actual.is_closed);
+        }
+    }
+
+    #[cfg(test)]
+    mod connection_error_response_serde_tests {
+        use super::*;
+
+        #[test]
+        fn simple_serde() {
+            let conn_id = 42;
+            let network_requester_error = String::from("This is a test msg");
+            let response = ConnectionError::new(conn_id, network_requester_error.clone());
+            let bytes = response.into_bytes();
+            let deserialized_response = ConnectionError::try_from_bytes(&bytes).unwrap();
+
+            assert_eq!(conn_id, deserialized_response.connection_id);
+            assert_eq!(
+                network_requester_error,
+                deserialized_response.network_requester_error
+            );
+        }
+
+        #[test]
+        fn deserialization_errors() {
+            let err = ConnectionError::try_from_bytes(&[]).err().unwrap();
+            assert_eq!(err, ResponseDeserializationError::NoData);
+
+            let bytes: [u8; 5] = [1, 2, 3, 4, 5];
+            let err = ConnectionError::try_from_bytes(&bytes).err().unwrap();
+            assert_eq!(err, ResponseDeserializationError::ConnectionIdTooShort);
+
+            let bytes: Vec<u8> = 42u64
+                .to_be_bytes()
+                .into_iter()
+                .chain([0, 159, 146, 150].into_iter())
+                .collect();
+            let err = ConnectionError::try_from_bytes(&bytes).err().unwrap();
+            assert!(matches!(
+                err,
+                ResponseDeserializationError::MalformedErrorMessage { .. }
+            ));
+        }
     }
 }

common/socks5/requests/src/version.rs

@@ -0,0 +1,21 @@
+// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use service_providers_common::{define_simple_version, interface::Version};
+
+/// Defines initial version of the communication interface between socks5 clients and
+/// network requesters (socks5).
+// note: we start from '3' so that we could distinguish cases where no version is provided
+// and legacy communication mode is used instead
+pub const INITIAL_INTERFACE_VERSION: u8 = 3;
+
+/// Defines the current version of the communication interface between socks5 clients and
+/// network requesters (socks5).
+/// It has to be incremented for any breaking change.
+pub const INTERFACE_VERSION: u8 = 3;
+
+define_simple_version!(
+    Socks5ProtocolVersion,
+    INITIAL_INTERFACE_VERSION,
+    INTERFACE_VERSION
+);

contracts/coconut-dkg/src/contract.rs

@@ -7,7 +7,9 @@ use crate::dealers::queries::{
 use crate::dealers::transactions::try_add_dealer;
 use crate::dealings::queries::query_dealings_paged;
 use crate::dealings::transactions::try_commit_dealings;
-use crate::epoch_state::queries::{query_current_epoch, query_current_epoch_threshold};
+use crate::epoch_state::queries::{
+    query_current_epoch, query_current_epoch_threshold, query_initial_dealers,
+};
 use crate::epoch_state::storage::CURRENT_EPOCH;
 use crate::epoch_state::transactions::{advance_epoch_state, try_surpassed_threshold};
 use crate::error::ContractError;
@@ -75,15 +77,17 @@ pub fn execute(
         ExecuteMsg::RegisterDealer {
             bte_key_with_proof,
             announce_address,
-        } => try_add_dealer(deps, info, bte_key_with_proof, announce_address),
-        ExecuteMsg::CommitDealing { dealing_bytes } => {
-            try_commit_dealings(deps, info, dealing_bytes)
+            resharing,
+        } => try_add_dealer(deps, info, bte_key_with_proof, announce_address, resharing),
+        ExecuteMsg::CommitDealing {
+            dealing_bytes,
+            resharing,
+        } => try_commit_dealings(deps, info, dealing_bytes, resharing),
+        ExecuteMsg::CommitVerificationKeyShare { share, resharing } => {
+            try_commit_verification_key_share(deps, env, info, share, resharing)
         }
-        ExecuteMsg::CommitVerificationKeyShare { share } => {
-            try_commit_verification_key_share(deps, env, info, share)
-        }
-        ExecuteMsg::VerifyVerificationKeyShare { owner } => {
-            try_verify_verification_key_share(deps, info, owner)
+        ExecuteMsg::VerifyVerificationKeyShare { owner, resharing } => {
+            try_verify_verification_key_share(deps, info, owner, resharing)
         }
         ExecuteMsg::SurpassedThreshold {} => try_surpassed_threshold(deps, env),
         ExecuteMsg::AdvanceEpochState {} => advance_epoch_state(deps, env),
@@ -97,6 +101,7 @@ pub fn query(deps: Deps<'_>, _env: Env, msg: QueryMsg) -> Result<QueryResponse,
         QueryMsg::GetCurrentEpochThreshold {} => {
             to_binary(&query_current_epoch_threshold(deps.storage)?)?
         }
+        QueryMsg::GetInitialDealers {} => to_binary(&query_initial_dealers(deps.storage)?)?,
         QueryMsg::GetDealerDetails { dealer_address } => {
             to_binary(&query_dealer_details(deps, dealer_address)?)?
         }
@@ -238,6 +243,7 @@ mod tests {
                     &RegisterDealer {
                         bte_key_with_proof: "bte_key_with_proof".to_string(),
                         announce_address: "127.0.0.1:8000".to_string(),
+                        resharing: false,
                     },
                     &vec![],
                 )
@@ -251,6 +257,7 @@ mod tests {
                     &RegisterDealer {
                         bte_key_with_proof: "bte_key_with_proof".to_string(),
                         announce_address: "127.0.0.1:8000".to_string(),
+                        resharing: false,
                     },
                     &vec![],
                 )
@@ -266,6 +273,7 @@ mod tests {
                 &RegisterDealer {
                     bte_key_with_proof: "bte_key_with_proof".to_string(),
                     announce_address: "127.0.0.1:8000".to_string(),
+                    resharing: false,
                 },
                 &vec![],
             )

contracts/coconut-dkg/src/dealers/transactions.rs

@@ -2,26 +2,33 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::dealers::storage as dealers_storage;
+use crate::epoch_state::storage::INITIAL_REPLACEMENT_DATA;
 use crate::epoch_state::utils::check_epoch_state;
 use crate::error::ContractError;
-use crate::state::{State, STATE};
+use crate::state::STATE;
 use coconut_dkg_common::types::{DealerDetails, EncodedBTEPublicKeyWithProof, EpochState};
 use cosmwasm_std::{Addr, DepsMut, MessageInfo, Response};
 
 // currently we only require that
 // a) it's part of the signer group
 // b) it isn't already a dealer
-fn verify_dealer(deps: DepsMut<'_>, state: &State, dealer: &Addr) -> Result<(), ContractError> {
+fn verify_dealer(deps: DepsMut<'_>, dealer: &Addr, resharing: bool) -> Result<(), ContractError> {
     if dealers_storage::current_dealers()
         .may_load(deps.storage, dealer)?
         .is_some()
     {
         return Err(ContractError::AlreadyADealer);
     }
+    let state = STATE.load(deps.storage)?;
 
+    let height = if resharing {
+        INITIAL_REPLACEMENT_DATA.load(deps.storage)?.initial_height
+    } else {
+        None
+    };
     state
         .group_addr
-        .is_voting_member(&deps.querier, dealer, None)?
+        .is_voting_member(&deps.querier, dealer, height)?
         .ok_or(ContractError::Unauthorized {})?;
 
     Ok(())
@@ -32,11 +39,11 @@ pub fn try_add_dealer(
     info: MessageInfo,
     bte_key_with_proof: EncodedBTEPublicKeyWithProof,
     announce_address: String,
+    resharing: bool,
 ) -> Result<Response, ContractError> {
-    check_epoch_state(deps.storage, EpochState::PublicKeySubmission)?;
-    let state = STATE.load(deps.storage)?;
+    check_epoch_state(deps.storage, EpochState::PublicKeySubmission { resharing })?;
 
-    verify_dealer(deps.branch(), &state, &info.sender)?;
+    verify_dealer(deps.branch(), &info.sender, resharing)?;
 
     // if it was already a dealer in the past, assign the same node index
     let node_index = if let Some(prior_details) =
@@ -69,10 +76,63 @@ pub fn try_add_dealer(
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
+    use crate::dealers::storage::current_dealers;
     use crate::epoch_state::transactions::advance_epoch_state;
+    use crate::support::tests::fixtures::dealer_details_fixture;
     use crate::support::tests::helpers;
-    use coconut_dkg_common::types::TimeConfiguration;
+    use crate::support::tests::helpers::GROUP_MEMBERS;
+    use coconut_dkg_common::types::{InitialReplacementData, TimeConfiguration};
     use cosmwasm_std::testing::{mock_env, mock_info};
+    use cw4::Member;
+    use rusty_fork::rusty_fork_test;
+
+    rusty_fork_test! {
+        #[test]
+        fn verification() {
+            let mut deps = helpers::init_contract();
+            let new_dealer = Addr::unchecked("new_dealer");
+            let details1 = dealer_details_fixture(1);
+            let details2 = dealer_details_fixture(2);
+            let details3 = dealer_details_fixture(3);
+            current_dealers()
+                .save(deps.as_mut().storage, &details1.address, &details1)
+                .unwrap();
+            let err = verify_dealer(deps.as_mut(), &details1.address, false).unwrap_err();
+            assert_eq!(err, ContractError::AlreadyADealer);
+
+            INITIAL_REPLACEMENT_DATA
+                .save(
+                    deps.as_mut().storage,
+                    &InitialReplacementData {
+                        initial_dealers: vec![details1.address, details2.address, details3.address],
+                        initial_height: Some(1),
+                    },
+                )
+                .unwrap();
+            let err = verify_dealer(deps.as_mut(), &new_dealer, false).unwrap_err();
+            assert_eq!(err, ContractError::Unauthorized);
+
+            GROUP_MEMBERS.lock().unwrap().push((
+                Member {
+                    addr: new_dealer.to_string(),
+                    weight: 10,
+                },
+                2,
+            ));
+            verify_dealer(deps.as_mut(), &new_dealer, false).unwrap();
+
+            let err = verify_dealer(deps.as_mut(), &new_dealer, true).unwrap_err();
+            assert_eq!(err, ContractError::Unauthorized);
+
+            INITIAL_REPLACEMENT_DATA
+                .update::<_, ContractError>(deps.as_mut().storage, |mut data| {
+                    data.initial_height = Some(2);
+                    Ok(data)
+                })
+                .unwrap();
+            verify_dealer(deps.as_mut(), &new_dealer, true).unwrap();
+        }
+    }
 
     #[test]
     fn invalid_state() {
@@ -94,12 +154,13 @@ pub(crate) mod tests {
             info.clone(),
             bte_key_with_proof.clone(),
             announce_address.clone(),
+            false,
         )
         .unwrap_err();
         assert_eq!(
             ret,
             ContractError::IncorrectEpochState {
-                current_state: EpochState::DealingExchange.to_string(),
+                current_state: EpochState::DealingExchange { resharing: false }.to_string(),
                 expected_state: EpochState::default().to_string(),
             }
         );

contracts/coconut-dkg/src/dealings/transactions.rs

@@ -3,6 +3,7 @@
 
 use crate::dealers::storage as dealers_storage;
 use crate::dealings::storage::DEALINGS_BYTES;
+use crate::epoch_state::storage::INITIAL_REPLACEMENT_DATA;
 use crate::epoch_state::utils::check_epoch_state;
 use crate::error::ContractError;
 use coconut_dkg_common::types::{ContractSafeBytes, EpochState};
@@ -12,8 +13,9 @@ pub fn try_commit_dealings(
     deps: DepsMut<'_>,
     info: MessageInfo,
     dealing_bytes: ContractSafeBytes,
+    resharing: bool,
 ) -> Result<Response, ContractError> {
-    check_epoch_state(deps.storage, EpochState::DealingExchange)?;
+    check_epoch_state(deps.storage, EpochState::DealingExchange { resharing })?;
     // ensure the sender is a dealer
     if dealers_storage::current_dealers()
         .may_load(deps.storage, &info.sender)?
@@ -21,6 +23,14 @@ pub fn try_commit_dealings(
     {
         return Err(ContractError::NotADealer);
     }
+    if resharing
+        && !INITIAL_REPLACEMENT_DATA
+            .load(deps.storage)?
+            .initial_dealers
+            .contains(&info.sender)
+    {
+        return Err(ContractError::NotAnInitialDealer);
+    }
 
     // check if this dealer has already committed to all dealings
     // (we don't want to allow overwriting anything)
@@ -39,29 +49,30 @@ pub fn try_commit_dealings(
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
+    use crate::epoch_state::storage::CURRENT_EPOCH;
     use crate::epoch_state::transactions::advance_epoch_state;
-    use crate::support::tests::fixtures::dealing_bytes_fixture;
+    use crate::support::tests::fixtures::{dealer_details_fixture, dealing_bytes_fixture};
     use crate::support::tests::helpers;
     use coconut_dkg_common::dealer::DealerDetails;
-    use coconut_dkg_common::types::TimeConfiguration;
+    use coconut_dkg_common::types::{InitialReplacementData, TimeConfiguration};
     use cosmwasm_std::testing::{mock_env, mock_info};
     use cosmwasm_std::Addr;
 
     #[test]
     fn invalid_commit_dealing() {
         let mut deps = helpers::init_contract();
-        let owner = Addr::unchecked("owner");
+        let owner = Addr::unchecked("owner1");
         let mut env = mock_env();
         let info = mock_info(owner.as_str(), &[]);
         let dealing_bytes = dealing_bytes_fixture();
 
-        let ret =
-            try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone()).unwrap_err();
+        let ret = try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone(), false)
+            .unwrap_err();
         assert_eq!(
             ret,
             ContractError::IncorrectEpochState {
                 current_state: EpochState::default().to_string(),
-                expected_state: EpochState::DealingExchange.to_string()
+                expected_state: EpochState::DealingExchange { resharing: false }.to_string()
             }
         );
 
@@ -71,8 +82,8 @@ pub(crate) mod tests {
             .plus_seconds(TimeConfiguration::default().public_key_submission_time_secs);
         advance_epoch_state(deps.as_mut(), env).unwrap();
 
-        let ret =
-            try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone()).unwrap_err();
+        let ret = try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone(), false)
+            .unwrap_err();
         assert_eq!(ret, ContractError::NotADealer);
 
         let dealer_details = DealerDetails {
@@ -85,14 +96,41 @@ pub(crate) mod tests {
             .save(deps.as_mut().storage, &owner, &dealer_details)
             .unwrap();
 
+        // assume we're in resharing mode
+        CURRENT_EPOCH
+            .update::<_, ContractError>(deps.as_mut().storage, |mut epoch| {
+                epoch.state = EpochState::DealingExchange { resharing: true };
+                Ok(epoch)
+            })
+            .unwrap();
+        INITIAL_REPLACEMENT_DATA
+            .save(
+                deps.as_mut().storage,
+                &InitialReplacementData {
+                    initial_dealers: vec![],
+                    initial_height: None,
+                },
+            )
+            .unwrap();
+        let ret = try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone(), true)
+            .unwrap_err();
+        assert_eq!(ret, ContractError::NotAnInitialDealer);
+
+        INITIAL_REPLACEMENT_DATA
+            .update::<_, ContractError>(deps.as_mut().storage, |mut data| {
+                data.initial_dealers = vec![dealer_details_fixture(1).address];
+                Ok(data)
+            })
+            .unwrap();
+
         for dealings in DEALINGS_BYTES {
             assert!(!dealings.has(deps.as_mut().storage, &owner));
-            let ret = try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone());
+            let ret = try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone(), true);
             assert!(ret.is_ok());
             assert!(dealings.has(deps.as_mut().storage, &owner));
         }
-        let ret =
-            try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone()).unwrap_err();
+        let ret = try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone(), true)
+            .unwrap_err();
         assert_eq!(
             ret,
             ContractError::AlreadyCommitted {

contracts/coconut-dkg/src/epoch_state/queries.rs

@@ -1,9 +1,9 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::epoch_state::storage::{CURRENT_EPOCH, THRESHOLD};
+use crate::epoch_state::storage::{CURRENT_EPOCH, INITIAL_REPLACEMENT_DATA, THRESHOLD};
 use crate::error::ContractError;
-use coconut_dkg_common::types::Epoch;
+use coconut_dkg_common::types::{Epoch, InitialReplacementData};
 use cosmwasm_std::Storage;
 
 pub(crate) fn query_current_epoch(storage: &dyn Storage) -> Result<Epoch, ContractError> {
@@ -18,6 +18,12 @@ pub(crate) fn query_current_epoch_threshold(
     Ok(THRESHOLD.may_load(storage)?)
 }
 
+pub(crate) fn query_initial_dealers(
+    storage: &dyn Storage,
+) -> Result<Option<InitialReplacementData>, ContractError> {
+    Ok(INITIAL_REPLACEMENT_DATA.may_load(storage)?)
+}
+
 #[cfg(test)]
 pub(crate) mod test {
     use super::*;
@@ -29,7 +35,10 @@ pub(crate) mod test {
     fn query_state() {
         let mut deps = init_contract();
         let epoch = query_current_epoch(deps.as_mut().storage).unwrap();
-        assert_eq!(epoch.state, EpochState::PublicKeySubmission);
+        assert_eq!(
+            epoch.state,
+            EpochState::PublicKeySubmission { resharing: false }
+        );
         assert_eq!(
             epoch.finish_timestamp,
             mock_env()

contracts/coconut-dkg/src/epoch_state/storage.rs

@@ -1,8 +1,10 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use coconut_dkg_common::types::Epoch;
+use coconut_dkg_common::types::{Epoch, InitialReplacementData};
 use cw_storage_plus::Item;
 
 pub(crate) const CURRENT_EPOCH: Item<'_, Epoch> = Item::new("current_epoch");
 pub const THRESHOLD: Item<u64> = Item::new("threshold");
+pub const INITIAL_REPLACEMENT_DATA: Item<InitialReplacementData> =
+    Item::new("initial_replacement_data");

contracts/coconut-dkg/src/epoch_state/transactions.rs

@@ -3,12 +3,12 @@
 
 use crate::dealers::storage::{current_dealers, past_dealers};
 use crate::dealings::storage::DEALINGS_BYTES;
-use crate::epoch_state::storage::{CURRENT_EPOCH, THRESHOLD};
+use crate::epoch_state::storage::{CURRENT_EPOCH, INITIAL_REPLACEMENT_DATA, THRESHOLD};
 use crate::epoch_state::utils::check_epoch_state;
 use crate::error::ContractError;
 use crate::state::STATE;
-use coconut_dkg_common::types::{Epoch, EpochState};
-use cosmwasm_std::{DepsMut, Env, Order, Response, Storage};
+use coconut_dkg_common::types::{Epoch, EpochState, InitialReplacementData};
+use cosmwasm_std::{Addr, Deps, DepsMut, Env, Order, Response, Storage};
 
 fn reset_epoch_state(storage: &mut dyn Storage) -> Result<(), ContractError> {
     THRESHOLD.remove(storage);
@@ -27,13 +27,13 @@ fn reset_epoch_state(storage: &mut dyn Storage) -> Result<(), ContractError> {
     Ok(())
 }
 
-fn dealers_still_active(deps: &DepsMut<'_>) -> Result<usize, ContractError> {
+fn dealers_still_active(
+    deps: &Deps<'_>,
+    dealers: impl Iterator<Item = Addr>,
+) -> Result<usize, ContractError> {
     let state = STATE.load(deps.storage)?;
     let mut still_active = 0;
-    for dealer_addr in current_dealers()
-        .keys(deps.storage, None, None, Order::Ascending)
-        .flatten()
-    {
+    for dealer_addr in dealers {
         if state
             .group_addr
             .is_voting_member(&deps.querier, &dealer_addr, None)?
@@ -45,6 +45,36 @@ fn dealers_still_active(deps: &DepsMut<'_>) -> Result<usize, ContractError> {
     Ok(still_active)
 }
 
+fn dealers_eq_members(deps: &DepsMut<'_>) -> Result<bool, ContractError> {
+    let dealers_still_active = dealers_still_active(
+        &deps.as_ref(),
+        current_dealers()
+            .keys(deps.storage, None, None, Order::Ascending)
+            .flatten(),
+    )?;
+    let all_dealers = current_dealers()
+        .keys(deps.storage, None, None, Order::Ascending)
+        .count();
+    let group_members = STATE
+        .load(deps.storage)?
+        .group_addr
+        .list_members(&deps.querier, None, None)?
+        .len();
+
+    Ok(dealers_still_active == all_dealers && all_dealers == group_members)
+}
+
+fn replacement_threshold_surpassed(deps: &DepsMut<'_>) -> Result<bool, ContractError> {
+    let threshold = THRESHOLD.load(deps.storage)? as usize;
+    let initial_dealers = INITIAL_REPLACEMENT_DATA.load(deps.storage)?.initial_dealers;
+    let initial_dealer_count = initial_dealers.len();
+    let replacement_threshold = threshold - (initial_dealers.len() + 2 - 1) / 2 + 1;
+    let removed_dealer_count =
+        initial_dealer_count - dealers_still_active(&deps.as_ref(), initial_dealers.into_iter())?;
+
+    Ok(removed_dealer_count >= replacement_threshold)
+}
+
 pub(crate) fn advance_epoch_state(deps: DepsMut<'_>, env: Env) -> Result<Response, ContractError> {
     let epoch = CURRENT_EPOCH.load(deps.storage)?;
     if epoch.finish_timestamp > env.block.time {
@@ -59,13 +89,20 @@ pub(crate) fn advance_epoch_state(deps: DepsMut<'_>, env: Env) -> Result<Respons
     let current_epoch = CURRENT_EPOCH.load(deps.storage)?;
     let next_epoch = if let Some(state) = current_epoch.state.next() {
         // We are during DKG process
-        if state == EpochState::DealingExchange {
-            let current_dealer_count = current_dealers()
+        if let EpochState::DealingExchange { resharing } = state {
+            let current_dealers = current_dealers()
                 .keys(deps.storage, None, None, Order::Ascending)
-                .count();
+                .collect::<Result<Vec<Addr>, _>>()?;
             // note: ceiling in integer division can be achieved via q = (x + y - 1) / y;
-            let threshold = (2 * current_dealer_count as u64 + 3 - 1) / 3;
+            let threshold = (2 * current_dealers.len() as u64 + 3 - 1) / 3;
             THRESHOLD.save(deps.storage, &threshold)?;
+            if !resharing {
+                let replacement_data = InitialReplacementData {
+                    initial_dealers: current_dealers,
+                    initial_height: None,
+                };
+                INITIAL_REPLACEMENT_DATA.save(deps.storage, &replacement_data)?;
+            }
         }
         Epoch::new(
             state,
@@ -73,14 +110,9 @@ pub(crate) fn advance_epoch_state(deps: DepsMut<'_>, env: Env) -> Result<Respons
             current_epoch.time_configuration,
             env.block.time,
         )
-    } else if dealers_still_active(&deps)?
-        == STATE
-            .load(deps.storage)?
-            .group_addr
-            .list_members(&deps.querier, None, None)?
-            .len()
-    {
+    } else if dealers_eq_members(&deps)? {
         // The dealer set hasn't changed, so we only extend the finish timestamp
+        // The epoch remains the same, as we use it as key for storing VKs
         Epoch::new(
             current_epoch.state,
             current_epoch.epoch_id,
@@ -88,10 +120,21 @@ pub(crate) fn advance_epoch_state(deps: DepsMut<'_>, env: Env) -> Result<Respons
             env.block.time,
         )
     } else {
-        // Dealer set changed, we need to redo DKG from scratch
+        // Dealer set changed, we need to redo DKG...
+        let state = if replacement_threshold_surpassed(&deps)? {
+            // ... in reset mode
+            EpochState::default()
+        } else {
+            // ... in reshare mode
+            INITIAL_REPLACEMENT_DATA.update::<_, ContractError>(deps.storage, |mut data| {
+                data.initial_height = Some(env.block.height);
+                Ok(data)
+            })?;
+            EpochState::PublicKeySubmission { resharing: true }
+        };
         reset_epoch_state(deps.storage)?;
         Epoch::new(
-            EpochState::default(),
+            state,
             current_epoch.epoch_id + 1,
             current_epoch.time_configuration,
             env.block.time,
@@ -109,7 +152,10 @@ pub(crate) fn try_surpassed_threshold(
     check_epoch_state(deps.storage, EpochState::InProgress)?;
 
     let threshold = THRESHOLD.load(deps.storage)?;
-    if dealers_still_active(&deps)? < threshold as usize {
+    let dealers = current_dealers()
+        .keys(deps.storage, None, None, Order::Ascending)
+        .flatten();
+    if dealers_still_active(&deps.as_ref(), dealers)? < threshold as usize {
         reset_epoch_state(deps.storage)?;
         CURRENT_EPOCH.update::<_, ContractError>(deps.storage, |epoch| {
             Ok(Epoch::new(
@@ -139,27 +185,137 @@ pub(crate) mod tests {
     use rusty_fork::rusty_fork_test;
 
     // Because of the global variable handling group, we need individual process for each test
+
     rusty_fork_test! {
+        // Using values from the DKG document
+        #[test]
+        fn threshold_surpassed() {
+            let mut deps = init_contract();
+            let two_thirds = |n: u64| (2 * n + 3 - 1) / 3;
+            let three_fourths = |n: u64| (3 * n + 4 - 1) / 4;
+            let ninty_pc = |n: u64| (9 * n + 10 - 2) / 10;
+            let mut limits = [3, 4, 5, 5, 7, 11, 10, 14, 21, 18, 26, 41].iter();
+
+            for n in [10, 25, 50, 100] {
+                let dealers: Vec<_> = (0..n).map(dealer_details_fixture).collect();
+                let initial_dealers = dealers.iter().map(|d| d.address.clone()).collect();
+                let data = InitialReplacementData {
+                    initial_dealers,
+                    initial_height: None,
+                };
+                for f in [two_thirds, three_fourths, ninty_pc] {
+                    let threshold = f(n);
+                    THRESHOLD.save(deps.as_mut().storage, &threshold).unwrap();
+                    INITIAL_REPLACEMENT_DATA
+                        .save(deps.as_mut().storage, &data)
+                        .unwrap();
+
+                    let limit = *limits.next().unwrap();
+                    {
+                        let mut group_members = GROUP_MEMBERS.lock().unwrap();
+                        for i in 0..n as usize {
+                            group_members.push((
+                                Member {
+                                    addr: dealers[i].address.to_string(),
+                                    weight: 10,
+                                },
+                                1,
+                            ));
+                        }
+                        for _ in 1..limit {
+                            group_members.pop();
+                        }
+                    }
+                    assert!(!replacement_threshold_surpassed(&deps.as_mut()).unwrap());
+                    GROUP_MEMBERS.lock().unwrap().pop();
+                    assert!(replacement_threshold_surpassed(&deps.as_mut()).unwrap());
+
+                    *GROUP_MEMBERS.lock().unwrap() = vec![];
+                }
+            }
+        }
+
+        #[test]
+        fn dealers_and_members() {
+            let mut deps = init_contract();
+
+            assert!(dealers_eq_members(&deps.as_mut()).unwrap());
+
+            let details = dealer_details_fixture(1);
+            let different_details = dealer_details_fixture(2);
+            current_dealers()
+                .save(deps.as_mut().storage, &details.address, &details)
+                .unwrap();
+            assert!(!dealers_eq_members(&deps.as_mut()).unwrap());
+
+            current_dealers()
+                .remove(deps.as_mut().storage, &details.address)
+                .unwrap();
+            GROUP_MEMBERS.lock().unwrap().push((
+                Member {
+                    addr: "owner1".to_string(),
+                    weight: 10,
+                },
+                1,
+            ));
+            assert!(!dealers_eq_members(&deps.as_mut()).unwrap());
+
+            current_dealers()
+                .save(
+                    deps.as_mut().storage,
+                    &different_details.address,
+                    &different_details,
+                )
+                .unwrap();
+            assert!(!dealers_eq_members(&deps.as_mut()).unwrap());
+
+            current_dealers()
+                .remove(deps.as_mut().storage, &different_details.address)
+                .unwrap();
+            current_dealers()
+                .save(deps.as_mut().storage, &details.address, &details)
+                .unwrap();
+            assert!(dealers_eq_members(&deps.as_mut()).unwrap());
+        }
+
         #[test]
         fn still_active() {
             let mut deps = init_contract();
             {
                 let mut group = GROUP_MEMBERS.lock().unwrap();
 
-                group.push(Member {
-                    addr: "owner1".to_string(),
-                    weight: 10,
-                });
-                group.push(Member {
-                    addr: "owner2".to_string(),
-                    weight: 10,
-                });
-                group.push(Member {
-                    addr: "owner3".to_string(),
-                    weight: 10,
-                });
+                group.push((
+                    Member {
+                        addr: "owner1".to_string(),
+                        weight: 10,
+                    },
+                    1,
+                ));
+                group.push((
+                    Member {
+                        addr: "owner2".to_string(),
+                        weight: 10,
+                    },
+                    1,
+                ));
+                group.push((
+                    Member {
+                        addr: "owner3".to_string(),
+                        weight: 10,
+                    },
+                    1,
+                ));
             }
-            assert_eq!(0, dealers_still_active(&deps.as_mut()).unwrap());
+            assert_eq!(
+                0,
+                dealers_still_active(
+                    &deps.as_ref(),
+                    current_dealers()
+                        .keys(&deps.storage, None, None, Order::Ascending)
+                        .flatten()
+                )
+                .unwrap()
+            );
             for i in 0..3 as u64 {
                 let details = dealer_details_fixture(i + 1);
                 current_dealers()
@@ -167,7 +323,13 @@ pub(crate) mod tests {
                     .unwrap();
                 assert_eq!(
                     i as usize + 1,
-                    dealers_still_active(&deps.as_mut()).unwrap()
+                    dealers_still_active(
+                        &deps.as_ref(),
+                        current_dealers()
+                            .keys(&deps.storage, None, None, Order::Ascending)
+                            .flatten()
+                    )
+                    .unwrap()
                 );
             }
         }
@@ -179,22 +341,41 @@ pub(crate) mod tests {
             {
                 let mut group = GROUP_MEMBERS.lock().unwrap();
 
-                group.push(Member {
-                    addr: "owner1".to_string(),
-                    weight: 10,
-                });
-                group.push(Member {
-                    addr: "owner2".to_string(),
-                    weight: 10,
-                });
-                group.push(Member {
-                    addr: "owner3".to_string(),
-                    weight: 10,
-                });
+                group.push((
+                    Member {
+                        addr: "owner1".to_string(),
+                        weight: 10,
+                    },
+                    1,
+                ));
+                group.push((
+                    Member {
+                        addr: "owner2".to_string(),
+                        weight: 10,
+                    },
+                    1,
+                ));
+                group.push((
+                    Member {
+                        addr: "owner3".to_string(),
+                        weight: 10,
+                    },
+                    1,
+                ));
+                group.push((
+                    Member {
+                        addr: "owner4".to_string(),
+                        weight: 10,
+                    },
+                    1,
+                ));
             }
 
             let epoch = CURRENT_EPOCH.load(deps.as_mut().storage).unwrap();
-            assert_eq!(epoch.state, EpochState::PublicKeySubmission);
+            assert_eq!(
+                epoch.state,
+                EpochState::PublicKeySubmission { resharing: false }
+            );
             assert_eq!(
                 epoch.finish_timestamp,
                 env.block
@@ -211,16 +392,37 @@ pub(crate) mod tests {
                 EarlyEpochStateAdvancement(1)
             );
 
+            // setup dealer details
+            let all_details: [_; 4] = std::array::from_fn(|i| dealer_details_fixture(i as u64 + 1));
+            for details in all_details.iter() {
+                current_dealers()
+                    .save(deps.as_mut().storage, &details.address, details)
+                    .unwrap();
+            }
+
+            assert!(INITIAL_REPLACEMENT_DATA
+                .may_load(&deps.storage)
+                .unwrap()
+                .is_none());
             env.block.time = env.block.time.plus_seconds(1);
             advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
             let epoch = CURRENT_EPOCH.load(deps.as_mut().storage).unwrap();
-            assert_eq!(epoch.state, EpochState::DealingExchange);
+            assert_eq!(
+                epoch.state,
+                EpochState::DealingExchange { resharing: false }
+            );
             assert_eq!(
                 epoch.finish_timestamp,
                 env.block
                     .time
                     .plus_seconds(epoch.time_configuration.dealing_exchange_time_secs)
             );
+            let replacement_data = INITIAL_REPLACEMENT_DATA.load(&deps.storage).unwrap();
+            let expected_replacement_data = InitialReplacementData {
+                initial_dealers: all_details.iter().map(|d| d.address.clone()).collect(),
+                initial_height: None,
+            };
+            assert_eq!(replacement_data, expected_replacement_data);
 
             env.block.time = env
                 .block
@@ -234,7 +436,10 @@ pub(crate) mod tests {
             env.block.time = env.block.time.plus_seconds(3);
             advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
             let epoch = CURRENT_EPOCH.load(deps.as_mut().storage).unwrap();
-            assert_eq!(epoch.state, EpochState::VerificationKeySubmission);
+            assert_eq!(
+                epoch.state,
+                EpochState::VerificationKeySubmission { resharing: false }
+            );
             assert_eq!(
                 epoch.finish_timestamp,
                 env.block.time.plus_seconds(
@@ -258,7 +463,10 @@ pub(crate) mod tests {
             env.block.time = env.block.time.plus_seconds(3);
             advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
             let epoch = CURRENT_EPOCH.load(deps.as_mut().storage).unwrap();
-            assert_eq!(epoch.state, EpochState::VerificationKeyValidation);
+            assert_eq!(
+                epoch.state,
+                EpochState::VerificationKeyValidation { resharing: false }
+            );
             assert_eq!(
                 epoch.finish_timestamp,
                 env.block.time.plus_seconds(
@@ -282,7 +490,10 @@ pub(crate) mod tests {
             env.block.time = env.block.time.plus_seconds(3);
             advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
             let epoch = CURRENT_EPOCH.load(deps.as_mut().storage).unwrap();
-            assert_eq!(epoch.state, EpochState::VerificationKeyFinalization);
+            assert_eq!(
+                epoch.state,
+                EpochState::VerificationKeyFinalization { resharing: false }
+            );
             assert_eq!(
                 epoch.finish_timestamp,
                 env.block.time.plus_seconds(
@@ -327,14 +538,6 @@ pub(crate) mod tests {
                 EarlyEpochStateAdvancement(50)
             );
 
-            // setup dealer details
-            let all_details: [_; 3] = std::array::from_fn(|i| dealer_details_fixture(i as u64 + 1));
-            for details in all_details.iter() {
-                current_dealers()
-                    .save(deps.as_mut().storage, &details.address, details)
-                    .unwrap();
-            }
-
             // Group hasn't changed, so we remain in the same epoch, with updated finish timestamp
             env.block.time = env.block.time.plus_seconds(100);
             let prev_epoch = CURRENT_EPOCH.load(deps.as_mut().storage).unwrap();
@@ -348,11 +551,14 @@ pub(crate) mod tests {
             );
             assert_eq!(curr_epoch, expected_epoch);
 
-            // Group changed, slightly, so reset dkg state
-            *GROUP_MEMBERS.lock().unwrap().first_mut().unwrap() = Member {
-                addr: "owner4".to_string(),
-                weight: 10,
-            };
+            // Group changed slightly, so re-run dkg in reshare mode
+            *GROUP_MEMBERS.lock().unwrap().first_mut().unwrap() = (
+                Member {
+                    addr: "owner5".to_string(),
+                    weight: 10,
+                },
+                1,
+            );
             env.block.time = env
                 .block
                 .time
@@ -361,7 +567,49 @@ pub(crate) mod tests {
             advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
             let curr_epoch = CURRENT_EPOCH.load(deps.as_mut().storage).unwrap();
             let expected_epoch = Epoch::new(
-                EpochState::default(),
+                EpochState::PublicKeySubmission { resharing: true },
+                prev_epoch.epoch_id + 1,
+                prev_epoch.time_configuration,
+                env.block.time,
+            );
+            assert_eq!(curr_epoch, expected_epoch);
+            assert!(THRESHOLD.may_load(&deps.storage).unwrap().is_none());
+
+            let all_details: [_; 2] = std::array::from_fn(|i| dealer_details_fixture(i as u64 + 2));
+            for details in all_details.iter() {
+                past_dealers().remove(deps.as_mut().storage, &details.address).unwrap();
+                current_dealers()
+                    .save(deps.as_mut().storage, &details.address, details)
+                    .unwrap();
+            }
+            for times in [
+                epoch.time_configuration.public_key_submission_time_secs,
+                epoch.time_configuration.dealing_exchange_time_secs,
+                epoch.time_configuration.verification_key_submission_time_secs,
+                epoch.time_configuration.verification_key_validation_time_secs,
+                epoch.time_configuration.verification_key_finalization_time_secs,
+            ] {
+                env.block.time = env.block.time.plus_seconds(times);
+                advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
+            }
+
+            // Group changed even more, surpassing threshold, so re-run dkg in reset mode
+            *GROUP_MEMBERS.lock().unwrap().last_mut().unwrap() = (
+                Member {
+                    addr: "owner6".to_string(),
+                    weight: 10,
+                },
+                1,
+            );
+            env.block.time = env
+                .block
+                .time
+                .plus_seconds(epoch.time_configuration.in_progress_time_secs);
+            let prev_epoch = CURRENT_EPOCH.load(deps.as_mut().storage).unwrap();
+            advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
+            let curr_epoch = CURRENT_EPOCH.load(deps.as_mut().storage).unwrap();
+            let expected_epoch = Epoch::new(
+                EpochState::PublicKeySubmission { resharing: false },
                 prev_epoch.epoch_id + 1,
                 prev_epoch.time_configuration,
                 env.block.time,
@@ -370,89 +618,103 @@ pub(crate) mod tests {
             assert!(THRESHOLD.may_load(&deps.storage).unwrap().is_none());
         }
 
+        #[test]
+        fn surpass_threshold() {
+            let mut deps = init_contract();
+            let mut env = mock_env();
+            let time_configuration = TimeConfiguration::default();
+            {
+                let mut group = GROUP_MEMBERS.lock().unwrap();
 
-    #[test]
-    fn surpass_threshold() {
-        let mut deps = init_contract();
-        let mut env = mock_env();
-        let time_configuration = TimeConfiguration::default();
-        {
-            let mut group = GROUP_MEMBERS.lock().unwrap();
-
-            group.push(Member {
-                addr: "owner1".to_string(),
-                weight: 10,
-            });
-            group.push(Member {
-                addr: "owner2".to_string(),
-                weight: 10,
-            });
-            group.push(Member {
-                addr: "owner3".to_string(),
-                weight: 10,
-            });
-        }
-
-        let ret = try_surpassed_threshold(deps.as_mut(), env.clone()).unwrap_err();
-        assert_eq!(
-            ret,
-            ContractError::IncorrectEpochState {
-                current_state: EpochState::default().to_string(),
-                expected_state: EpochState::InProgress.to_string()
+                group.push((
+                    Member {
+                        addr: "owner1".to_string(),
+                        weight: 10,
+                    },
+                    1,
+                ));
+                group.push((
+                    Member {
+                        addr: "owner2".to_string(),
+                        weight: 10,
+                    },
+                    1,
+                ));
+                group.push((
+                    Member {
+                        addr: "owner3".to_string(),
+                        weight: 10,
+                    },
+                    1,
+                ));
             }
-        );
 
-        let all_details: [_; 3] = std::array::from_fn(|i| dealer_details_fixture(i as u64 + 1));
-        for details in all_details.iter() {
-            current_dealers()
-                .save(deps.as_mut().storage, &details.address, details)
-                .unwrap();
+            let ret = try_surpassed_threshold(deps.as_mut(), env.clone()).unwrap_err();
+            assert_eq!(
+                ret,
+                ContractError::IncorrectEpochState {
+                    current_state: EpochState::default().to_string(),
+                    expected_state: EpochState::InProgress.to_string()
+                }
+            );
+
+            let all_details: [_; 3] = std::array::from_fn(|i| dealer_details_fixture(i as u64 + 1));
+            for details in all_details.iter() {
+                current_dealers()
+                    .save(deps.as_mut().storage, &details.address, details)
+                    .unwrap();
+            }
+
+            for times in [
+                time_configuration.public_key_submission_time_secs,
+                time_configuration.dealing_exchange_time_secs,
+                time_configuration.verification_key_submission_time_secs,
+                time_configuration.verification_key_validation_time_secs,
+                time_configuration.verification_key_finalization_time_secs,
+            ] {
+                env.block.time = env.block.time.plus_seconds(times);
+                advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
+            }
+            let curr_epoch = CURRENT_EPOCH.load(&deps.storage).unwrap();
+            assert_eq!(THRESHOLD.load(&deps.storage).unwrap(), 2);
+
+            // epoch hasn't advanced as we are still in the threshold range
+            try_surpassed_threshold(deps.as_mut(), env.clone()).unwrap();
+            assert_eq!(THRESHOLD.load(&deps.storage).unwrap(), 2);
+            assert_eq!(CURRENT_EPOCH.load(&deps.storage).unwrap(), curr_epoch);
+
+            *GROUP_MEMBERS.lock().unwrap().first_mut().unwrap() = (
+                Member {
+                    addr: "owner4".to_string(),
+                    weight: 10,
+                },
+                1,
+            );
+            // epoch hasn't advanced as we are still in the threshold range
+            try_surpassed_threshold(deps.as_mut(), env.clone()).unwrap();
+            assert_eq!(THRESHOLD.load(&deps.storage).unwrap(), 2);
+            assert_eq!(CURRENT_EPOCH.load(&deps.storage).unwrap(), curr_epoch);
+
+            *GROUP_MEMBERS.lock().unwrap().last_mut().unwrap() = (
+                Member {
+                    addr: "owner5".to_string(),
+                    weight: 10,
+                },
+                1,
+            );
+            try_surpassed_threshold(deps.as_mut(), env.clone()).unwrap();
+            assert!(THRESHOLD.may_load(&deps.storage).unwrap().is_none());
+            let next_epoch = CURRENT_EPOCH.load(&deps.storage).unwrap();
+            assert_eq!(
+                next_epoch,
+                Epoch::new(
+                    EpochState::default(),
+                    curr_epoch.epoch_id + 1,
+                    curr_epoch.time_configuration,
+                    env.block.time,
+                )
+            );
         }
-
-        for times in [
-            time_configuration.public_key_submission_time_secs,
-            time_configuration.dealing_exchange_time_secs,
-            time_configuration.verification_key_submission_time_secs,
-            time_configuration.verification_key_validation_time_secs,
-            time_configuration.verification_key_finalization_time_secs,
-        ] {
-            env.block.time = env.block.time.plus_seconds(times);
-            advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
-        }
-        let curr_epoch = CURRENT_EPOCH.load(&deps.storage).unwrap();
-        assert_eq!(THRESHOLD.load(&deps.storage).unwrap(), 2);
-
-        // epoch hasn't advanced as we are still in the threshold range
-        try_surpassed_threshold(deps.as_mut(), env.clone()).unwrap();
-        assert_eq!(THRESHOLD.load(&deps.storage).unwrap(), 2);
-        assert_eq!(CURRENT_EPOCH.load(&deps.storage).unwrap(), curr_epoch);
-
-        *GROUP_MEMBERS.lock().unwrap().first_mut().unwrap() = Member {
-            addr: "owner4".to_string(),
-            weight: 10,
-        };
-        // epoch hasn't advanced as we are still in the threshold range
-        try_surpassed_threshold(deps.as_mut(), env.clone()).unwrap();
-        assert_eq!(THRESHOLD.load(&deps.storage).unwrap(), 2);
-        assert_eq!(CURRENT_EPOCH.load(&deps.storage).unwrap(), curr_epoch);
-
-        *GROUP_MEMBERS.lock().unwrap().last_mut().unwrap() = Member {
-            addr: "owner5".to_string(),
-            weight: 10,
-        };
-        try_surpassed_threshold(deps.as_mut(), env.clone()).unwrap();
-        assert!(THRESHOLD.may_load(&deps.storage).unwrap().is_none());
-        let next_epoch = CURRENT_EPOCH.load(&deps.storage).unwrap();
-        assert_eq!(
-            next_epoch,
-            Epoch::new(
-                EpochState::default(),
-                curr_epoch.epoch_id + 1,
-                curr_epoch.time_configuration,
-                env.block.time,
-            )
-        );
-    }
     }
 
     #[test]

contracts/coconut-dkg/src/error.rs

@@ -40,6 +40,9 @@ pub enum ContractError {
     #[error("This sender is not a dealer for the current epoch")]
     NotADealer,
 
+    #[error("This sender is not a dealer for the current resharing epoch")]
+    NotAnInitialDealer,
+
     #[error("This dealer has already committed {commitment}")]
     AlreadyCommitted { commitment: String },
 

contracts/coconut-dkg/src/support/tests/helpers.rs

@@ -19,7 +19,7 @@ pub const GROUP_CONTRACT: &str = "group contract address";
 pub const MULTISIG_CONTRACT: &str = "multisig contract address";
 
 lazy_static! {
-    pub static ref GROUP_MEMBERS: Mutex<Vec<Member>> = Mutex::new(vec![]);
+    pub static ref GROUP_MEMBERS: Mutex<Vec<(Member, u64)>> = Mutex::new(vec![]);
 }
 
 fn querier_handler(query: &WasmQuery) -> QuerierResult {
@@ -29,9 +29,14 @@ fn querier_handler(query: &WasmQuery) -> QuerierResult {
                 panic!("Not supported");
             }
             match from_binary(msg) {
-                Ok(Cw4QueryMsg::Member { addr, .. }) => {
-                    let weight = GROUP_MEMBERS.lock().unwrap().iter().find_map(|m| {
+                Ok(Cw4QueryMsg::Member { addr, at_height }) => {
+                    let weight = GROUP_MEMBERS.lock().unwrap().iter().find_map(|(m, h)| {
                         if m.addr == addr {
+                            if let Some(height) = at_height {
+                                if height != *h {
+                                    return None;
+                                }
+                            }
                             Some(m.weight)
                         } else {
                             None
@@ -40,7 +45,12 @@ fn querier_handler(query: &WasmQuery) -> QuerierResult {
                     to_binary(&MemberResponse { weight }).unwrap()
                 }
                 Ok(Cw4QueryMsg::ListMembers { .. }) => {
-                    let members = GROUP_MEMBERS.lock().unwrap().to_vec();
+                    let members = GROUP_MEMBERS
+                        .lock()
+                        .unwrap()
+                        .iter()
+                        .map(|m| m.0.clone())
+                        .collect();
                     to_binary(&MemberListResponse { members }).unwrap()
                 }
                 _ => panic!("Not supported"),

contracts/coconut-dkg/src/verification_key_shares/transactions.rs

@@ -17,8 +17,12 @@ pub fn try_commit_verification_key_share(
     env: Env,
     info: MessageInfo,
     share: VerificationKeyShare,
+    resharing: bool,
 ) -> Result<Response, ContractError> {
-    check_epoch_state(deps.storage, EpochState::VerificationKeySubmission)?;
+    check_epoch_state(
+        deps.storage,
+        EpochState::VerificationKeySubmission { resharing },
+    )?;
     // ensure the sender is a dealer
     let details = dealers_storage::current_dealers()
         .load(deps.storage, &info.sender)
@@ -45,6 +49,7 @@ pub fn try_commit_verification_key_share(
 
     let msg = to_cosmos_msg(
         info.sender,
+        resharing,
         env.contract.address.to_string(),
         STATE.load(deps.storage)?.multisig_addr.to_string(),
         env.block
@@ -59,8 +64,12 @@ pub fn try_verify_verification_key_share(
     deps: DepsMut<'_>,
     info: MessageInfo,
     owner: Addr,
+    resharing: bool,
 ) -> Result<Response, ContractError> {
-    check_epoch_state(deps.storage, EpochState::VerificationKeyFinalization)?;
+    check_epoch_state(
+        deps.storage,
+        EpochState::VerificationKeyFinalization { resharing },
+    )?;
     let epoch_id = CURRENT_EPOCH.load(deps.storage)?.epoch_id;
     MULTISIG.assert_admin(deps.as_ref(), &info.sender)?;
     vk_shares().update(deps.storage, (&owner, epoch_id), |vk_share| {
@@ -117,8 +126,14 @@ mod tests {
             .save(deps.as_mut().storage, &dealer, &dealer_details)
             .unwrap();
 
-        try_commit_verification_key_share(deps.as_mut(), env.clone(), info.clone(), share.clone())
-            .unwrap();
+        try_commit_verification_key_share(
+            deps.as_mut(),
+            env.clone(),
+            info.clone(),
+            share.clone(),
+            false,
+        )
+        .unwrap();
         let vk_share = vk_shares().load(&deps.storage, (&info.sender, 0)).unwrap();
         assert_eq!(
             vk_share,
@@ -145,13 +160,15 @@ mod tests {
             env.clone(),
             info.clone(),
             share.clone(),
+            false,
         )
         .unwrap_err();
         assert_eq!(
             ret,
             ContractError::IncorrectEpochState {
                 current_state: EpochState::default().to_string(),
-                expected_state: EpochState::VerificationKeySubmission.to_string()
+                expected_state: EpochState::VerificationKeySubmission { resharing: false }
+                    .to_string()
             }
         );
         env.block.time = env
@@ -169,6 +186,7 @@ mod tests {
             env.clone(),
             info.clone(),
             share.clone(),
+            false,
         )
         .unwrap_err();
         assert_eq!(ret, ContractError::NotADealer);
@@ -184,14 +202,21 @@ mod tests {
             .save(deps.as_mut().storage, &dealer, &dealer_details)
             .unwrap();
 
-        try_commit_verification_key_share(deps.as_mut(), env.clone(), info.clone(), share.clone())
-            .unwrap();
+        try_commit_verification_key_share(
+            deps.as_mut(),
+            env.clone(),
+            info.clone(),
+            share.clone(),
+            false,
+        )
+        .unwrap();
 
         let ret = try_commit_verification_key_share(
             deps.as_mut(),
             env.clone(),
             info.clone(),
             share.clone(),
+            false,
         )
         .unwrap_err();
         assert_eq!(
@@ -210,13 +235,15 @@ mod tests {
         let owner = Addr::unchecked("owner");
         let multisig_info = mock_info(MULTISIG_CONTRACT, &[]);
 
-        let ret = try_verify_verification_key_share(deps.as_mut(), info.clone(), owner.clone())
-            .unwrap_err();
+        let ret =
+            try_verify_verification_key_share(deps.as_mut(), info.clone(), owner.clone(), false)
+                .unwrap_err();
         assert_eq!(
             ret,
             ContractError::IncorrectEpochState {
                 current_state: EpochState::default().to_string(),
-                expected_state: EpochState::VerificationKeyFinalization.to_string()
+                expected_state: EpochState::VerificationKeyFinalization { resharing: false }
+                    .to_string()
             }
         );
 
@@ -241,12 +268,13 @@ mod tests {
             .plus_seconds(TimeConfiguration::default().verification_key_validation_time_secs);
         advance_epoch_state(deps.as_mut(), env).unwrap();
 
-        let ret =
-            try_verify_verification_key_share(deps.as_mut(), info, owner.clone()).unwrap_err();
+        let ret = try_verify_verification_key_share(deps.as_mut(), info, owner.clone(), false)
+            .unwrap_err();
         assert_eq!(ret, ContractError::Admin(AdminError::NotAdmin {}));
 
-        let ret = try_verify_verification_key_share(deps.as_mut(), multisig_info, owner.clone())
-            .unwrap_err();
+        let ret =
+            try_verify_verification_key_share(deps.as_mut(), multisig_info, owner.clone(), false)
+                .unwrap_err();
         assert_eq!(
             ret,
             ContractError::NoCommitForOwner {
@@ -284,8 +312,14 @@ mod tests {
         dealers_storage::current_dealers()
             .save(deps.as_mut().storage, &owner, &dealer_details)
             .unwrap();
-        try_commit_verification_key_share(deps.as_mut(), env.clone(), info.clone(), share.clone())
-            .unwrap();
+        try_commit_verification_key_share(
+            deps.as_mut(),
+            env.clone(),
+            info.clone(),
+            share.clone(),
+            false,
+        )
+        .unwrap();
 
         env.block.time = env
             .block
@@ -298,6 +332,7 @@ mod tests {
             .plus_seconds(TimeConfiguration::default().verification_key_validation_time_secs);
         advance_epoch_state(deps.as_mut(), env).unwrap();
 
-        try_verify_verification_key_share(deps.as_mut(), multisig_info, owner.clone()).unwrap();
+        try_verify_verification_key_share(deps.as_mut(), multisig_info, owner.clone(), false)
+            .unwrap();
     }
 }

contracts/coconut-test/src/helpers.rs

@@ -2,8 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use cosmwasm_std::{entry_point, Addr, Coin, DepsMut, Empty, Env, Response};
-use cw3_flex_multisig::{state::CONFIG, ContractError};
+use cw3_flex_multisig::state::CONFIG;
 use cw_multi_test::{App, AppBuilder, Contract, ContractWrapper};
+use multisig_contract_common::error::ContractError;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 

contracts/coconut-test/src/submit_vk_creates_proposal.rs

@@ -103,6 +103,7 @@ fn dkg_proposal() {
         &RegisterDealer {
             bte_key_with_proof: "bte_key_with_proof".to_string(),
             announce_address: "127.0.0.1:8000".to_string(),
+            resharing: false,
         },
         &vec![],
     )
@@ -124,6 +125,7 @@ fn dkg_proposal() {
 
     let msg = CommitVerificationKeyShare {
         share: "share".to_string(),
+        resharing: false,
     };
     let res = app
         .execute_contract(

contracts/multisig/cw3-flex-multisig/Cargo.toml

@@ -26,7 +26,6 @@ cw-storage-plus = { version = "0.13.4" }
 cosmwasm-std = { version = "1.0.0" }
 schemars = "0.8.1"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0.23" }
 
 group-contract-common = { path = "../../../common/cosmwasm-smart-contracts/group-contract" }
 multisig-contract-common = { path= "../../../common/cosmwasm-smart-contracts/multisig-contract" }

contracts/multisig/cw3-flex-multisig/src/contract.rs

@@ -17,8 +17,8 @@ use cw4::{Cw4Contract, MemberChangedHookMsg, MemberDiff};
 use cw_storage_plus::Bound;
 use cw_utils::{maybe_addr, Expiration, ThresholdResponse};
 
-use crate::error::ContractError;
 use crate::state::{Config, CONFIG};
+use multisig_contract_common::error::ContractError;
 use multisig_contract_common::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
 
 // version info for migration info

contracts/multisig/cw3-flex-multisig/src/lib.rs

@@ -1,5 +1,2 @@
 pub mod contract;
-pub mod error;
 pub mod state;
-
-pub use crate::error::ContractError;

envs/qa-qwerty.env

@@ -12,10 +12,10 @@ DENOMS_EXPONENT=6
 MIXNET_CONTRACT_ADDRESS=n14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sjyvg3g
 VESTING_CONTRACT_ADDRESS=n1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrq73f2nw
 BANDWIDTH_CLAIM_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
-COCONUT_BANDWIDTH_CONTRACT_ADDRESS=n12ckdkm3q7eytefs7rwu4ue3t9hxgvl9v08jddmtwgct2ve0pv50q0t8dlt
-GROUP_CONTRACT_ADDRESS=n1rw8fw2mpcpzzq3jpa4e52ufawnmj5a4u68p35umvgskewuw0nlzsaa5w4m
-MULTISIG_CONTRACT_ADDRESS=n14krxe8ukzagwhvec0rmteexu62w8k9kp9sra9ww6em2hnmzcukqsa0utc8
-COCONUT_DKG_CONTRACT_ADDRESS=n1rl5n6cxuz2hdy3f7d9hsnw8zn0zwwwr0r4dxfz7tktgpgkcnz9zshmvksc
+COCONUT_BANDWIDTH_CONTRACT_ADDRESS=n19d2nwj7fdhxqmyvgy8lf3ad49a6vmww4shryhrkj2mqk36att66s6xzszw
+GROUP_CONTRACT_ADDRESS=n1fqquzw4mk0pkamgr2ywt2v7h2j9nuyjjn4gvpy8zlpp6xn0uyuzqfm28l5
+MULTISIG_CONTRACT_ADDRESS=n1gaq3666chd5348apj8cka8t2mckv7azp9espyr7wgpxyuzur5d0sazpysy
+COCONUT_DKG_CONTRACT_ADDRESS=n18yadscxw8v35dds7ksv3j0svmjh3h6e7tmxpadk96mvgz27zygkshuf4vs
 REWARDING_VALIDATOR_ADDRESS=n10yyd98e2tuwu0f7ypz9dy3hhjw7v772q6287gy
 STATISTICS_SERVICE_DOMAIN_ADDRESS="https://mainnet-stats.nymte.ch:8090"
 NYXD="https://qwerty-validator.qa.nymte.ch/"