initial validator API-networking related things

adapted from DKG impl

.github/workflows/build-ts-packages.yml

@@ -13,9 +13,9 @@ jobs:
     - name: Install rsync
       run: sudo apt-get install rsync
     - uses: rlespinasse/github-slug-action@v3.x
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v2
       with:
-        node-version: 16
+        node-version: '16'
     - name: Setup yarn
       run: npm install -g yarn
     - name: Build

.github/workflows/build.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    runs-on: [ self-hosted, custom-linux ]
+    runs-on: [ self-hosted, custom-linux-exoscale ]
     # Enable sccache via environment variable
     env:
       RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache
@@ -41,13 +41,6 @@ jobs:
           command: test
           args: --workspace --all-features
 
-      - name: Run expensive tests
-        if: github.ref == 'refs/heads/develop' || github.event.pull_request.base.ref == 'develop' || github.event.pull_request.base.ref == 'master'
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --workspace --all-features -- --ignored
-
       - name: Check formatting
         uses: actions-rs/cargo@v1
         with:

.github/workflows/build_on_dispatch.yml

@@ -4,7 +4,7 @@ on: workflow_dispatch
 
 jobs:
   build:
-    runs-on: [ self-hosted, custom-linux ]
+    runs-on: [ self-hosted, custom-linux-exoscale ]
     # Enable sccache via environment variable
     env:
       RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache

.github/workflows/connect.yml

@@ -1,56 +0,0 @@
-name: Nym Connect (rust)
-
-on:
-  push:
-    paths-ignore:
-      - 'explorer/**'
-
-jobs:
-  build:
-    runs-on: [ self-hosted, custom-linux ]
-    env:
-      RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache
-    steps:
-      - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools libayatana-appindicator3-dev
-
-      - name: Check out repository code
-        uses: actions/checkout@v2
-
-      - name: Install rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-          components: rustfmt, clippy
-
-      - name: Build all binaries
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --manifest-path nym-connect/Cargo.toml --workspace
-
-      - name: Run all tests
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --manifest-path nym-connect/Cargo.toml --workspace
-
-      - name: Check formatting
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --manifest-path nym-connect/Cargo.toml --all -- --check
-
-      - uses: actions-rs/clippy-check@v1
-        name: Clippy checks
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --manifest-path nym-connect/Cargo.toml --workspace --all-features
-
-      - name: Run clippy
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --manifest-path nym-connect/Cargo.toml --workspace --all-features -- -D warnings

.github/workflows/network-explorer-lint.yml

@@ -14,9 +14,9 @@ jobs:
     runs-on: custom-runner-linux
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v2
         with:
-          node-version: 16
+          node-version: '16'
       - name: Setup yarn
         run: npm install -g yarn
       - name: Run ESLint

.github/workflows/network-explorer.yml

@@ -17,9 +17,9 @@ jobs:
     - name: Install rsync
       run: sudo apt-get install rsync
     - uses: rlespinasse/github-slug-action@v3.x
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v2
       with:
-        node-version: 16
+        node-version: '16'
     - name: Setup yarn
       run: npm install -g yarn
       continue-on-error: true

.github/workflows/nightly_build.yml

@@ -50,19 +50,6 @@ jobs:
           command: test
           args: --workspace
 
-      - 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 expensive tests
-        if: github.ref == 'refs/heads/develop' || github.event.pull_request.base.ref == 'develop' || github.event.pull_request.base.ref == 'master'
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --workspace --all-features -- --ignored
-
       - name: Check formatting
         uses: actions-rs/cargo@v1
         with:
@@ -88,9 +75,9 @@ jobs:
           command: clippy
           args: --workspace --all-targets -- -D warnings
 
-      - name: Reclaim some disk space
+      - name: Reclaim some disk space (because Windows is being annoying)
         uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'windows-latest' }}
         with:
           command: clean
 

.github/workflows/nym-connect.yml

@@ -1,59 +0,0 @@
-name: CI for nym-connect
-
-on:
-  push:
-    paths:
-      - 'nym-connect/**'
-
-defaults:
-  run:
-    working-directory: nym-connect
-
-jobs:
-  build:
-    runs-on: custom-runner-linux
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install rsync
-      run: sudo apt-get install rsync
-    - uses: rlespinasse/github-slug-action@v3.x
-    - uses: actions/setup-node@v3
-      with:
-        node-version: 16
-    - name: Install Yarn
-      run: npm install -g yarn
-    - run: yarn
-      continue-on-error: true
-    - name: Set environment from the example
-      run: cp .env.sample .env
-    - run: yarn storybook:build
-    - name: Deploy branch to CI www
-      continue-on-error: true
-      uses: easingthemes/ssh-deploy@main
-      env:
-        SSH_PRIVATE_KEY: ${{ secrets.CI_WWW_SSH_PRIVATE_KEY }}
-        ARGS: "-rltgoDzvO --delete"
-        SOURCE: "nym-connect/storybook-static/"
-        REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
-        REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
-        TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/nym-connect-${{ env.GITHUB_REF_SLUG }}
-        EXCLUDE: "/dist/, /node_modules/"
-    - name: Keybase - Node Install
-      run: npm install
-      working-directory: .github/workflows/support-files
-#    - name: Keybase - Send Notification
-#      env:
-#        NYM_NOTIFICATION_KIND: nym-connect
-#        NYM_PROJECT_NAME: "nym-connect"
-#        NYM_CI_WWW_BASE: "${{ secrets.NYM_CI_WWW_BASE }}"
-#        NYM_CI_WWW_LOCATION: "nym-connect-${{ env.GITHUB_REF_SLUG }}"
-#        GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
-#        GIT_BRANCH: "${GITHUB_REF##*/}"
-#        KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
-#        KEYBASE_NYMBOT_PAPERKEY: "${{ secrets.KEYBASE_NYMBOT_PAPERKEY }}"
-#        KEYBASE_NYMBOT_TEAM: "${{ secrets.KEYBASE_NYMBOT_TEAM }}"
-#        KEYBASE_NYM_CHANNEL: "ci-nym-connect"
-#        IS_SUCCESS: "${{ job.status == 'success' }}"
-#      uses: docker://keybaseio/client:stable-node
-#      with:
-#        args: .github/workflows/support-files/notifications/entry_point.sh

.github/workflows/nym-wallet-publish-macos.yml

@@ -1,6 +1,5 @@
 name: Publish Nym Wallet (MacOS)
 on:
-  workflow_dispatch:
   release:
     types: [created]
 
@@ -20,16 +19,16 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Check the release tag starts with `nym-wallet-`
-        if: startsWith(github.ref, 'refs/tags/nym-wallet-') == false && github.event_name != 'workflow_dispatch'
+        if: startsWith(github.ref, 'refs/tags/nym-wallet-') == false
         uses: actions/github-script@v3
         with:
           script: |
             core.setFailed('Release tag did not start with nym-wallet-...')
 
       - name: Node v16
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v1
         with:
-          node-version: 16
+          node-version: 16.x
       - name: Install Rust stable
         uses: actions-rs/toolchain@v1
         with:
@@ -56,12 +55,6 @@ jobs:
           security import $CERTIFICATE_PATH -P "$APPLE_CERTIFICATE_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
           security list-keychain -d user -s $KEYCHAIN_PATH
 
-      - name: Create env file
-        uses: timheuer/base64-to-file@v1.1
-        with:
-          fileName: '.env'
-          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
-
       - name: Install app dependencies and build it
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -75,22 +68,14 @@ jobs:
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
         run: yarn && yarn build
 
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+      - name: Upload to release based on tag name
+        uses: softprops/action-gh-release@v1
         with:
-          name: nym-wallet.app.tar.gz
-          path: nym-wallet/target/release/bundle/macos/nym-wallet.app.tar.gz
-          retention-days: 5
+          files: |
+            nym-wallet/target/release/bundle/dmg/*.dmg
+            nym-wallet/target/release/bundle/macos/*.app.tar.gz*
 
       - name: Clean up keychain
         if: ${{ always() }}
         run: |
           security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
-
-      - name: Upload to release based on tag name
-        uses: softprops/action-gh-release@v1
-        if: github.event_name == 'release'
-        with:
-          files: |
-            nym-wallet/target/release/bundle/dmg/*.dmg
-            nym-wallet/target/release/bundle/macos/*.app.tar.gz*

.github/workflows/nym-wallet-publish-ubuntu.yml

@@ -30,21 +30,15 @@ jobs:
             core.setFailed('Release tag did not start with nym-wallet-...')
 
       - name: Node v16
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v1
         with:
-          node-version: 16
+          node-version: 16.x
       - name: Install Rust stable
         uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
       - name: Install app dependencies
         run: yarn
-      - name: Create env file
-        uses: timheuer/base64-to-file@v1.1
-        with:
-          fileName: '.env'
-          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
-
       - name: Build app
         run: yarn build
         env:

.github/workflows/nym-wallet-publish-windows10.yml

@@ -45,21 +45,15 @@ jobs:
           Import-PfxCertificate -FilePath certificate/certificate.pfx -CertStoreLocation Cert:\CurrentUser\My -Password (ConvertTo-SecureString -String $env:WINDOWS_CERTIFICATE_PASSWORD -Force -AsPlainText)
 
       - name: Node v16
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v1
         with:
-          node-version: 16
+          node-version: 16.x
 
       - name: Install Rust stable
         uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
 
-      - name: Create env file
-        uses: timheuer/base64-to-file@v1.1
-        with:
-          fileName: '.env'
-          encodedString: ${{ secrets.WALLET_ADMIN_ADDRESS }}
-
       - name: Install app dependencies
         run: yarn
 

.github/workflows/nym-wallet-release.yml

@@ -1,32 +0,0 @@
-name: Release Nym Wallet
-on:
-  workflow_dispatch:
-    inputs:
-      nym_wallet_version:
-        description: 'The version of the Nym Wallet to release'
-        default: '1.0.x'
-        required: true
-        type: string
-jobs:
-  create-release:
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [ubuntu-latest]
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - uses: actions/checkout@v2
-      - name: Create release
-        uses: softprops/action-gh-release@v1
-        with:
-          body: >-
-            This is a pre-release
-            
-            Download the wallet for your platform:
-            
-              - [Linux](https://github.com/nymtech/nym/releases/download/nym-wallet-v${{ inputs.nym_wallet_version}}/nym-wallet_v${{ inputs.nym_wallet_version}}_amd64_ubuntu20.04.AppImage)
-              - [MacOS](https://github.com/nymtech/nym/releases/download/nym-wallet-v${{ inputs.nym_wallet_version}}/nym-wallet_v${{ inputs.nym_wallet_version}}_x64_macos_11.dmg)
-              - [Windows](https://github.com/nymtech/nym/releases/download/nym-wallet-v${{ inputs.nym_wallet_version}}/nym-wallet_v${{ inputs.nym_wallet_version}}_x64_windows.msi)
-          prerelease: true
-          name: Nym Wallet v${{ inputs.nym_wallet_version}}
-          tag_name: nym-wallet-v${{ inputs.nym_wallet_version}}

.github/workflows/nym-wallet-storybook.yml

@@ -13,9 +13,9 @@ jobs:
     - name: Install rsync
       run: sudo apt-get install rsync
     - uses: rlespinasse/github-slug-action@v3.x
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v2
       with:
-        node-version: 16
+        node-version: '16'
     - name: Setup yarn
       run: npm install -g yarn
     - name: Build dependencies

.github/workflows/nym_wallet.yml

@@ -34,9 +34,9 @@ jobs:
           toolchain: stable
 
       - name: Node v16
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v1
         with:
-          node-version: 16
+          node-version: 16.x
 
       - name: Install yarn for building application
         run: yarn install

.github/workflows/support-files/notifications/send_message.js

@@ -3,7 +3,7 @@ require('dotenv').config();
 const Bot = require('keybase-bot');
 
 let context = {
-  kinds: ['nym-wallet', 'ts-packages', 'network-explorer', 'nightly', 'nym-connect'],
+  kinds: ['nym-wallet', 'ts-packages', 'network-explorer', 'nightly'],
 };
 
 /**

.github/workflows/support-files/nym-connect/index.js

@@ -1,29 +0,0 @@
-const Handlebars = require('handlebars');
-const fs = require('fs');
-const path = require('path');
-
-async function addToContextAndValidate(context) {
-  if (!context.env.NYM_CI_WWW_LOCATION) {
-    throw new Error('Please ensure the env var NYM_CI_WWW_LOCATION is set');
-  }
-  if (!context.env.NYM_CI_WWW_BASE) {
-    throw new Error('Please ensure the env var NYM_CI_WWW_BASE is set');
-  }
-}
-
-async function getMessageBody(context) {
-  const source = fs
-    .readFileSync(
-      context.env.IS_SUCCESS === 'true'
-        ? path.resolve(__dirname, 'templates', 'success')
-        : path.resolve(__dirname, 'templates', 'failure'),
-    )
-    .toString();
-  const template = Handlebars.compile(source);
-  return template(context);
-}
-
-module.exports = {
-  addToContextAndValidate,
-  getMessageBody,
-};

.github/workflows/support-files/nym-connect/templates/failure

@@ -1,11 +0,0 @@
-🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥
-> :rocket: {{ env.NYM_PROJECT_NAME }}
-> 🔴 **FAILURE** :cry:
-> `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }}
-> `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }}
-> `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }}
-
-Commit message:
-```
-{{ env.GIT_COMMIT_MESSAGE }}
-```

.github/workflows/support-files/nym-connect/templates/success

@@ -1,11 +0,0 @@
-🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩
-> :rocket: {{ env.NYM_PROJECT_NAME }}  ➡️➡️➡️➡️➡️ **View storybook:** https://{{ env.NYM_CI_WWW_LOCATION }}.{{ env.NYM_CI_WWW_BASE }}/
-> ✅ **SUCCESS**
-> `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }}
-> `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }}
-> `build ` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }}
-
-Commit message by `{{ env.GITHUB_ACTOR }}` at {{ timestamp }}:
-```
-{{ env.GIT_COMMIT_MESSAGE }}
-```

.github/workflows/wallet.yml

@@ -10,9 +10,7 @@ on:
 
 jobs:
   build:
-    runs-on: [ self-hosted, custom-linux ]
-    env:
-      RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache
+    runs-on: [ self-hosted, custom-linux-exoscale ]
     steps:
       - name: Install Dependencies (Linux)
         run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools

CHANGELOG.md

@@ -1,100 +1,34 @@
 # Changelog
 
-Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
 ## [Unreleased]
 
 ### Added
 
-- socks5 client/websocket client: add `--force-register-gateway` flag, useful when rerunning init ([#1353])
-- nym-connect: initial proof-of-concept of a UI around the socks5 client was added
-- all: added network compilation target to `--help` (or `--version`) commands ([#1256]).
-- explorer-api: learned how to sum the delegations by owner in a new endpoint.
-- gateway: Added gateway coconut verifications and validator-api communication for double spending protection ([#1261])
-- mixnet-contract: Added ClaimOperatorReward and ClaimDelegatorReward messages ([#1292])
+- wallet: require password to switch accounts
+- wallet: add simple CLI tool for decrypting and recovering the wallet file.
+- wallet: added support for multiple accounts ([#1265])
+- wallet: the wallet backend learned how to keep track of validator name, either hardcoded or by querying the status endpoint.
 - mixnet-contract: Replace all naked `-` with `saturating_sub`.
-- mixnet-contract: Added staking_supply field to ContractStateParams.
-- mixnet-contract: Added a query to get MixnodeBond by identity key ([#1369]).
-- mixnet-contract: Added a query to get GatewayBond by identity key ([#1369]).
-- network-explorer-ui: Upgrade to React Router 6
-- rewarding: replace circulating supply with staking supply in reward calculations ([#1324])
-- validator-api: add `estimated_node_profit` and `estimated_operator_cost` to `reward-estimate` endpoint ([#1284])
-- validator-api: add detailed mixnode bond endpoints, and explorer-api makes use of that data to append stake saturation
 - validator-api: add Swagger to document the REST API ([#1249]).
-- validator-api: Added new endpoints for coconut spending flow and communications with coconut & multisig contracts ([#1261])
-- vesting-contract: Added ClaimOperatorReward and ClaimDelegatorReward messages ([#1292])
-- network-statistics: a new mixnet service that aggregates and exposes anonymized data about mixnet services ([#1328])
-- mixnode: Added basic mixnode hardware reporting to the HTTP API ([#1308]).
+- all: added network compilation target to `--help` (or `--version`) commands ([#1256]).
+- network-requester: send traffic statistics from all network requesters and receive it in a special network-requester that aggregates the data and exposes it via a rest API ([#1267], [#1278]).
 
 ### Fixed
 
-- mixnet-contract: `estimated_delegator_reward` calculation ([#1284])
-- mixnet-contract: delegator and operator rewards use lambda and sigma instead of lambda_ticked and sigma_ticked ([#1284])
-- mixnet-contract: removed `expect` in `query_delegator_reward` and queries containing invalid proxy address should now return a more human-readable error ([#1257])
-- mixnet-contract: replaced integer division with fixed for performance calculations ([#1284])
-- mixnet-contract: Under certain circumstances nodes could not be unbonded ([#1255](https://github.com/nymtech/nym/issues/1255)) ([#1258])
-- mixnet-contract: Using correct staking supply when distributing rewards. ([#1373])
-- mixnode, gateway: attempting to determine reconnection backoff to persistently failing mixnode could result in a crash ([#1260])
-- mixnode: the mixnode learned how to shutdown gracefully
-- native & socks5 clients: fail early when clients try to re-init with a different gateway, which is not supported yet ([#1322])
-- native & socks5 clients: rerun init will now reuse previous gateway configuration instead of failing ([#1353])
-- validator: fixed local docker-compose setup to work on Apple M1 ([#1329])
 - vesting-contract: replaced `checked_sub` with `saturating_sub` to fix the underflow in `get_vesting_tokens` ([#1275])
+- mixnet-contract: removed `expect` in `query_delegator_reward` and queries containing invalid proxy address should now return a more human-readable error ([#1257])
+- mixnet-contract: Under certain circumstances nodes could not be unbonded ([#1255](https://github.com/nymtech/nym/issues/1255)) ([#1258])
+- mixnode, gateway: attempting to determine reconnection backoff to persistently failing mixnode could result in a crash ([#1260])
 
-### Changed
-
-- validator-client: created internal `Coin` type that replaces coins from `cosmrs` and `cosmwasm` for API entrypoints [[#1295]]
-- all: updated all `cosmwasm`-related dependencies to `1.0.0` and `cw-storage-plus` to `0.13.4` [[#1318]]
-- all: updated `rocket` to `0.5.0-rc.2`.
-- network-requester: allow to voluntarily store and send statistical data about the number of bytes the proxied server serves ([#1328])
-- gateway: allow to voluntarily send statistical data about the number of active inboxes served by a gateway ([#1376])
-
+[#1258]: https://github.com/nymtech/nym/pull/1258
 [#1249]: https://github.com/nymtech/nym/pull/1249
 [#1256]: https://github.com/nymtech/nym/pull/1256
 [#1257]: https://github.com/nymtech/nym/pull/1257
-[#1258]: https://github.com/nymtech/nym/pull/1258
 [#1260]: https://github.com/nymtech/nym/pull/1260
-[#1261]: https://github.com/nymtech/nym/pull/1261
+[#1265]: https://github.com/nymtech/nym/pull/1265
 [#1267]: https://github.com/nymtech/nym/pull/1267
 [#1275]: https://github.com/nymtech/nym/pull/1275
 [#1278]: https://github.com/nymtech/nym/pull/1278
-[#1284]: https://github.com/nymtech/nym/pull/1284
-[#1292]: https://github.com/nymtech/nym/pull/1292
-[#1295]: https://github.com/nymtech/nym/pull/1295
-[#1302]: https://github.com/nymtech/nym/pull/1302
-[#1308]: https://github.com/nymtech/nym/pull/1308
-[#1318]: https://github.com/nymtech/nym/pull/1318
-[#1322]: https://github.com/nymtech/nym/pull/1322
-[#1324]: https://github.com/nymtech/nym/pull/1324
-[#1328]: https://github.com/nymtech/nym/pull/1328
-[#1329]: https://github.com/nymtech/nym/pull/1329
-[#1353]: https://github.com/nymtech/nym/pull/1353
-[#1369]: https://github.com/nymtech/nym/pull/1369
-[#1373]: https://github.com/nymtech/nym/pull/1373
-[#1376]: https://github.com/nymtech/nym/pull/1376
-
-## [nym-wallet-v1.0.6](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.6) (2022-06-21)
-
-- wallet: undelegating now uses either the mixnet or vesting contract, or both, depending on how delegations were made
-- wallet: redeeming and compounding now uses both the mixnet and vesting contract
-- wallet: the wallet backend learned how to archive wallet files
-- wallet: add ENABLE_QA_MODE environment variable to enable QA mode on built wallet
-
-## [nym-wallet-v1.0.5](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.5) (2022-06-14)
-
-- wallet: add simple CLI tool for decrypting and recovering the wallet file.
-- wallet: added support for multiple accounts ([#1265])
-- wallet: compound and claim reward endpoints for operators and delegators ([#1302])
-- wallet: require password to switch accounts
-- wallet: the wallet backend learned how to keep track of validator name, either hardcoded or by querying the status endpoint.
-- wallet: new delegation and rewards UI
-- wallet: show version in nav bar
-- wallet: contract admin route put back
-- wallet: staking_supply field to StateParams
-- wallet: show transaction hash for redeeming or compounding rewards
-
-[#1265]: https://github.com/nymtech/nym/pull/1265
-[#1302]: https://github.com/nymtech/nym/pull/1302
 
 ## [nym-wallet-v1.0.4](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.4) (2022-05-04)
 

Cargo.toml

@@ -31,12 +31,10 @@ members = [
     "common/credentials",
     "common/crypto",
     "common/crypto/dkg",
-    "common/execute",
     "common/bandwidth-claim-contract",
     "common/cosmwasm-smart-contracts/coconut-bandwidth-contract",
     "common/cosmwasm-smart-contracts/contracts-common",
     "common/cosmwasm-smart-contracts/mixnet-contract",
-    "common/cosmwasm-smart-contracts/multisig-contract",
     "common/cosmwasm-smart-contracts/vesting-contract",
     "common/mixnode-common",
     "common/network-defaults",
@@ -53,22 +51,17 @@ members = [
     "common/nymsphinx/params",
     "common/nymsphinx/types",
     "common/pemstore",
-    "common/statistics",
     "common/socks5/proxy-helpers",
     "common/socks5/requests",
-    "common/task",
     "common/topology",
-    "common/types",
     "common/wasm-utils",
     "explorer-api",
     "gateway",
     "gateway/gateway-requests",
     "mixnode",
     "service-providers/network-requester",
-    "service-providers/network-statistics",
     "validator-api",
     "validator-api/validator-api-requests",
-    "tools/ts-rs-cli"
 ]
 
 default-members = [
@@ -81,4 +74,4 @@ default-members = [
     "explorer-api",
 ]
 
-exclude = ["explorer", "contracts", "tokenomics-py", "clients/webassembly", "nym-wallet"]
+exclude = ["explorer", "contracts", "tokenomics-py", "clients/webassembly"]

Makefile

@@ -1,13 +1,11 @@
-test-all: test cargo-test-expensive
 test: build clippy-all cargo-test wasm fmt
 no-clippy: build cargo-test wasm fmt
 happy: fmt clippy-happy test
-clippy-all: clippy-all-main clippy-all-contracts clippy-all-wallet clippy-all-connect
-clippy-happy: clippy-happy-main clippy-happy-contracts clippy-happy-wallet clippy-happy-connect
-cargo-test: test-main test-contracts test-wallet test-connect
-cargo-test-expensive: test-main-expensive test-contracts-expensive test-wallet-expensive test-connect-expensive
-build: build-contracts build-wallet build-main build-connect
-fmt: fmt-main fmt-contracts fmt-wallet fmt-connect
+clippy-all: clippy-all-main clippy-all-contracts clippy-all-wallet
+clippy-happy: clippy-happy-main clippy-happy-contracts clippy-happy-wallet
+cargo-test: test-main test-contracts test-wallet
+build: build-contracts build-wallet build-main
+fmt: fmt-main fmt-contracts fmt-wallet
 
 clippy-happy-main:
 	cargo clippy
@@ -18,9 +16,6 @@ clippy-happy-contracts:
 clippy-happy-wallet:
 	cargo clippy --manifest-path nym-wallet/Cargo.toml
 
-clippy-happy-connect:
-	cargo clippy --manifest-path nym-connect/Cargo.toml
-
 clippy-all-main:
 	cargo clippy --workspace --all-features -- -D warnings
 
@@ -30,33 +25,15 @@ clippy-all-contracts:
 clippy-all-wallet:
 	cargo clippy --workspace --manifest-path nym-wallet/Cargo.toml --all-features -- -D warnings
 
-clippy-all-connect:
-	cargo clippy --workspace --manifest-path nym-connect/Cargo.toml --all-features -- -D warnings
-
 test-main:
 	cargo test --all-features --workspace
 
-test-main-expensive:
-	cargo test --all-features --workspace -- --ignored
-
 test-contracts:
 	cargo test --manifest-path contracts/Cargo.toml --all-features
 
-test-contracts-expensive:
-	cargo test --manifest-path contracts/Cargo.toml --all-features -- --ignored
-
 test-wallet:
 	cargo test --manifest-path nym-wallet/Cargo.toml --all-features
 
-test-wallet-expensive:
-	cargo test --manifest-path nym-wallet/Cargo.toml --all-features -- --ignored
-
-test-connect:
-	cargo test --manifest-path nym-connect/Cargo.toml --all-features
-
-test-connect-expensive:
-	cargo test --manifest-path nym-connect/Cargo.toml --all-features -- --ignored
-
 build-main:
 	cargo build --workspace
 
@@ -66,9 +43,6 @@ build-contracts:
 build-wallet:
 	cargo build --manifest-path nym-wallet/Cargo.toml --workspace
 
-build-connect:
-	cargo build --manifest-path nym-connect/Cargo.toml --workspace
-
 fmt-main:
 	cargo fmt --all
 
@@ -78,12 +52,5 @@ fmt-contracts:
 fmt-wallet:
 	cargo fmt --manifest-path nym-wallet/Cargo.toml --all
 
-fmt-connect:
-	cargo fmt --manifest-path nym-connect/Cargo.toml --all
-
 wasm:
 	RUSTFLAGS='-C link-arg=-s' cargo build --manifest-path contracts/Cargo.toml --release --target wasm32-unknown-unknown
-
-generate-typescript:
-	cd tools/ts-rs-cli && cargo run && cd ../..
-	yarn types:lint:fix

assets/fonts/non-variable/README.md

@@ -1,8 +0,0 @@
-Update fonts by doing the following:
-
-1. Go to https://fonts.google.com/specimen/Open+Sans
-2. Add all the styles you want and select `@import`
-3. Copy the url (e.g. curl https://fonts.googleapis.com/css2\?family\=Open+Sans:ital,wght@0,300\;0,400\;0,500\;0,600\;0,700\;0,800\;1,300\;1,400\;1,500\;1,600\;1,700\;1,800\&display\=swap)
-4. Run `curl curl https://fonts.googleapis.com/css2\?family\=Open+Sans:ital,wght@0,300\;0,400\;0,500\;0,600\;0,700\;0,800\;1,300\;1,400\;1,500\;1,600\;1,700\;1,800\&display\=swap`
-5. Use the response as the CSS import directives and download the font files for each font weight
-6. Remember to delete any old font files

assets/fonts/non-variable/fonts.css

@@ -1,96 +0,0 @@
-@font-face {
-    font-family: 'Open Sans';
-    font-style: italic;
-    font-weight: 300;
-    font-stretch: normal;
-    font-display: swap;
-    src: url(./memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk5hkaVc.ttf) format('truetype');
-}
-@font-face {
-    font-family: 'Open Sans';
-    font-style: italic;
-    font-weight: 400;
-    font-stretch: normal;
-    font-display: swap;
-    src: url(./memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk8ZkaVc.ttf) format('truetype');
-}
-@font-face {
-    font-family: 'Open Sans';
-    font-style: italic;
-    font-weight: 500;
-    font-stretch: normal;
-    font-display: swap;
-    src: url(./memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk_RkaVc.ttf) format('truetype');
-}
-@font-face {
-    font-family: 'Open Sans';
-    font-style: italic;
-    font-weight: 600;
-    font-stretch: normal;
-    font-display: swap;
-    src: url(./memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkxhjaVc.ttf) format('truetype');
-}
-@font-face {
-    font-family: 'Open Sans';
-    font-style: italic;
-    font-weight: 700;
-    font-stretch: normal;
-    font-display: swap;
-    src: url(./memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkyFjaVc.ttf) format('truetype');
-}
-@font-face {
-    font-family: 'Open Sans';
-    font-style: italic;
-    font-weight: 800;
-    font-stretch: normal;
-    font-display: swap;
-    src: url(./memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk0ZjaVc.ttf) format('truetype');
-}
-@font-face {
-    font-family: 'Open Sans';
-    font-style: normal;
-    font-weight: 300;
-    font-stretch: normal;
-    font-display: swap;
-    src: url(./memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsiH0C4n.ttf) format('truetype');
-}
-@font-face {
-    font-family: 'Open Sans';
-    font-style: normal;
-    font-weight: 400;
-    font-stretch: normal;
-    font-display: swap;
-    src: url(./memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjZ0C4n.ttf) format('truetype');
-}
-@font-face {
-    font-family: 'Open Sans';
-    font-style: normal;
-    font-weight: 500;
-    font-stretch: normal;
-    font-display: swap;
-    src: url(./memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjr0C4n.ttf) format('truetype');
-}
-@font-face {
-    font-family: 'Open Sans';
-    font-style: normal;
-    font-weight: 600;
-    font-stretch: normal;
-    font-display: swap;
-    src: url(./memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsgH1y4n.ttf) format('truetype');
-}
-@font-face {
-    font-family: 'Open Sans';
-    font-style: normal;
-    font-weight: 700;
-    font-stretch: normal;
-    font-display: swap;
-    src: url(./memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsg-1y4n.ttf) format('truetype');
-}
-@font-face {
-    font-family: 'Open Sans';
-    font-style: normal;
-    font-weight: 800;
-    font-stretch: normal;
-    font-display: swap;
-    src: url(./memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgshZ1y4n.ttf) format('truetype');
-}

assets/token/token-dark-testnet.svg

@@ -1,7 +0,0 @@
-<svg viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M171.7,30.3001 C132.7,-8.7999 69.3001,-8.7999 30.3001,30.3001 C-8.7999,69.4001 -8.7999,132.7 30.3001,171.7 C69.4001,210.8 132.7,210.8 171.7,171.7 C210.8,132.7 210.8,69.3001 171.7,30.3001 Z M163.1,163.1 C128.8,197.4 73.1001,197.4 38.8001,163.1 C4.5001,128.8 4.5001,73.1001 38.8001,38.8001 C73.1001,4.5001 128.8,4.5001 163.1,38.8001 C197.5,73.2001 197.5,128.8 163.1,163.1 Z" id="Shape" fill="#fff"></path>
-    <path d="M163.1,38.9 C128.8,4.60005 73.1002,4.60005 38.8002,38.9 C4.50019,73.2 4.50019,128.9 38.8002,163.2 C73.1002,197.5 128.8,197.5 163.1,163.2 C197.5,128.8 197.5,73.2 163.1,38.9 Z" id="Shape" fill="#000"></path>
-    <g id="T" transform="translate(25, 25) scale(5,5)">
-        <path d="M18.4804688,24 C19.203125,24 19.7182617,23.8608398 20.0258789,23.5825195 C20.3334961,23.3041992 20.4873047,22.9453125 20.4873047,22.5058594 C20.4873047,22.0566406 20.3334961,21.6928711 20.0258789,21.4145508 C19.7182617,21.1362305 19.203125,20.9970703 18.4804688,20.9970703 L18.4804688,20.9970703 L16.4589844,20.9970703 L16.4589844,9.24902344 L19.7548828,9.24902344 L19.7548828,12.0908203 C19.7548828,12.8134766 19.894043,13.3286133 20.1723633,13.6362305 C20.4506836,13.9438477 20.8095703,14.0976562 21.2490234,14.0976562 C21.6982422,14.0976562 22.0620117,13.9438477 22.340332,13.6362305 C22.6186523,13.3286133 22.7578125,12.8134766 22.7578125,12.0908203 L22.7578125,12.0908203 L22.7578125,6.24609375 L7.20117188,6.23144531 L7.20117188,12.0908203 C7.20117188,12.8134766 7.34033203,13.3286133 7.61865234,13.6362305 C7.89697266,13.9438477 8.25585938,14.0976562 8.6953125,14.0976562 C9.14453125,14.0976562 9.50830078,13.9438477 9.78662109,13.6362305 C10.0649414,13.3286133 10.2041016,12.8134766 10.2041016,12.0908203 L10.2041016,12.0908203 L10.2041016,9.24902344 L13.4560547,9.24902344 L13.4560547,20.9970703 L11.4492188,20.9970703 C10.7265625,20.9970703 10.2114258,21.1362305 9.90380859,21.4145508 C9.59619141,21.6928711 9.44238281,22.0517578 9.44238281,22.4912109 C9.44238281,22.9404297 9.59619141,23.3041992 9.90380859,23.5825195 C10.2114258,23.8608398 10.7265625,24 11.4492188,24 L11.4492188,24 L18.4804688,24 Z" id="T" fill="#fff"></path>
-    </g>
-</svg>

assets/token/token-dark.svg

@@ -1,4 +1,4 @@
-<svg viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path d="M170.7 29.3001C131.7 -9.7999 68.3001 -9.7999 29.3001 29.3001C-9.7999 68.4001 -9.7999 131.7 29.3001 170.7C68.4001 209.8 131.7 209.8 170.7 170.7C209.8 131.7 209.8 68.3001 170.7 29.3001ZM162.1 162.1C127.8 196.4 72.1001 196.4 37.8001 162.1C3.5001 127.8 3.5001 72.1001 37.8001 37.8001C72.1001 3.5001 127.8 3.5001 162.1 37.8001C196.5 72.2001 196.5 127.8 162.1 162.1Z" fill="white"/>
     <path d="M162.1 37.9C127.8 3.60005 72.1002 3.60005 37.8002 37.9C3.50019 72.2 3.50019 127.9 37.8002 162.2C72.1002 196.5 127.8 196.5 162.1 162.2C196.5 127.8 196.5 72.2 162.1 37.9ZM63.0002 170.7C56.8002 167.4 51.1002 163.2 46.1002 158.4V41.7C51.3002 36.7 57.2002 32.5 63.6002 29.1L137 140.9V29.3C143.2 32.6 148.9 36.8 153.9 41.6V158.3C148.7 163.3 142.8 167.5 136.4 170.9L63.0002 59.1V170.7Z" fill="#070B15"/>
     <path d="M154 158.3V41.7C148.9 36.9 143.2 32.7 137.1 29.4V140.9L63.5 29C57.1 32.4 51.2 36.6 46 41.6V158.3C51.1 163.1 56.8 167.3 62.9 170.6V59.1L136.5 171C142.9 167.6 148.8 163.3 154 158.3Z" fill="white"/>

assets/token/token-light-testnet.svg

@@ -1,7 +0,0 @@
-<svg viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M171.7,30.3001 C132.7,-8.7999 69.3001,-8.7999 30.3001,30.3001 C-8.7999,69.4001 -8.7999,132.7 30.3001,171.7 C69.4001,210.8 132.7,210.8 171.7,171.7 C210.8,132.7 210.8,69.3001 171.7,30.3001 Z M163.1,163.1 C128.8,197.4 73.1001,197.4 38.8001,163.1 C4.5001,128.8 4.5001,73.1001 38.8001,38.8001 C73.1001,4.5001 128.8,4.5001 163.1,38.8001 C197.5,73.2001 197.5,128.8 163.1,163.1 Z" id="Shape" fill="#141521"></path>
-    <path d="M163.1,38.9 C128.8,4.60005 73.1002,4.60005 38.8002,38.9 C4.50019,73.2 4.50019,128.9 38.8002,163.2 C73.1002,197.5 128.8,197.5 163.1,163.2 C197.5,128.8 197.5,73.2 163.1,38.9 Z" id="Shape" fill="#FFFFFF"></path>
-    <g id="T" transform="translate(25, 25) scale(5,5)">
-        <path d="M18.4804688,24 C19.203125,24 19.7182617,23.8608398 20.0258789,23.5825195 C20.3334961,23.3041992 20.4873047,22.9453125 20.4873047,22.5058594 C20.4873047,22.0566406 20.3334961,21.6928711 20.0258789,21.4145508 C19.7182617,21.1362305 19.203125,20.9970703 18.4804688,20.9970703 L18.4804688,20.9970703 L16.4589844,20.9970703 L16.4589844,9.24902344 L19.7548828,9.24902344 L19.7548828,12.0908203 C19.7548828,12.8134766 19.894043,13.3286133 20.1723633,13.6362305 C20.4506836,13.9438477 20.8095703,14.0976562 21.2490234,14.0976562 C21.6982422,14.0976562 22.0620117,13.9438477 22.340332,13.6362305 C22.6186523,13.3286133 22.7578125,12.8134766 22.7578125,12.0908203 L22.7578125,12.0908203 L22.7578125,6.24609375 L7.20117188,6.23144531 L7.20117188,12.0908203 C7.20117188,12.8134766 7.34033203,13.3286133 7.61865234,13.6362305 C7.89697266,13.9438477 8.25585938,14.0976562 8.6953125,14.0976562 C9.14453125,14.0976562 9.50830078,13.9438477 9.78662109,13.6362305 C10.0649414,13.3286133 10.2041016,12.8134766 10.2041016,12.0908203 L10.2041016,12.0908203 L10.2041016,9.24902344 L13.4560547,9.24902344 L13.4560547,20.9970703 L11.4492188,20.9970703 C10.7265625,20.9970703 10.2114258,21.1362305 9.90380859,21.4145508 C9.59619141,21.6928711 9.44238281,22.0517578 9.44238281,22.4912109 C9.44238281,22.9404297 9.59619141,23.3041992 9.90380859,23.5825195 C10.2114258,23.8608398 10.7265625,24 11.4492188,24 L11.4492188,24 L18.4804688,24 Z" id="T" fill="#000" fill-rule="nonzero"></path>
-    </g>
-</svg>

assets/token/token-light.svg

@@ -1,4 +1,4 @@
-<svg viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path d="M170.7 29.3001C131.7 -9.7999 68.3001 -9.7999 29.3001 29.3001C-9.7999 68.4001 -9.7999 131.7 29.3001 170.7C68.4001 209.8 131.7 209.8 170.7 170.7C209.8 131.7 209.8 68.3001 170.7 29.3001ZM162.1 162.1C127.8 196.4 72.1001 196.4 37.8001 162.1C3.5001 127.8 3.5001 72.1001 37.8001 37.8001C72.1001 3.5001 127.8 3.5001 162.1 37.8001C196.5 72.2001 196.5 127.8 162.1 162.1Z" fill="#141521"/>
     <path d="M162.1 37.9C127.8 3.60005 72.1002 3.60005 37.8002 37.9C3.50019 72.2 3.50019 127.9 37.8002 162.2C72.1002 196.5 127.8 196.5 162.1 162.2C196.5 127.8 196.5 72.2 162.1 37.9ZM63.0002 170.7C56.8002 167.4 51.1002 163.2 46.1002 158.4V41.7C51.3002 36.7 57.2002 32.5 63.6002 29.1L137 140.9V29.3C143.2 32.6 148.9 36.8 153.9 41.6V158.3C148.7 163.3 142.8 167.5 136.4 170.9L63.0002 59.1V170.7Z" fill="white"/>
     <path d="M154 158.3V41.7C148.9 36.9 143.2 32.7 137.1 29.4V140.9L63.5 29C57.1 32.4 51.2 36.6 46 41.6V158.3C51.1 163.1 56.8 167.3 62.9 170.6V59.1L136.5 171C142.9 167.6 148.8 163.3 154 158.3Z" fill="#141521"/>

clients/client-core/Cargo.toml

@@ -14,7 +14,7 @@ log = "0.4"
 rand = { version = "0.7.3", features = ["wasm-bindgen"] }
 serde = { version = "1.0", features = ["derive"] }
 sled = "0.34"
-tokio = { version = "1.19.1", features = ["macros"] }
+tokio = { version = "1.4", features = ["macros"] }
 url = { version ="2.2", features = ["serde"] }
 
 # internal
@@ -32,4 +32,4 @@ validator-client = { path = "../../common/client-libs/validator-client" }
 tempfile = "3.1.0"
 
 [features]
-coconut = ["gateway-client/coconut", "gateway-requests/coconut"]
+coconut = ["gateway-client/coconut", "gateway-requests/coconut"]

clients/client-core/src/client/real_messages_control/acknowledgement_control/action_controller.rs

@@ -6,7 +6,7 @@ use crate::client::real_messages_control::acknowledgement_control::Retransmissio
 use futures::channel::mpsc::{self, UnboundedReceiver, UnboundedSender};
 use futures::StreamExt;
 use log::*;
-use nonexhaustive_delayqueue::{Expired, NonExhaustiveDelayQueue, QueueKey};
+use nonexhaustive_delayqueue::{Expired, NonExhaustiveDelayQueue, QueueKey, TimerError};
 use nymsphinx::chunking::fragment::FragmentIdentifier;
 use nymsphinx::Delay as SphinxDelay;
 use std::collections::HashMap;
@@ -209,11 +209,16 @@ impl ActionController {
     }
 
     // note: when the entry expires it's automatically removed from pending_acks_timers
-    fn handle_expired_ack_timer(&mut self, expired_ack: Expired<FragmentIdentifier>) {
+    fn handle_expired_ack_timer(
+        &mut self,
+        expired_ack: Result<Expired<FragmentIdentifier>, TimerError>,
+    ) {
         // I'm honestly not sure how to handle it, because getting it means other things in our
         // system are already misbehaving. If we ever see this panic, then I guess we should worry
         // about it. Perhaps just reschedule it at later point?
-        let frag_id = expired_ack.into_inner();
+        let frag_id = expired_ack
+            .expect("Tokio timer returned an error!")
+            .into_inner();
 
         trace!("{} has expired", frag_id);
 

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

@@ -114,8 +114,12 @@ impl<T: NymConfig> Config<T> {
         self.client.disabled_credentials_mode = disabled_credentials_mode;
     }
 
-    pub fn with_gateway_endpoint(&mut self, gateway_endpoint: GatewayEndpoint) {
-        self.client.gateway_endpoint = gateway_endpoint;
+    pub fn with_gateway_endpoint<S: Into<String>>(&mut self, id: S, owner: S, listener: S) {
+        self.client.gateway_endpoint = GatewayEndpoint {
+            gateway_id: id.into(),
+            gateway_owner: owner.into(),
+            gateway_listener: listener.into(),
+        };
     }
 
     pub fn with_gateway_id<S: Into<String>>(&mut self, id: S) {
@@ -138,7 +142,7 @@ impl<T: NymConfig> Config<T> {
 
     pub fn set_high_default_traffic_volume(&mut self) {
         self.debug.average_packet_delay = Duration::from_millis(10);
-        self.debug.loop_cover_traffic_average_delay = Duration::from_millis(2_000_000); // basically don't really send cover messages
+        self.debug.loop_cover_traffic_average_delay = Duration::from_millis(2000000); // basically don't really send cover messages
         self.debug.message_sending_average_delay = Duration::from_millis(4); // 250 "real" messages / s
     }
 
@@ -202,10 +206,6 @@ impl<T: NymConfig> Config<T> {
         self.client.gateway_endpoint.gateway_listener.clone()
     }
 
-    pub fn get_gateway_endpoint(&self) -> &GatewayEndpoint {
-        &self.client.gateway_endpoint
-    }
-
     pub fn get_database_path(&self) -> PathBuf {
         self.client.database_path.clone()
     }
@@ -272,28 +272,17 @@ impl<T: NymConfig> Default for Config<T> {
     }
 }
 
-#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)]
-pub struct GatewayEndpoint {
+#[derive(Debug, Default, Deserialize, PartialEq, Serialize)]
+struct GatewayEndpoint {
     /// gateway_id specifies ID of the gateway to which the client should send messages.
     /// If initially omitted, a random gateway will be chosen from the available topology.
-    pub gateway_id: String,
+    gateway_id: String,
 
     /// Address of the gateway owner to which the client should send messages.
-    pub gateway_owner: String,
+    gateway_owner: String,
 
     /// Address of the gateway listener to which all client requests should be sent.
-    pub gateway_listener: String,
-}
-
-impl From<topology::gateway::Node> for GatewayEndpoint {
-    fn from(node: topology::gateway::Node) -> GatewayEndpoint {
-        let gateway_listener = node.clients_address();
-        GatewayEndpoint {
-            gateway_id: node.identity_key.to_base58_string(),
-            gateway_owner: node.owner,
-            gateway_listener,
-        }
-    }
+    gateway_listener: String,
 }
 
 #[derive(Debug, Deserialize, PartialEq, Serialize)]
@@ -356,7 +345,7 @@ pub struct Client<T> {
     nym_root_directory: PathBuf,
 
     #[serde(skip)]
-    super_struct: PhantomData<T>,
+    super_struct: PhantomData<*const T>,
 }
 
 impl<T: NymConfig> Default for Client<T> {

clients/credential/Cargo.toml

@@ -15,8 +15,9 @@ rand = "0.7.3"
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
 url = "2.2"
-tokio = { version = "1.19.1", features = ["rt-multi-thread", "net", "signal", "macros"] } # async runtime
+tokio = { version = "1.4", features = ["rt-multi-thread", "net", "signal", "macros"] } # async runtime
 
+coconut-bandwidth-contract-common = { path = "../../common/cosmwasm-smart-contracts/coconut-bandwidth-contract" }
 coconut-interface = { path = "../../common/coconut-interface" }
 credentials = { path = "../../common/credentials" }
 credential-storage = { path = "../../common/credential-storage" }
@@ -26,4 +27,4 @@ pemstore = { path = "../../common/pemstore" }
 validator-client = { path = "../../common/client-libs/validator-client", features = ["nymd-client"] }
 
 [features]
-coconut = ["credentials/coconut"]
+coconut = ["credentials/coconut"]

clients/credential/src/client.rs

@@ -2,48 +2,66 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use bip39::Mnemonic;
+use coconut_bandwidth_contract_common::deposit::DepositData;
 use std::str::FromStr;
 use url::Url;
 
 use crate::error::Result;
-use crate::{MNEMONIC, NYMD_URL};
+use crate::{CONTRACT_ADDRESS, MNEMONIC, NYMD_URL};
 
-use network_defaults::{DEFAULT_NETWORK, DENOM, VOUCHER_INFO};
-use validator_client::nymd::traits::CoconutBandwidthSigningClient;
-use validator_client::nymd::{Coin, Fee, NymdClient, SigningNymdClient};
+use coconut_bandwidth_contract_common::msg::ExecuteMsg;
+use network_defaults::DEFAULT_NETWORK;
+use validator_client::nymd::{
+    AccountId, CosmosCoin, Decimal, Denom, NymdClient, SigningNymdClient,
+};
 
 pub(crate) struct Client {
     nymd_client: NymdClient<SigningNymdClient>,
+    denom: Denom,
+    contract_address: AccountId,
 }
 
 impl Client {
     pub fn new() -> Self {
         let nymd_url = Url::from_str(NYMD_URL).unwrap();
         let mnemonic = Mnemonic::from_str(MNEMONIC).unwrap();
-        let nymd_client =
-            NymdClient::connect_with_mnemonic(DEFAULT_NETWORK, nymd_url.as_ref(), mnemonic, None)
-                .unwrap();
+        let nymd_client = NymdClient::connect_with_mnemonic(
+            DEFAULT_NETWORK,
+            nymd_url.as_ref(),
+            None,
+            None,
+            None,
+            mnemonic,
+            None,
+        )
+        .unwrap();
+        let denom = Denom::from_str(network_defaults::DENOM).unwrap();
+        let contract_address = AccountId::from_str(CONTRACT_ADDRESS).unwrap();
 
-        Client { nymd_client }
+        Client {
+            nymd_client,
+            denom,
+            contract_address,
+        }
     }
 
     pub async fn deposit(
         &self,
         amount: u64,
+        info: &str,
         verification_key: String,
         encryption_key: String,
-        fee: Option<Fee>,
     ) -> Result<String> {
-        let amount = Coin::new(amount as u128, DENOM.to_string());
+        let req = ExecuteMsg::DepositFunds {
+            data: DepositData::new(info.to_string(), verification_key, encryption_key),
+        };
+        let funds = vec![CosmosCoin {
+            denom: self.denom.clone(),
+            amount: Decimal::from(amount),
+        }];
         Ok(self
             .nymd_client
-            .deposit(
-                amount,
-                String::from(VOUCHER_INFO),
-                verification_key,
-                encryption_key,
-                fee,
-            )
+            .execute(&self.contract_address, &req, Default::default(), "", funds)
             .await?
             .transaction_hash
             .to_string())

clients/credential/src/commands.rs

@@ -55,9 +55,9 @@ impl Execute for Deposit {
         let tx_hash = client
             .deposit(
                 self.amount,
+                VOUCHER_INFO,
                 signing_keypair.public_key.clone(),
                 encryption_keypair.public_key.clone(),
-                None,
             )
             .await?;
 

clients/native/Cargo.toml

@@ -27,7 +27,7 @@ pretty_env_logger = "0.4" # for formatting log messages
 rand = { version = "0.7.3", features = ["wasm-bindgen"] } # rng-related traits + some rng implementation to use
 serde = { version = "1.0.104", features = ["derive"] } # for config serialization/deserialization
 sled = "0.34" # for storage of replySURB decryption keys
-tokio = { version = "1.19.1", features = ["rt-multi-thread", "net", "signal"] } # async runtime
+tokio = { version = "1.4", features = ["rt-multi-thread", "net", "signal"] } # async runtime
 tokio-tungstenite = "0.14" # websocket
 
 ## internal
@@ -55,4 +55,4 @@ eth = []
 serde_json = "1.0" # for the "textsend" example
 
 [build-dependencies]
-vergen = { version = "5", default-features = false, features = ["build", "git", "rustc", "cargo"] }
+vergen = { version = "5", default-features = false, features = ["build", "git", "rustc", "cargo"] }

clients/native/src/commands/init.rs

@@ -42,11 +42,6 @@ pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
             .help("Id of the gateway we are going to connect to.")
             .takes_value(true)
         )
-        .arg(Arg::with_name("force-register-gateway")
-            .long("force-register-gateway")
-            .help("Force register gateway. WARNING: this will overwrite any existing keys for the given id, potentially causing loss of access.")
-            .takes_value(false)
-        )
         .arg(Arg::with_name("validators")
                  .long("validators")
                  .help("Comma separated list of rest endpoints of the validators")
@@ -124,7 +119,6 @@ async fn gateway_details(
         .expect("The list of validator apis is empty");
     let validator_client = validator_client::ApiClient::new(validator_api.clone());
 
-    log::trace!("Fetching list of gateways from: {}", validator_api);
     let gateways = validator_client.get_cached_gateways().await.unwrap();
     let valid_gateways = gateways
         .into_iter()
@@ -186,68 +180,22 @@ fn show_address(config: &Config) {
     println!("\nThe address of this client is: {}", client_recipient);
 }
 
-async fn set_gateway_config(config: &mut Config, chosen_gateway_id: Option<&str>) -> gateway::Node {
-    println!("Setting gateway config");
-    log::trace!("Chosen gateway: {:?}", chosen_gateway_id);
-
-    // Get the gateway details by querying the validator-api, and using the chosen one if it's
-    // among the available ones.
-    let gateway_details = gateway_details(
-        config.get_base().get_validator_api_endpoints(),
-        chosen_gateway_id,
-    )
-    .await;
-    log::trace!("Used gateway: {}", gateway_details);
-
-    config
-        .get_base_mut()
-        .with_gateway_endpoint(gateway_details.clone().into());
-    gateway_details
-}
-
-async fn register_and_store_gateway_keys(gateway_details: gateway::Node, config: &Config) {
-    println!("Registering gateway");
-
-    let mut rng = OsRng;
-    let mut key_manager = KeyManager::new(&mut rng);
-    let shared_keys = register_with_gateway(&gateway_details, key_manager.identity_keypair()).await;
-    key_manager.insert_gateway_shared_key(shared_keys);
-
-    let pathfinder = ClientKeyPathfinder::new_from_config(config.get_base());
-    key_manager
-        .store_keys(&pathfinder)
-        .expect("Failed to generated keys");
-    println!("Saved all generated keys");
-}
-
 pub async fn execute(matches: ArgMatches<'static>) {
     println!("Initialising client...");
 
     let id = matches.value_of("id").unwrap(); // required for now
 
-    let already_init = Config::default_config_file_path(Some(id)).exists();
-    if already_init {
-        println!(
-            "Client \"{}\" was already initialised before! \
-            Config information will be overwritten (but keys will be kept)!",
-            id
-        );
-    }
-
-    // Usually you only register with the gateway on the first init, however you can force
-    // re-registering if wanted.
-    let should_force_register = matches.is_present("force-register-gateway");
-
-    // If the client was already initialized, don't generate new keys and don't re-register with
-    // the gateway (because this would create a new shared key).
-    // Unless the user really wants to.
-    let will_register_gateway = !already_init || should_force_register;
-
-    // Attempt to use a user-provided gateway, if possible
-    let is_gateway_provided = matches.value_of("gateway").is_some();
+    let already_init = if Config::default_config_file_path(Some(id)).exists() {
+        println!("Client \"{}\" was already initialised before! Config information will be overwritten (but keys will be kept)!", id);
+        true
+    } else {
+        false
+    };
 
     let mut config = Config::new(id);
 
+    let mut rng = OsRng;
+
     // TODO: ideally that should be the last thing that's being done to config.
     // However, we are later further overriding it with gateway id
     config = override_config(config, &matches);
@@ -255,26 +203,34 @@ pub async fn execute(matches: ArgMatches<'static>) {
         config.get_base_mut().set_high_default_traffic_volume();
     }
 
-    if will_register_gateway {
-        // Create identity, encryption and ack keys.
-        let gateway_details = set_gateway_config(&mut config, matches.value_of("gateway")).await;
-        register_and_store_gateway_keys(gateway_details, &config).await;
-    } else if is_gateway_provided {
-        // Just set the config, don't register or create any keys
-        set_gateway_config(&mut config, matches.value_of("gateway")).await;
-    } else {
-        // Read the existing config to reuse the gateway configuration
-        println!("Not registering gateway, will reuse existing config and keys");
-        if let Ok(existing_config) = Config::load_from_file(Some(id)) {
-            config
-                .get_base_mut()
-                .with_gateway_endpoint(existing_config.get_base().get_gateway_endpoint().clone());
-        } else {
-            log::warn!(
-                "Existing configuration found, but enable to load gateway details. \
-                Proceeding anyway."
-            );
-        };
+    // if client was already initialised, don't generate new keys, not re-register with gateway
+    // (because this would create new shared key)
+    if !already_init {
+        // create identity, encryption and ack keys.
+        let mut key_manager = KeyManager::new(&mut rng);
+
+        let chosen_gateway_id = matches.value_of("gateway");
+
+        let gateway_details = gateway_details(
+            config.get_base().get_validator_api_endpoints(),
+            chosen_gateway_id,
+        )
+        .await;
+        let shared_keys =
+            register_with_gateway(&gateway_details, key_manager.identity_keypair()).await;
+
+        config.get_base_mut().with_gateway_endpoint(
+            gateway_details.identity_key.to_base58_string(),
+            gateway_details.owner.clone(),
+            gateway_details.clients_address(),
+        );
+        key_manager.insert_gateway_shared_key(shared_keys);
+
+        let pathfinder = ClientKeyPathfinder::new_from_config(config.get_base());
+        key_manager
+            .store_keys(&pathfinder)
+            .expect("Failed to generated keys");
+        println!("Saved all generated keys");
     }
 
     let config_save_location = config.get_config_file_save_location();
@@ -282,14 +238,8 @@ pub async fn execute(matches: ArgMatches<'static>) {
         .save_to_file(None)
         .expect("Failed to save the config file");
     println!("Saved configuration file to {:?}", config_save_location);
-    println!("Using gateway: {}", config.get_base().get_gateway_id());
-    log::debug!("Gateway id: {}", config.get_base().get_gateway_id());
-    log::debug!("Gateway owner: {}", config.get_base().get_gateway_owner());
-    log::debug!(
-        "Gateway listener: {}",
-        config.get_base().get_gateway_listener()
-    );
-    println!("Client configuration completed.");
+    println!("Using gateway: {}", config.get_base().get_gateway_id(),);
+    println!("Client configuration completed.\n\n\n");
 
     show_address(&config);
 }

clients/native/src/commands/mod.rs

@@ -39,11 +39,15 @@ pub(crate) fn override_config(mut config: Config, matches: &ArgMatches<'_>) -> C
             .set_custom_validator_apis(parse_validators(raw_validators));
     }
 
+    if let Some(gateway_id) = matches.value_of("gateway") {
+        config.get_base_mut().with_gateway_id(gateway_id);
+    }
+
     if matches.is_present("disable-socket") {
         config = config.with_socket(SocketType::None);
     }
 
-    if let Some(port) = matches.value_of("port").map(str::parse) {
+    if let Some(port) = matches.value_of("port").map(|port| port.parse::<u16>()) {
         if let Err(err) = port {
             // if port was overridden, it must be parsable
             panic!("Invalid port value provided - {:?}", err);

clients/native/src/commands/run.rs

@@ -70,9 +70,7 @@ pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
 fn version_check(cfg: &Config) -> bool {
     let binary_version = env!("CARGO_PKG_VERSION");
     let config_version = cfg.get_base().get_version();
-    if binary_version == config_version {
-        true
-    } else {
+    if binary_version != config_version {
         warn!("The mixnode binary has different version than what is specified in config file! {} and {}", binary_version, config_version);
         if is_minor_version_compatible(binary_version, config_version) {
             info!("but they are still semver compatible. However, consider running the `upgrade` command");
@@ -81,6 +79,8 @@ fn version_check(cfg: &Config) -> bool {
             error!("and they are semver incompatible! - please run the `upgrade` command before attempting `run` again");
             false
         }
+    } else {
+        true
     }
 }
 

clients/native/src/commands/upgrade.rs

@@ -131,22 +131,22 @@ fn minor_0_12_upgrade(
     config
 }
 
-fn do_upgrade(mut config: Config, matches: &ArgMatches<'_>, package_version: &Version) {
+fn do_upgrade(mut config: Config, matches: &ArgMatches<'_>, package_version: Version) {
     loop {
         let config_version = parse_config_version(&config);
 
-        if &config_version == package_version {
+        if config_version == package_version {
             println!("You're using the most recent version!");
             return;
         }
 
         config = match config_version.major {
             0 => match config_version.minor {
-                9 | 10 => outdated_upgrade(&config_version, package_version),
-                11 => minor_0_12_upgrade(config, matches, &config_version, package_version),
-                _ => unsupported_upgrade(&config_version, package_version),
+                9 | 10 => outdated_upgrade(&config_version, &package_version),
+                11 => minor_0_12_upgrade(config, matches, &config_version, &package_version),
+                _ => unsupported_upgrade(&config_version, &package_version),
             },
-            _ => unsupported_upgrade(&config_version, package_version),
+            _ => unsupported_upgrade(&config_version, &package_version),
         }
     }
 }
@@ -167,5 +167,5 @@ pub fn execute(matches: &ArgMatches<'_>) {
     }
 
     // here be upgrade path to 0.9.X and beyond based on version number from config
-    do_upgrade(existing_config, matches, &package_version)
+    do_upgrade(existing_config, matches, package_version)
 }

clients/native/src/main.rs

@@ -108,7 +108,5 @@ fn setup_logging() {
         .filter_module("want", log::LevelFilter::Warn)
         .filter_module("tungstenite", log::LevelFilter::Warn)
         .filter_module("tokio_tungstenite", log::LevelFilter::Warn)
-        .filter_module("handlebars", log::LevelFilter::Warn)
-        .filter_module("sled", log::LevelFilter::Warn)
         .init();
 }

clients/native/websocket-requests/Cargo.toml

@@ -10,4 +10,4 @@ edition = "2021"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 
-nymsphinx = { path = "../../../common/nymsphinx" }
+nymsphinx = { path = "../../../common/nymsphinx" }

clients/socks5/Cargo.toml

@@ -20,7 +20,7 @@ pretty_env_logger = "0.4"
 rand = { version = "0.7.3", features = ["wasm-bindgen"] }
 serde = { version = "1.0", features = ["derive"] } # for config serialization/deserialization
 snafu = "0.6"
-tokio = { version = "1.19.1", features = ["rt-multi-thread", "net", "signal"] }
+tokio = { version = "1.4", features = ["rt-multi-thread", "net", "signal"] }
 url = "2.2"
 
 # internal
@@ -47,4 +47,4 @@ coconut = ["coconut-interface", "credentials", "gateway-requests/coconut", "gate
 eth = []
 
 [build-dependencies]
-vergen = { version = "5", default-features = false, features = ["build", "git", "rustc", "cargo"] }
+vergen = { version = "5", default-features = false, features = ["build", "git", "rustc", "cargo"] }

clients/socks5/src/client/mod.rs

@@ -20,7 +20,6 @@ use client_core::client::topology_control::{
 use client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
 use crypto::asymmetric::identity;
 use futures::channel::mpsc;
-use futures::StreamExt;
 use gateway_client::bandwidth::BandwidthController;
 use gateway_client::{
     AcknowledgementReceiver, AcknowledgementSender, GatewayClient, MixnetMessageReceiver,
@@ -36,17 +35,7 @@ use crate::socks::{
     server::SphinxSocksServer,
 };
 
-pub mod config;
-
-// Channels used to control the main task from outside
-pub type Socks5ControlMessageSender = mpsc::UnboundedSender<Socks5ControlMessage>;
-pub type Socks5ControlMessageReceiver = mpsc::UnboundedReceiver<Socks5ControlMessage>;
-
-#[derive(Debug)]
-pub enum Socks5ControlMessage {
-    /// Tell the main task to stop
-    Stop,
-}
+pub(crate) mod config;
 
 pub struct NymClient {
     /// Client configuration options, including, among other things, packet sending rates,
@@ -283,20 +272,6 @@ impl NymClient {
         );
     }
 
-    // Variant of `run_forever` that listends for remote control messages
-    pub async fn run_and_listen(&mut self, mut receiver: Socks5ControlMessageReceiver) {
-        self.start().await;
-        tokio::select! {
-            message = receiver.next() =>  match message {
-                Some(Socks5ControlMessage::Stop) => {
-                    log::info!("Received: {:?}", message);
-                    log::info!("Shutting down");
-                }
-                None => log::info!("none"),
-            }
-        }
-    }
-
     pub async fn start(&mut self) {
         info!("Starting nym client");
         // channels for inter-component communication

clients/socks5/src/commands/init.rs

@@ -46,11 +46,6 @@ pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
             .help("Id of the gateway we are going to connect to.")
             .takes_value(true)
         )
-        .arg(Arg::with_name("force-register-gateway")
-            .long("force-register-gateway")
-            .help("Force register gateway. WARNING: this will overwrite any existing keys for the given id, potentially causing loss of access.")
-            .takes_value(false)
-        )
         .arg(Arg::with_name("validators")
                  .long("validators")
                  .help("Comma separated list of rest endpoints of the validators")
@@ -93,8 +88,7 @@ pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
     app
 }
 
-// TODO: make this private again after refactoring the config setup
-pub async fn register_with_gateway(
+async fn register_with_gateway(
     gateway: &gateway::Node,
     our_identity: Arc<identity::KeyPair>,
 ) -> Arc<SharedKeys> {
@@ -116,8 +110,7 @@ pub async fn register_with_gateway(
         .expect("failed to register with the gateway!")
 }
 
-// TODO: make this private again after refactoring the config setup
-pub async fn gateway_details(
+async fn gateway_details(
     validator_servers: Vec<Url>,
     chosen_gateway_id: Option<&str>,
 ) -> gateway::Node {
@@ -126,7 +119,6 @@ pub async fn gateway_details(
         .expect("The list of validator apis is empty");
     let validator_client = validator_client::ApiClient::new(validator_api.clone());
 
-    log::trace!("Fetching list of gateways from: {}", validator_api);
     let gateways = validator_client.get_cached_gateways().await.unwrap();
     let valid_gateways = gateways
         .into_iter()
@@ -152,8 +144,7 @@ pub async fn gateway_details(
     }
 }
 
-// TODO: make this private again after refactoring the config setup
-pub fn show_address(config: &Config) {
+fn show_address(config: &Config) {
     fn load_identity_keys(pathfinder: &ClientKeyPathfinder) -> identity::KeyPair {
         let identity_keypair: identity::KeyPair =
             pemstore::load_keypair(&pemstore::KeyPairPath::new(
@@ -189,70 +180,23 @@ pub fn show_address(config: &Config) {
     println!("\nThe address of this client is: {}", client_recipient);
 }
 
-async fn set_gateway_config(config: &mut Config, chosen_gateway_id: Option<&str>) -> gateway::Node {
-    println!("Setting gateway config");
-    log::trace!("Chosen gateway: {:?}", chosen_gateway_id);
-
-    // Get the gateway details by querying the validator-api, and using the chosen one if it's
-    // among the available ones.
-    let gateway_details = gateway_details(
-        config.get_base().get_validator_api_endpoints(),
-        chosen_gateway_id,
-    )
-    .await;
-
-    log::trace!("Used gateway: {}", gateway_details);
-
-    config
-        .get_base_mut()
-        .with_gateway_endpoint(gateway_details.clone().into());
-    gateway_details
-}
-
-async fn register_and_store_gateway_keys(gateway_details: gateway::Node, config: &Config) {
-    println!("Registering gateway");
-
-    let mut rng = OsRng;
-    let mut key_manager = KeyManager::new(&mut rng);
-    let shared_keys = register_with_gateway(&gateway_details, key_manager.identity_keypair()).await;
-    key_manager.insert_gateway_shared_key(shared_keys);
-
-    let pathfinder = ClientKeyPathfinder::new_from_config(config.get_base());
-    key_manager
-        .store_keys(&pathfinder)
-        .expect("Failed to generated keys");
-    println!("Saved all generated keys");
-}
-
 pub async fn execute(matches: ArgMatches<'static>) {
     println!("Initialising client...");
 
     let id = matches.value_of("id").unwrap(); // required for now
     let provider_address = matches.value_of("provider").unwrap();
 
-    let already_init = Config::default_config_file_path(Some(id)).exists();
-    if already_init {
-        println!(
-            "SOCKS5 client \"{}\" was already initialised before! \
-            Config information will be overwritten (but keys will be kept)!",
-            id
-        );
-    }
-
-    // Usually you only register with the gateway on the first init, however you can force
-    // re-registering if wanted.
-    let should_force_register = matches.is_present("force-register-gateway");
-
-    // If the client was already initialized, don't generate new keys and don't re-register with
-    // the gateway (because this would create a new shared key).
-    // Unless the user really wants to.
-    let will_register_gateway = !already_init || should_force_register;
-
-    // Attempt to use a user-provided gateway, if possible
-    let is_gateway_provided = matches.value_of("gateway").is_some();
+    let already_init = if Config::default_config_file_path(Some(id)).exists() {
+        println!("Socks5 client \"{}\" was already initialised before! Config information will be overwritten (but keys will be kept)!", id);
+        true
+    } else {
+        false
+    };
 
     let mut config = Config::new(id, provider_address);
 
+    let mut rng = OsRng;
+
     // TODO: ideally that should be the last thing that's being done to config.
     // However, we are later further overriding it with gateway id
     config = override_config(config, &matches);
@@ -260,26 +204,34 @@ pub async fn execute(matches: ArgMatches<'static>) {
         config.get_base_mut().set_high_default_traffic_volume();
     }
 
-    if will_register_gateway {
-        // Create identity, encryption and ack keys.
-        let gateway_details = set_gateway_config(&mut config, matches.value_of("gateway")).await;
-        register_and_store_gateway_keys(gateway_details, &config).await;
-    } else if is_gateway_provided {
-        // Just set the config, don't register or create any keys
-        set_gateway_config(&mut config, matches.value_of("gateway")).await;
-    } else {
-        // Read the existing config to reuse the gateway configuration
-        println!("Not registering gateway, will reuse existing config and keys");
-        if let Ok(existing_config) = Config::load_from_file(Some(id)) {
-            config
-                .get_base_mut()
-                .with_gateway_endpoint(existing_config.get_base().get_gateway_endpoint().clone());
-        } else {
-            log::warn!(
-                "Existing configuration found, but enable to load gateway details. \
-                Proceeding anyway."
-            );
-        };
+    // if client was already initialised, don't generate new keys, not re-register with gateway
+    // (because this would create new shared key)
+    if !already_init {
+        // create identity, encryption and ack keys.
+        let mut key_manager = KeyManager::new(&mut rng);
+
+        let chosen_gateway_id = matches.value_of("gateway");
+
+        let gateway_details = gateway_details(
+            config.get_base().get_validator_api_endpoints(),
+            chosen_gateway_id,
+        )
+        .await;
+        let shared_keys =
+            register_with_gateway(&gateway_details, key_manager.identity_keypair()).await;
+
+        config.get_base_mut().with_gateway_endpoint(
+            gateway_details.identity_key.to_base58_string(),
+            gateway_details.owner.clone(),
+            gateway_details.clients_address(),
+        );
+        key_manager.insert_gateway_shared_key(shared_keys);
+
+        let pathfinder = ClientKeyPathfinder::new_from_config(config.get_base());
+        key_manager
+            .store_keys(&pathfinder)
+            .expect("Failed to generated keys");
+        println!("Saved all generated keys");
     }
 
     let config_save_location = config.get_config_file_save_location();
@@ -287,14 +239,8 @@ pub async fn execute(matches: ArgMatches<'static>) {
         .save_to_file(None)
         .expect("Failed to save the config file");
     println!("Saved configuration file to {:?}", config_save_location);
-    println!("Using gateway: {}", config.get_base().get_gateway_id());
-    log::debug!("Gateway id: {}", config.get_base().get_gateway_id());
-    log::debug!("Gateway owner: {}", config.get_base().get_gateway_owner());
-    log::debug!(
-        "Gateway listener: {}",
-        config.get_base().get_gateway_listener()
-    );
-    println!("Client configuration completed.");
+    println!("Using gateway: {}", config.get_base().get_gateway_id(),);
+    println!("Client configuration completed.\n\n\n");
 
     show_address(&config);
 }

clients/socks5/src/commands/mod.rs

@@ -5,7 +5,7 @@ use crate::client::config::Config;
 use clap::ArgMatches;
 use url::Url;
 
-pub mod init;
+pub(crate) mod init;
 pub(crate) mod run;
 pub(crate) mod upgrade;
 
@@ -39,6 +39,10 @@ pub(crate) fn override_config(mut config: Config, matches: &ArgMatches<'_>) -> C
             .set_custom_validator_apis(parse_validators(raw_validators));
     }
 
+    if let Some(gateway_id) = matches.value_of("gateway") {
+        config.get_base_mut().with_gateway_id(gateway_id);
+    }
+
     if let Some(port) = matches.value_of("port").map(|port| port.parse::<u16>()) {
         if let Err(err) = port {
             // if port was overridden, it must be parsable

clients/socks5/src/commands/run.rs

@@ -34,16 +34,16 @@ pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
             .help("Address of the socks5 provider to send messages to.")
             .takes_value(true)
         )
-        .arg(Arg::with_name("gateway")
-            .long("gateway")
-            .help("Id of the gateway we want to connect to. If overridden, it is user's responsibility to ensure prior registration happened")
-            .takes_value(true)
-        )
         .arg(Arg::with_name("validators")
                 .long("validators")
                 .help("Comma separated list of rest endpoints of the validators")
                 .takes_value(true),
         )
+        .arg(Arg::with_name("gateway")
+            .long("gateway")
+            .help("Id of the gateway we want to connect to. If overridden, it is user's responsibility to ensure prior registration happened")
+            .takes_value(true)
+        )
         .arg(Arg::with_name("port")
             .short("p")
             .long("port")

clients/socks5/src/lib.rs

@@ -2,9 +2,4 @@
 // SPDX-License-Identifier: Apache-2.0
 
 pub mod client;
-// This is only used as we reach into the init functions in nym-connect. We need to refactor the
-// init functions so that nym-connect can just call the same init function as the regular socks5
-// client.
-#[allow(unused)]
-pub mod commands;
 pub mod socks;

common/client-libs/gateway-client/Cargo.toml

@@ -35,7 +35,7 @@ default-features = false
 
 # non-wasm-only dependencies
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio]
-version = "1.19.1"
+version = "1.4"
 features = ["macros", "rt", "net", "sync", "time"]
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-tungstenite]
@@ -74,4 +74,4 @@ features = ["js"]
 [features]
 coconut = ["gateway-requests/coconut", "coconut-interface", "validator-client", "credentials/coconut"]
 wasm = ["web3/wasm", "web3/http", "web3/signing"]
-default = ["web3/default"]
+default = ["web3/default"]

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

@@ -101,7 +101,7 @@ impl GatewayClient {
     }
 
     pub fn set_disabled_credentials_mode(&mut self, disabled_credentials_mode: bool) {
-        self.disabled_credentials_mode = disabled_credentials_mode;
+        self.disabled_credentials_mode = disabled_credentials_mode
     }
 
     // TODO: later convert into proper builder methods
@@ -496,6 +496,7 @@ impl GatewayClient {
             self.shared_key.as_ref().unwrap(),
             iv,
         )
+        .ok_or(GatewayClientError::SerializeCredential)?
         .into();
         self.bandwidth_remaining = match self.send_websocket_message(msg).await? {
             ServerResponse::Bandwidth { available_total } => Ok(available_total),

common/client-libs/mixnet-client/Cargo.toml

@@ -9,8 +9,8 @@ edition = "2021"
 [dependencies]
 futures = "0.3"
 log = "0.4.8"
-tokio = { version = "1.19.1", features = ["time", "net", "rt"] }
-tokio-util = { version = "0.7.3", features = ["codec"] }
+tokio = { version = "1.4", features = ["time", "net", "rt"] }
+tokio-util = { version = "0.6", features = ["codec"] }
 
 # internal
 nymsphinx = {path = "../../nymsphinx" }

common/client-libs/validator-client/Cargo.toml

@@ -10,11 +10,8 @@ rust-version = "1.56"
 [dependencies]
 base64 = "0.13"
 colored = "2.0"
-cw3 = "0.13.1"
 mixnet-contract-common = { path= "../../cosmwasm-smart-contracts/mixnet-contract" }
 vesting-contract-common = { path= "../../cosmwasm-smart-contracts/vesting-contract" }
-coconut-bandwidth-contract-common = { path= "../../cosmwasm-smart-contracts/coconut-bandwidth-contract" }
-multisig-contract-common = { path = "../../cosmwasm-smart-contracts/multisig-contract" }
 vesting-contract = { path = "../../../contracts/vesting" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
@@ -22,7 +19,7 @@ reqwest = { version = "0.11", features = ["json"] }
 thiserror = "1"
 log = "0.4"
 url = { version = "2.2", features = ["serde"] }
-tokio = { version = "1.19.1", features = ["sync", "time"] }
+tokio = { version = "1.10", features = ["sync", "time"] }
 futures = "0.3"
 
 coconut-interface = { path = "../../coconut-interface" }
@@ -35,13 +32,12 @@ validator-api-requests = { path = "../../../validator-api/validator-api-requests
 async-trait = { version = "0.1.51", optional = true }
 bip39 = { version = "1", features = ["rand"], optional = true }
 config = { path = "../../config", optional = true }
-cosmrs = { version = "0.7.0", features = ["rpc", "bip32", "cosmwasm"], optional = true}
-prost = { version = "0.10", default-features = false, optional = true }
+cosmrs = { git = "https://github.com/nymtech/cosmos-rust", branch = "bugfix/account-id-length-validation", features = ["rpc", "bip32", "cosmwasm"], optional = true}
+prost = { version = "0.9", default-features = false, optional = true }
 flate2 = { version = "1.0.20", optional = true }
 sha2 = { version = "0.9.5", optional = true }
 itertools = { version = "0.10", optional = true }
-cosmwasm-std = { version = "1.0.0", optional = true }
-execute = { path = "../../execute" }
+cosmwasm-std = { version = "1.0.0-beta8", optional = true }
 
 [dev-dependencies]
 ts-rs = "6.1.2"
@@ -58,5 +54,3 @@ nymd-client = [
     "itertools",
     "cosmwasm-std",
 ]
-generate-ts = []
-

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

@@ -2,20 +2,16 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{validator_api, ValidatorClientError};
-use coconut_interface::{
-    BlindSignRequestBody, BlindedSignatureResponse, ExecuteReleaseFundsRequestBody,
-    ProposeReleaseFundsRequestBody, ProposeReleaseFundsResponse, VerificationKeyResponse,
-    VerifyCredentialBody, VerifyCredentialResponse,
-};
+use coconut_interface::{BlindSignRequestBody, BlindedSignatureResponse, VerificationKeyResponse};
 use mixnet_contract_common::{GatewayBond, IdentityKeyRef, MixNodeBond};
 use url::Url;
 
+#[cfg(feature = "nymd-client")]
+use validator_api_requests::models::UptimeResponse;
 use validator_api_requests::models::{
     CoreNodeStatusResponse, MixnodeStatusResponse, RewardEstimationResponse,
     StakeSaturationResponse,
 };
-#[cfg(feature = "nymd-client")]
-use validator_api_requests::models::{MixNodeBondAnnotated, UptimeResponse};
 
 #[cfg(feature = "nymd-client")]
 use network_defaults::DEFAULT_NETWORK;
@@ -33,6 +29,8 @@ use mixnet_contract_common::{
 };
 #[cfg(feature = "nymd-client")]
 use std::collections::{HashMap, HashSet};
+#[cfg(feature = "nymd-client")]
+use std::str::FromStr;
 
 #[cfg(feature = "nymd-client")]
 #[must_use]
@@ -41,9 +39,9 @@ pub struct Config {
     network: network_defaults::all::Network,
     api_url: Url,
     nymd_url: Url,
-    mixnet_contract_address: cosmrs::AccountId,
-    vesting_contract_address: cosmrs::AccountId,
-    bandwidth_claim_contract_address: cosmrs::AccountId,
+    mixnet_contract_address: Option<cosmrs::AccountId>,
+    vesting_contract_address: Option<cosmrs::AccountId>,
+    erc20_bridge_contract_address: Option<cosmrs::AccountId>,
 
     mixnode_page_limit: Option<u32>,
     gateway_page_limit: Option<u32>,
@@ -53,22 +51,20 @@ pub struct Config {
 
 #[cfg(feature = "nymd-client")]
 impl Config {
-    pub fn new(network: network_defaults::all::Network, nymd_url: Url, api_url: Url) -> Self {
+    pub fn new(
+        network: network_defaults::all::Network,
+        nymd_url: Url,
+        api_url: Url,
+        mixnet_contract_address: Option<cosmrs::AccountId>,
+        vesting_contract_address: Option<cosmrs::AccountId>,
+        erc20_bridge_contract_address: Option<cosmrs::AccountId>,
+    ) -> Self {
         Config {
             network,
             nymd_url,
-            mixnet_contract_address: DEFAULT_NETWORK
-                .mixnet_contract_address()
-                .parse()
-                .expect("Error parsing mixnet contract address"),
-            vesting_contract_address: DEFAULT_NETWORK
-                .vesting_contract_address()
-                .parse()
-                .expect("Error parsing vesting contract address"),
-            bandwidth_claim_contract_address: DEFAULT_NETWORK
-                .bandwidth_claim_contract_address()
-                .parse()
-                .expect("Error parsing bandwidth claim contract address"),
+            mixnet_contract_address,
+            vesting_contract_address,
+            erc20_bridge_contract_address,
             api_url,
             mixnode_page_limit: None,
             gateway_page_limit: None,
@@ -77,21 +73,6 @@ impl Config {
         }
     }
 
-    pub fn with_mixnode_contract_address(mut self, address: cosmrs::AccountId) -> Self {
-        self.mixnet_contract_address = address;
-        self
-    }
-
-    pub fn with_vesting_contract_address(mut self, address: cosmrs::AccountId) -> Self {
-        self.vesting_contract_address = address;
-        self
-    }
-
-    pub fn with_bandwidth_claim_contract_address(mut self, address: cosmrs::AccountId) -> Self {
-        self.bandwidth_claim_contract_address = address;
-        self
-    }
-
     pub fn with_mixnode_page_limit(mut self, limit: Option<u32>) -> Config {
         self.mixnode_page_limit = limit;
         self
@@ -116,9 +97,9 @@ impl Config {
 #[cfg(feature = "nymd-client")]
 pub struct Client<C> {
     pub network: network_defaults::all::Network,
-    mixnet_contract_address: cosmrs::AccountId,
-    vesting_contract_address: cosmrs::AccountId,
-    bandwidth_claim_contract_address: cosmrs::AccountId,
+    mixnet_contract_address: Option<cosmrs::AccountId>,
+    vesting_contract_address: Option<cosmrs::AccountId>,
+    erc20_bridge_contract_address: Option<cosmrs::AccountId>,
     mnemonic: Option<bip39::Mnemonic>,
 
     mixnode_page_limit: Option<u32>,
@@ -141,18 +122,18 @@ impl Client<SigningNymdClient> {
         let nymd_client = NymdClient::connect_with_mnemonic(
             config.network,
             config.nymd_url.as_str(),
+            config.mixnet_contract_address.clone(),
+            config.vesting_contract_address.clone(),
+            config.erc20_bridge_contract_address.clone(),
             mnemonic.clone(),
             None,
-        )?
-        .with_mixnet_contract_address(config.mixnet_contract_address.clone())
-        .with_vesting_contract_address(config.vesting_contract_address.clone())
-        .with_bandwidth_claim_contract_address(config.bandwidth_claim_contract_address.clone());
+        )?;
 
         Ok(Client {
             network: config.network,
             mixnet_contract_address: config.mixnet_contract_address,
             vesting_contract_address: config.vesting_contract_address,
-            bandwidth_claim_contract_address: config.bandwidth_claim_contract_address,
+            erc20_bridge_contract_address: config.erc20_bridge_contract_address,
             mnemonic: Some(mnemonic),
             mixnode_page_limit: config.mixnode_page_limit,
             gateway_page_limit: config.gateway_page_limit,
@@ -167,12 +148,12 @@ impl Client<SigningNymdClient> {
         self.nymd = NymdClient::connect_with_mnemonic(
             self.network,
             new_endpoint.as_ref(),
+            self.mixnet_contract_address.clone(),
+            self.vesting_contract_address.clone(),
+            self.erc20_bridge_contract_address.clone(),
             self.mnemonic.clone().unwrap(),
             None,
-        )?
-        .with_mixnet_contract_address(self.mixnet_contract_address.clone())
-        .with_vesting_contract_address(self.vesting_contract_address.clone())
-        .with_bandwidth_claim_contract_address(self.bandwidth_claim_contract_address.clone());
+        )?;
         Ok(())
     }
 
@@ -185,15 +166,32 @@ impl Client<SigningNymdClient> {
 impl Client<QueryNymdClient> {
     pub fn new_query(config: Config) -> Result<Client<QueryNymdClient>, ValidatorClientError> {
         let validator_api_client = validator_api::Client::new(config.api_url.clone());
-        let nymd_client = NymdClient::connect(config.nymd_url.as_str())?
-            .with_mixnet_contract_address(config.mixnet_contract_address.clone())
-            .with_vesting_contract_address(config.vesting_contract_address.clone());
+        let nymd_client = NymdClient::connect(
+            config.nymd_url.as_str(),
+            Some(config.mixnet_contract_address.clone().unwrap_or_else(|| {
+                cosmrs::AccountId::from_str(DEFAULT_NETWORK.mixnet_contract_address()).unwrap()
+            })),
+            Some(config.vesting_contract_address.clone().unwrap_or_else(|| {
+                cosmrs::AccountId::from_str(DEFAULT_NETWORK.vesting_contract_address()).unwrap()
+            })),
+            Some(
+                config
+                    .erc20_bridge_contract_address
+                    .clone()
+                    .unwrap_or_else(|| {
+                        cosmrs::AccountId::from_str(
+                            DEFAULT_NETWORK.bandwidth_claim_contract_address(),
+                        )
+                        .unwrap()
+                    }),
+            ),
+        )?;
 
         Ok(Client {
             network: config.network,
             mixnet_contract_address: config.mixnet_contract_address,
             vesting_contract_address: config.vesting_contract_address,
-            bandwidth_claim_contract_address: config.bandwidth_claim_contract_address,
+            erc20_bridge_contract_address: config.erc20_bridge_contract_address,
             mnemonic: None,
             mixnode_page_limit: config.mixnode_page_limit,
             gateway_page_limit: config.gateway_page_limit,
@@ -205,10 +203,12 @@ impl Client<QueryNymdClient> {
     }
 
     pub fn change_nymd(&mut self, new_endpoint: Url) -> Result<(), ValidatorClientError> {
-        self.nymd = NymdClient::connect(new_endpoint.as_ref())?
-            .with_mixnet_contract_address(self.mixnet_contract_address.clone())
-            .with_vesting_contract_address(self.vesting_contract_address.clone())
-            .with_bandwidth_claim_contract_address(self.bandwidth_claim_contract_address.clone());
+        self.nymd = NymdClient::connect(
+            new_endpoint.as_ref(),
+            self.mixnet_contract_address.clone(),
+            self.vesting_contract_address.clone(),
+            self.erc20_bridge_contract_address.clone(),
+        )?;
         Ok(())
     }
 }
@@ -222,10 +222,10 @@ impl<C> Client<C> {
     // use case: somebody initialised client without a contract in order to upload and initialise one
     // and now they want to actually use it without making new client
     pub fn set_mixnet_contract_address(&mut self, mixnet_contract_address: cosmrs::AccountId) {
-        self.mixnet_contract_address = mixnet_contract_address
+        self.mixnet_contract_address = Some(mixnet_contract_address)
     }
 
-    pub fn get_mixnet_contract_address(&self) -> cosmrs::AccountId {
+    pub fn get_mixnet_contract_address(&self) -> Option<cosmrs::AccountId> {
         self.mixnet_contract_address.clone()
     }
 
@@ -233,36 +233,18 @@ impl<C> Client<C> {
         Ok(self.validator_api.get_mixnodes().await?)
     }
 
-    pub async fn get_cached_mixnodes_detailed(
-        &self,
-    ) -> Result<Vec<MixNodeBondAnnotated>, ValidatorClientError> {
-        Ok(self.validator_api.get_mixnodes_detailed().await?)
-    }
-
     pub async fn get_cached_rewarded_mixnodes(
         &self,
     ) -> Result<Vec<MixNodeBond>, ValidatorClientError> {
         Ok(self.validator_api.get_rewarded_mixnodes().await?)
     }
 
-    pub async fn get_cached_rewarded_mixnodes_detailed(
-        &self,
-    ) -> Result<Vec<MixNodeBondAnnotated>, ValidatorClientError> {
-        Ok(self.validator_api.get_rewarded_mixnodes_detailed().await?)
-    }
-
     pub async fn get_cached_active_mixnodes(
         &self,
     ) -> Result<Vec<MixNodeBond>, ValidatorClientError> {
         Ok(self.validator_api.get_active_mixnodes().await?)
     }
 
-    pub async fn get_cached_active_mixnodes_detailed(
-        &self,
-    ) -> Result<Vec<MixNodeBondAnnotated>, ValidatorClientError> {
-        Ok(self.validator_api.get_active_mixnodes_detailed().await?)
-    }
-
     pub async fn get_cached_gateways(&self) -> Result<Vec<GatewayBond>, ValidatorClientError> {
         Ok(self.validator_api.get_gateways().await?)
     }
@@ -318,13 +300,6 @@ impl<C> Client<C> {
         Ok(self.nymd.get_current_epoch().await?)
     }
 
-    pub async fn get_current_operator_cost(&self) -> Result<u64, ValidatorClientError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        Ok(self.nymd.get_current_operator_cost().await?)
-    }
-
     pub async fn get_mixnet_contract_version(&self) -> Result<MixnetContractVersion, NymdError>
     where
         C: CosmWasmClient + Sync,
@@ -740,34 +715,4 @@ impl ApiClient {
     ) -> Result<VerificationKeyResponse, ValidatorClientError> {
         Ok(self.validator_api.get_coconut_verification_key().await?)
     }
-
-    pub async fn verify_bandwidth_credential(
-        &self,
-        request_body: &VerifyCredentialBody,
-    ) -> Result<VerifyCredentialResponse, ValidatorClientError> {
-        Ok(self
-            .validator_api
-            .verify_bandwidth_credential(request_body)
-            .await?)
-    }
-
-    pub async fn propose_release_funds(
-        &self,
-        request_body: &ProposeReleaseFundsRequestBody,
-    ) -> Result<ProposeReleaseFundsResponse, ValidatorClientError> {
-        Ok(self
-            .validator_api
-            .propose_release_funds(request_body)
-            .await?)
-    }
-
-    pub async fn execute_release_funds(
-        &self,
-        request_body: &ExecuteReleaseFundsRequestBody,
-    ) -> Result<(), ValidatorClientError> {
-        Ok(self
-            .validator_api
-            .execute_release_funds(request_body)
-            .await?)
-    }
 }

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

@@ -19,7 +19,7 @@ const CONNECTION_TEST_TIMEOUT_SEC: u64 = 2;
 pub async fn run_validator_connection_test<H: BuildHasher + 'static>(
     nymd_urls: impl Iterator<Item = (Network, Url)>,
     api_urls: impl Iterator<Item = (Network, Url)>,
-    mixnet_contract_address: HashMap<Network, cosmrs::AccountId, H>,
+    mixnet_contract_address: HashMap<Network, Option<cosmrs::AccountId>, H>,
 ) -> (
     HashMap<Network, Vec<(Url, bool)>>,
     HashMap<Network, Vec<(Url, bool)>>,
@@ -47,15 +47,14 @@ pub async fn run_validator_connection_test<H: BuildHasher + 'static>(
 fn setup_connection_tests<H: BuildHasher + 'static>(
     nymd_urls: impl Iterator<Item = (Network, Url)>,
     api_urls: impl Iterator<Item = (Network, Url)>,
-    mixnet_contract_address: HashMap<Network, cosmrs::AccountId, H>,
+    mixnet_contract_address: HashMap<Network, Option<cosmrs::AccountId>, H>,
 ) -> impl Iterator<Item = ClientForConnectionTest> {
     let nymd_connection_test_clients = nymd_urls.filter_map(move |(network, url)| {
         let address = mixnet_contract_address
             .get(&network)
             .expect("No configured contract address")
             .clone();
-        NymdClient::<QueryNymdClient>::connect(url.as_str())
-            .map(|client| client.with_mixnet_contract_address(address))
+        NymdClient::<QueryNymdClient>::connect(url.as_str(), address, None, None)
             .map(move |client| ClientForConnectionTest::Nymd(network, url, Box::new(client)))
             .ok()
     });

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

@@ -1,130 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-use serde::{Deserialize, Serialize};
-use std::fmt;
-
-pub use cosmrs::Coin as CosmosCoin;
-pub use cosmwasm_std::Coin as CosmWasmCoin;
-
-#[derive(Serialize, Deserialize, Clone, Copy, Default, Debug, PartialEq)]
-pub struct MismatchedDenoms;
-
-// the reason the coin is created here as opposed to different place in the codebase is that
-// eventually we want to either publish the cosmwasm client separately or commit it to
-// some other project, like cosmrs. Either way, in that case we can't really have
-// a dependency on an internal type
-#[derive(Serialize, Deserialize, Clone, Default, Debug, PartialEq)]
-pub struct Coin {
-    pub amount: u128,
-    pub denom: String,
-}
-
-impl Coin {
-    pub fn new<S: Into<String>>(amount: u128, denom: S) -> Self {
-        Coin {
-            amount,
-            denom: denom.into(),
-        }
-    }
-
-    pub fn try_add(&self, other: &Self) -> Result<Self, MismatchedDenoms> {
-        if self.denom != other.denom {
-            Err(MismatchedDenoms)
-        } else {
-            Ok(Coin {
-                amount: self.amount + other.amount,
-                denom: self.denom.clone(),
-            })
-        }
-    }
-}
-
-impl fmt::Display for Coin {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}{}", self.amount, self.denom)
-    }
-}
-
-impl From<Coin> for CosmosCoin {
-    fn from(coin: Coin) -> Self {
-        assert!(
-            coin.amount <= u64::MAX as u128,
-            "the coin amount is higher than the maximum supported by cosmrs"
-        );
-
-        CosmosCoin {
-            denom: coin
-                .denom
-                .parse()
-                .expect("the coin should have had a valid denom!"),
-            amount: (coin.amount as u64).into(),
-        }
-    }
-}
-
-impl From<CosmosCoin> for Coin {
-    fn from(coin: CosmosCoin) -> Self {
-        Coin {
-            amount: coin
-                .amount
-                .to_string()
-                .parse()
-                .expect("somehow failed to parse string representation of u64"),
-            denom: coin.denom.to_string(),
-        }
-    }
-}
-
-impl From<Coin> for CosmWasmCoin {
-    fn from(coin: Coin) -> Self {
-        CosmWasmCoin::new(coin.amount, coin.denom)
-    }
-}
-
-impl From<CosmWasmCoin> for Coin {
-    fn from(coin: CosmWasmCoin) -> Self {
-        Coin {
-            amount: coin.amount.u128(),
-            denom: coin.denom,
-        }
-    }
-}
-
-pub trait CoinConverter {
-    type Target;
-
-    fn convert_coin(&self) -> Self::Target;
-}
-
-impl CoinConverter for CosmosCoin {
-    type Target = CosmWasmCoin;
-
-    fn convert_coin(&self) -> Self::Target {
-        CosmWasmCoin::new(
-            self.amount
-                .to_string()
-                .parse()
-                .expect("cosmos coin had an invalid amount assigned"),
-            self.denom.to_string(),
-        )
-    }
-}
-
-impl CoinConverter for CosmWasmCoin {
-    type Target = CosmosCoin;
-
-    fn convert_coin(&self) -> Self::Target {
-        assert!(
-            self.amount.u128() <= u64::MAX as u128,
-            "the coin amount is higher than the maximum supported by cosmrs"
-        );
-
-        CosmosCoin {
-            denom: self
-                .denom
-                .parse()
-                .expect("cosmwasm coin had an invalid amount assigned"),
-            amount: (self.amount.u128() as u64).into(),
-        }
-    }
-}

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

@@ -1,7 +1,6 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd::coin::Coin;
 use crate::nymd::cosmwasm_client::helpers::{create_pagination, next_page_key};
 use crate::nymd::cosmwasm_client::types::{
     Account, Code, CodeDetails, Contract, ContractCodeHistoryEntry, ContractCodeId,
@@ -26,7 +25,8 @@ use cosmrs::rpc::{self, HttpClient, Order};
 use cosmrs::tendermint::abci::Code as AbciCode;
 use cosmrs::tendermint::abci::Transaction;
 use cosmrs::tendermint::{abci, block, chain};
-use cosmrs::{tx, AccountId, Coin as CosmosCoin, Denom, Tx};
+use cosmrs::{tx, AccountId, Coin, Denom, Tx};
+use cosmwasm_std::Coin as CosmWasmCoin;
 use prost::Message;
 use serde::{Deserialize, Serialize};
 use std::convert::{TryFrom, TryInto};
@@ -135,7 +135,7 @@ pub trait CosmWasmClient: rpc::Client {
             .await?;
 
         res.balance
-            .map(|proto| CosmosCoin::try_from(proto).map(Into::into))
+            .map(TryFrom::try_from)
             .transpose()
             .map_err(|_| NymdError::SerializationError("Coin".to_owned()))
     }
@@ -166,12 +166,16 @@ pub trait CosmWasmClient: rpc::Client {
 
         raw_balances
             .into_iter()
-            .map(|proto| CosmosCoin::try_from(proto).map(Into::into))
+            .map(TryFrom::try_from)
             .collect::<Result<_, _>>()
             .map_err(|_| NymdError::SerializationError("Coins".to_owned()))
     }
 
-    async fn get_total_supply(&self) -> Result<Vec<Coin>, NymdError> {
+    // this is annoyingly and inconsistently returning `Vec<CosmWasmCoin>` rather than
+    // Vec<Coin>, since cosmrs::Coin can't deal with IBC denoms.
+    // Presumably after https://github.com/cosmos/cosmos-rust/issues/173 is resolved,
+    // the code could be adjusted
+    async fn get_total_supply(&self) -> Result<Vec<CosmWasmCoin>, NymdError> {
         let path = Some("/cosmos.bank.v1beta1.Query/TotalSupply".parse().unwrap());
 
         let mut supply = Vec::new();
@@ -194,7 +198,12 @@ pub trait CosmWasmClient: rpc::Client {
 
         supply
             .into_iter()
-            .map(|proto| CosmosCoin::try_from(proto).map(Into::into))
+            .map(|coin| {
+                coin.amount.parse().map(|amount| CosmWasmCoin {
+                    denom: coin.denom,
+                    amount,
+                })
+            })
             .collect::<Result<_, _>>()
             .map_err(|_| NymdError::SerializationError("Coins".to_owned()))
     }
@@ -474,9 +483,6 @@ pub trait CosmWasmClient: rpc::Client {
     // deprecation warning is due to the fact the protobuf files built were based on cosmos-sdk 0.44,
     // where they prefer using tx_bytes directly. However, in 0.42, which we are using at the time
     // of writing this, the option does not work
-    // TODO: we should really stop using the `tx` argument here and use `tx_bytes` exlusively,
-    // however, at the time of writing this update, while our QA and mainnet networks do support it,
-    // sandbox is still running old version of wasmd that lacks support for `tx_bytes`
     #[allow(deprecated)]
     async fn query_simulate(
         &self,

common/client-libs/validator-client/src/nymd/cosmwasm_client/helpers.rs

@@ -68,7 +68,6 @@ pub(crate) fn create_pagination(key: Vec<u8>) -> PageRequest {
         offset: 0,
         limit: 0,
         count_total: false,
-        reverse: false,
     }
 }
 

common/client-libs/validator-client/src/nymd/cosmwasm_client/logs.rs

@@ -4,11 +4,11 @@
 use crate::nymd::error::NymdError;
 use cosmrs::tendermint::abci;
 use itertools::Itertools;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 // it seems that currently validators just emit stringified events (which are also returned as part of deliverTx response)
 // as theirs logs
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Deserialize)]
 pub struct Log {
     #[serde(default)]
     // weird thing is that the first msg_index seems to always be undefined on the raw logs
@@ -22,7 +22,7 @@ pub struct Log {
 
 /// Searches in logs for the first event of the given event type and in that event
 /// for the first attribute with the given attribute key.
-pub fn find_attribute<'a>(
+pub(crate) fn find_attribute<'a>(
     logs: &'a [Log],
     event_type: &str,
     attribute_key: &str,

common/client-libs/validator-client/src/nymd/cosmwasm_client/signing_client.rs

@@ -1,14 +1,9 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd::cosmwasm_client::client::CosmWasmClient;
-use crate::nymd::cosmwasm_client::helpers::{compress_wasm_code, CheckResponse};
-use crate::nymd::cosmwasm_client::logs::{self, parse_raw_logs};
-use crate::nymd::cosmwasm_client::types::*;
-use crate::nymd::error::NymdError;
-use crate::nymd::fee::{Fee, DEFAULT_SIMULATED_GAS_MULTIPLIER};
-use crate::nymd::wallet::DirectSecp256k1HdWallet;
-use crate::nymd::{Coin, GasPrice, TxResponse};
+use std::convert::TryInto;
+use std::time::Duration;
+
 use async_trait::async_trait;
 use cosmrs::bank::MsgSend;
 use cosmrs::distribution::MsgWithdrawDelegatorReward;
@@ -17,40 +12,33 @@ use cosmrs::rpc::endpoint::broadcast;
 use cosmrs::rpc::{Error as TendermintRpcError, HttpClient, HttpClientUrl, SimpleRequest};
 use cosmrs::staking::{MsgDelegate, MsgUndelegate};
 use cosmrs::tx::{self, Msg, SignDoc, SignerInfo};
-use cosmrs::{cosmwasm, rpc, AccountId, Any, Tx};
+use cosmrs::{cosmwasm, rpc, AccountId, Any, Coin, Tx};
 use log::debug;
 use serde::Serialize;
 use sha2::Digest;
 use sha2::Sha256;
-use std::convert::TryInto;
-use std::time::Duration;
+
+use crate::nymd::cosmwasm_client::client::CosmWasmClient;
+use crate::nymd::cosmwasm_client::helpers::{compress_wasm_code, CheckResponse};
+use crate::nymd::cosmwasm_client::logs::{self, parse_raw_logs};
+use crate::nymd::cosmwasm_client::types::*;
+use crate::nymd::error::NymdError;
+use crate::nymd::fee::{Fee, DEFAULT_SIMULATED_GAS_MULTIPLIER};
+use crate::nymd::wallet::DirectSecp256k1HdWallet;
+use crate::nymd::{CosmosCoin, GasPrice, TxResponse};
+
+// we need to have **a** valid secp256k1 signature for simulation purposes.
+// it doesn't matter what it is as long as it parses correctly
+const DUMMY_SECP256K1_SIGNATURE: &[u8] = &[
+    54, 167, 169, 61, 100, 173, 231, 87, 1, 113, 179, 49, 102, 141, 67, 22, 170, 153, 52, 88, 178,
+    159, 200, 11, 37, 138, 76, 221, 187, 70, 104, 123, 98, 216, 190, 249, 149, 81, 1, 158, 0, 220,
+    32, 147, 101, 60, 64, 77, 44, 83, 221, 119, 170, 124, 109, 177, 73, 116, 46, 57, 102, 181, 98,
+    91,
+];
 
 const DEFAULT_BROADCAST_POLLING_RATE: Duration = Duration::from_secs(4);
 const DEFAULT_BROADCAST_TIMEOUT: Duration = Duration::from_secs(60);
 
-fn empty_fee() -> tx::Fee {
-    tx::Fee {
-        amount: vec![],
-        gas_limit: Default::default(),
-        payer: None,
-        granter: None,
-    }
-}
-
-fn single_unspecified_signer_auth(
-    public_key: Option<tx::SignerPublicKey>,
-    sequence_number: tx::SequenceNumber,
-) -> tx::AuthInfo {
-    tx::SignerInfo {
-        public_key,
-        mode_info: tx::ModeInfo::Single(tx::mode_info::Single {
-            mode: SignMode::Unspecified,
-        }),
-        sequence: sequence_number,
-    }
-    .auth_info(empty_fee())
-}
-
 #[async_trait]
 pub trait SigningCosmWasmClient: CosmWasmClient {
     fn signer(&self) -> &DirectSecp256k1HdWallet;
@@ -76,21 +64,33 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         let sequence_response = self.get_sequence(signer_address).await?;
 
         let partial_tx = Tx {
-            body: tx::Body::new(messages, memo, 0u32),
-            auth_info: single_unspecified_signer_auth(public_key, sequence_response.sequence),
-            signatures: vec![Vec::new()],
+            body: tx::Body {
+                messages,
+                memo: memo.into(),
+                timeout_height: 0u32.into(),
+                extension_options: vec![],
+                non_critical_extension_options: vec![],
+            },
+            auth_info: tx::AuthInfo {
+                signer_infos: vec![tx::SignerInfo {
+                    public_key,
+                    mode_info: tx::ModeInfo::Single(tx::mode_info::Single {
+                        mode: SignMode::Unspecified,
+                    }),
+                    sequence: sequence_response.sequence,
+                }],
+                fee: tx::Fee::from_amount_and_gas(
+                    CosmosCoin {
+                        denom: "".parse().unwrap(),
+                        amount: 0u64.into(),
+                    },
+                    0,
+                ),
+            },
+            signatures: vec![DUMMY_SECP256K1_SIGNATURE.try_into().unwrap()],
         };
-        self.query_simulate(Some(partial_tx), Vec::new()).await
 
-        // for completion sake, once we're able to transition into using `tx_bytes`,
-        // we might want to use something like this instead:
-        // let tx_raw: tx::Raw = cosmrs::proto::cosmos::tx::v1beta1::TxRaw {
-        //     body_bytes: partial_tx.body.into_bytes().unwrap(),
-        //     auth_info_bytes: partial_tx.auth_info.into_bytes().unwrap(),
-        //     signatures: partial_tx.signatures,
-        // }
-        // .into();
-        // self.query_simulate(None, tx_raw.to_bytes().unwrap()).await
+        self.query_simulate(Some(partial_tx), Vec::new()).await
     }
 
     async fn upload(
@@ -310,7 +310,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
             sender: sender_address.clone(),
             contract: contract_address.clone(),
             msg: serde_json::to_vec(msg)?,
-            funds: funds.into_iter().map(Into::into).collect(),
+            funds,
         }
         .to_any()
         .map_err(|_| NymdError::SerializationError("MsgExecuteContract".to_owned()))?;
@@ -349,7 +349,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
                     sender: sender_address.clone(),
                     contract: contract_address.clone(),
                     msg: serde_json::to_vec(&msg)?,
-                    funds: funds.into_iter().map(Into::into).collect(),
+                    funds,
                 }
                 .to_any()
                 .map_err(|_| NymdError::SerializationError("MsgExecuteContract".to_owned()))
@@ -382,7 +382,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         let send_msg = MsgSend {
             from_address: sender_address.clone(),
             to_address: recipient_address.clone(),
-            amount: amount.into_iter().map(Into::into).collect(),
+            amount,
         }
         .to_any()
         .map_err(|_| NymdError::SerializationError("MsgSend".to_owned()))?;
@@ -408,7 +408,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
                 MsgSend {
                     from_address: sender_address.clone(),
                     to_address,
-                    amount: amount.into_iter().map(Into::into).collect(),
+                    amount,
                 }
                 .to_any()
                 .map_err(|_| NymdError::SerializationError("MsgExecuteContract".to_owned()))
@@ -431,7 +431,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         let delegate_msg = MsgDelegate {
             delegator_address: delegator_address.to_owned(),
             validator_address: validator_address.to_owned(),
-            amount: amount.into(),
+            amount,
         }
         .to_any()
         .map_err(|_| NymdError::SerializationError("MsgDelegate".to_owned()))?;
@@ -452,7 +452,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         let undelegate_msg = MsgUndelegate {
             delegator_address: delegator_address.to_owned(),
             validator_address: validator_address.to_owned(),
-            amount: amount.into(),
+            amount: Some(amount),
         }
         .to_any()
         .map_err(|_| NymdError::SerializationError("MsgUndelegate".to_owned()))?;

common/client-libs/validator-client/src/nymd/cosmwasm_client/types.rs

@@ -28,7 +28,7 @@ use cosmrs::proto::cosmwasm::wasm::v1::{
 use cosmrs::tendermint::abci::Data;
 use cosmrs::tendermint::{abci, chain};
 use cosmrs::tx::{AccountNumber, Gas, SequenceNumber};
-use cosmrs::{tx, AccountId, Any, Coin as CosmosCoin};
+use cosmrs::{tx, AccountId, Any, Coin};
 use prost::Message;
 use serde::Serialize;
 use std::convert::{TryFrom, TryInto};
@@ -107,9 +107,9 @@ impl TryFrom<ProtoModuleAccount> for ModuleAccount {
 #[derive(Debug)]
 pub struct BaseVestingAccount {
     pub base_account: Option<BaseAccount>,
-    pub original_vesting: Vec<CosmosCoin>,
-    pub delegated_free: Vec<CosmosCoin>,
-    pub delegated_vesting: Vec<CosmosCoin>,
+    pub original_vesting: Vec<Coin>,
+    pub delegated_free: Vec<Coin>,
+    pub delegated_vesting: Vec<Coin>,
     pub end_time: i64,
 }
 
@@ -184,7 +184,7 @@ impl TryFrom<ProtoDelayedVestingAccount> for DelayedVestingAccount {
 #[derive(Debug)]
 pub struct Period {
     pub length: i64,
-    pub amount: Vec<CosmosCoin>,
+    pub amount: Vec<Coin>,
 }
 
 impl TryFrom<ProtoPeriod> for Period {
@@ -489,7 +489,7 @@ impl TryFrom<ProtoContractCodeHistoryEntry> for ContractCodeHistoryEntry {
     }
 }
 
-#[derive(Copy, Clone, Debug, Default, Eq, PartialEq)]
+#[derive(Debug)]
 pub struct GasInfo {
     /// GasWanted is the maximum units of work we allow this tx to perform.
     pub gas_wanted: Gas,
@@ -628,7 +628,7 @@ pub struct InstantiateOptions {
     /// created and before the instantiation message is executed by the contract.
     ///
     /// Only native tokens are supported.
-    pub funds: Vec<CosmosCoin>,
+    pub funds: Vec<Coin>,
 
     /// A bech32 encoded address of an admin account.
     /// Caution: an admin has the privilege to upgrade a contract.
@@ -636,15 +636,6 @@ pub struct InstantiateOptions {
     pub admin: Option<AccountId>,
 }
 
-impl InstantiateOptions {
-    pub fn new<T: Into<CosmosCoin>>(funds: Vec<T>, admin: Option<AccountId>) -> Self {
-        InstantiateOptions {
-            funds: funds.into_iter().map(Into::into).collect(),
-            admin,
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct InstantiateResult {
     /// The address of the newly instantiated contract

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

@@ -21,12 +21,9 @@ pub enum NymdError {
     #[error("There was an issue with bip32 - {0}")]
     Bip32Error(#[from] bip32::Error),
 
-    #[error("There was an issue with bip39 - {0}")]
+    #[error("There was an issue with bip32 - {0}")]
     Bip39Error(#[from] bip39::Error),
 
-    #[error("There was an issue on the cosmrs side - {0}")]
-    CosmrsError(#[from] cosmrs::Error),
-
     #[error("Failed to derive account address")]
     AccountDerivationError,
 
@@ -42,10 +39,10 @@ pub enum NymdError {
     #[error("There was an issue with a tendermint RPC request - {0}")]
     TendermintError(#[from] TendermintRpcError),
 
-    #[error("There was an issue when attempting to serialize data ({0})")]
+    #[error("There was an issue when attempting to serialize data")]
     SerializationError(String),
 
-    #[error("There was an issue when attempting to deserialize data ({0})")]
+    #[error("There was an issue when attempting to deserialize data")]
     DeserializationError(String),
 
     #[error("There was an issue when attempting to encode our protobuf data - {0}")]
@@ -124,12 +121,6 @@ pub enum NymdError {
 
     #[error("Transaction with ID {hash} has been submitted but not yet found on the chain. You might want to check for it later. There was a total wait of {} seconds", .timeout.as_secs())]
     BroadcastTimeout { hash: tx::Hash, timeout: Duration },
-
-    #[error("Cosmwasm std error: {0}")]
-    CosmwasmStdError(#[from] cosmwasm_std::StdError),
-
-    #[error("Coconut interface error: {0}")]
-    CoconutInterfaceError(#[from] coconut_interface::error::CoconutInterfaceError),
 }
 
 impl NymdError {

common/client-libs/validator-client/src/nymd/fee/gas_price.rs

@@ -4,7 +4,7 @@
 use crate::nymd::error::NymdError;
 use config::defaults;
 use cosmrs::tx::Gas;
-use cosmrs::Coin;
+use cosmrs::{Coin, Denom};
 use cosmwasm_std::{Decimal, Fraction, Uint128};
 use std::ops::Mul;
 use std::str::FromStr;
@@ -13,12 +13,11 @@ use std::str::FromStr;
 /// the smallest fee token unit, such as 0.012utoken.
 #[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
 pub struct GasPrice {
-    // I really dislike the usage of cosmwasm Decimal, but I didn't feel like implementing
-    // our own maths subcrate just for the purposes of calculating gas requirements
-    // this should definitely be rectified later on
+    // I really hate the combination of cosmwasm Decimal with cosmos-sdk Denom,
+    // but cosmos-sdk's Decimal is too basic for our needs
     pub amount: Decimal,
 
-    pub denom: String,
+    pub denom: Denom,
 }
 
 impl<'a> Mul<Gas> for &'a GasPrice {
@@ -45,10 +44,7 @@ impl<'a> Mul<Gas> for &'a GasPrice {
 
         assert!(amount.u128() <= u64::MAX as u128);
         Coin {
-            denom: self
-                .denom
-                .parse()
-                .expect("the gas price has been created with invalid denom"),
+            denom: self.denom.clone(),
             amount: (amount.u128() as u64).into(),
         }
     }
@@ -67,7 +63,9 @@ impl FromStr for GasPrice {
             .parse()
             .map_err(|_| NymdError::MalformedGasPrice)?;
         let possible_denom = s.chars().skip(amount_len).collect::<String>();
-        let denom = possible_denom.trim().to_string();
+        let denom = possible_denom
+            .parse()
+            .map_err(|_| NymdError::MalformedGasPrice)?;
 
         Ok(GasPrice { amount, denom })
     }
@@ -108,14 +106,8 @@ mod tests {
         );
 
         assert!(".25upunk".parse::<GasPrice>().is_err());
-
-        assert_eq!(
-            "0.025upunk".parse::<GasPrice>().unwrap(),
-            "0.025 upunk".parse().unwrap()
-        );
-
-        let gas: GasPrice = "0.025   upunk    ".parse().unwrap();
-        assert_eq!("upunk", gas.denom);
+        assert!("0.025 upunk".parse::<GasPrice>().is_err());
+        assert!("0.025UPUNK".parse::<GasPrice>().is_err());
     }
 
     #[test]

common/client-libs/validator-client/src/nymd/fee/helpers.rs

@@ -0,0 +1,195 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::nymd::GasPrice;
+use cosmrs::tx::{Fee, Gas};
+use cosmrs::Coin;
+use serde::{Deserialize, Serialize};
+use std::fmt;
+
+#[cfg_attr(test, derive(ts_rs::TS))]
+#[cfg_attr(
+    test,
+    ts(export, export_to = "../../../nym-wallet/src/types/rust/operation.ts")
+)]
+#[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Serialize, Deserialize)]
+pub enum Operation {
+    Upload,
+    Init,
+    Migrate,
+    ChangeAdmin,
+    Send,
+
+    BondMixnode,
+    BondMixnodeOnBehalf,
+    UnbondMixnode,
+    UnbondMixnodeOnBehalf,
+    UpdateMixnodeConfig,
+    DelegateToMixnode,
+    DelegateToMixnodeOnBehalf,
+    UndelegateFromMixnode,
+    UndelegateFromMixnodeOnBehalf,
+
+    BondGateway,
+    BondGatewayOnBehalf,
+    UnbondGateway,
+    UnbondGatewayOnBehalf,
+
+    UpdateContractSettings,
+
+    BeginMixnodeRewarding,
+    FinishMixnodeRewarding,
+
+    TrackUnbondGateway,
+    TrackUnbondMixnode,
+    WithdrawVestedCoins,
+    TrackUndelegation,
+    CreatePeriodicVestingAccount,
+
+    AdvanceCurrentInterval,
+    AdvanceCurrentEpoch,
+    WriteRewardedSet,
+    ClearRewardedSet,
+    UpdateMixnetAddress,
+    CheckpointMixnodes,
+    ReconcileDelegations,
+}
+
+pub(crate) fn calculate_fee(gas_price: &GasPrice, gas_limit: Gas) -> Coin {
+    gas_price * gas_limit
+}
+
+impl fmt::Display for Operation {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match *self {
+            Operation::Upload => f.write_str("Upload"),
+            Operation::Init => f.write_str("Init"),
+            Operation::Migrate => f.write_str("Migrate"),
+            Operation::ChangeAdmin => f.write_str("ChangeAdmin"),
+            Operation::Send => f.write_str("Send"),
+            Operation::BondMixnode => f.write_str("BondMixnode"),
+            Operation::BondMixnodeOnBehalf => f.write_str("BondMixnodeOnBehalf"),
+            Operation::UnbondMixnode => f.write_str("UnbondMixnode"),
+            Operation::UpdateMixnodeConfig => f.write_str("UpdateMixnodeConfig"),
+            Operation::UnbondMixnodeOnBehalf => f.write_str("UnbondMixnodeOnBehalf"),
+            Operation::BondGateway => f.write_str("BondGateway"),
+            Operation::BondGatewayOnBehalf => f.write_str("BondGatewayOnBehalf"),
+            Operation::UnbondGateway => f.write_str("UnbondGateway"),
+            Operation::UnbondGatewayOnBehalf => f.write_str("UnbondGatewayOnBehalf"),
+            Operation::DelegateToMixnode => f.write_str("DelegateToMixnode"),
+            Operation::DelegateToMixnodeOnBehalf => f.write_str("DelegateToMixnodeOnBehalf"),
+            Operation::UndelegateFromMixnode => f.write_str("UndelegateFromMixnode"),
+            Operation::UndelegateFromMixnodeOnBehalf => {
+                f.write_str("UndelegateFromMixnodeOnBehalf")
+            }
+            Operation::UpdateContractSettings => f.write_str("UpdateContractSettings"),
+            Operation::BeginMixnodeRewarding => f.write_str("BeginMixnodeRewarding"),
+            Operation::FinishMixnodeRewarding => f.write_str("FinishMixnodeRewarding"),
+            Operation::TrackUnbondGateway => f.write_str("TrackUnbondGateway"),
+            Operation::TrackUnbondMixnode => f.write_str("TrackUnbondMixnode"),
+            Operation::WithdrawVestedCoins => f.write_str("WithdrawVestedCoins"),
+            Operation::TrackUndelegation => f.write_str("TrackUndelegation"),
+            Operation::CreatePeriodicVestingAccount => f.write_str("CreatePeriodicVestingAccount"),
+            Operation::AdvanceCurrentInterval => f.write_str("AdvanceCurrentInterval"),
+            Operation::WriteRewardedSet => f.write_str("WriteRewardedSet"),
+            Operation::ClearRewardedSet => f.write_str("ClearRewardedSet"),
+            Operation::UpdateMixnetAddress => f.write_str("UpdateMixnetAddress"),
+            Operation::CheckpointMixnodes => f.write_str("CheckpointMixnodes"),
+            Operation::ReconcileDelegations => f.write_str("ReconcileDelegations"),
+            Operation::AdvanceCurrentEpoch => f.write_str("AdvanceCurrentEpoch"),
+        }
+    }
+}
+
+impl Operation {
+    // TODO: some value tweaking
+    pub fn default_gas_limit(&self) -> Gas {
+        match self {
+            Operation::Upload => 3_000_000u64.into(),
+            Operation::Init => 500_000u64.into(),
+            Operation::Migrate => 200_000u64.into(),
+            Operation::ChangeAdmin => 80_000u64.into(),
+            Operation::Send => 80_000u64.into(),
+
+            Operation::BondMixnode => 175_000u64.into(),
+            Operation::BondMixnodeOnBehalf => 200_000u64.into(),
+            Operation::UnbondMixnode => 175_000u64.into(),
+            Operation::UnbondMixnodeOnBehalf => 175_000u64.into(),
+            Operation::UpdateMixnodeConfig => 175_000u64.into(),
+            Operation::DelegateToMixnode => 175_000u64.into(),
+            Operation::DelegateToMixnodeOnBehalf => 175_000u64.into(),
+            Operation::UndelegateFromMixnode => 175_000u64.into(),
+            Operation::UndelegateFromMixnodeOnBehalf => 175_000u64.into(),
+
+            Operation::BondGateway => 175_000u64.into(),
+            Operation::BondGatewayOnBehalf => 200_000u64.into(),
+            Operation::UnbondGateway => 175_000u64.into(),
+            Operation::UnbondGatewayOnBehalf => 200_000u64.into(),
+
+            Operation::UpdateContractSettings => 175_000u64.into(),
+            Operation::BeginMixnodeRewarding => 175_000u64.into(),
+            Operation::FinishMixnodeRewarding => 175_000u64.into(),
+            Operation::TrackUnbondGateway => 175_000u64.into(),
+            Operation::TrackUnbondMixnode => 175_000u64.into(),
+            Operation::WithdrawVestedCoins => 175_000u64.into(),
+            Operation::TrackUndelegation => 175_000u64.into(),
+            Operation::CreatePeriodicVestingAccount => 175_000u64.into(),
+            Operation::AdvanceCurrentInterval => 175_000u64.into(),
+            Operation::WriteRewardedSet => 175_000u64.into(),
+            Operation::ClearRewardedSet => 175_000u64.into(),
+            Operation::UpdateMixnetAddress => 80_000u64.into(),
+            Operation::CheckpointMixnodes => 175_000u64.into(),
+            Operation::ReconcileDelegations => 500_000u64.into(),
+            Operation::AdvanceCurrentEpoch => 175_000u64.into(),
+        }
+    }
+
+    pub(crate) fn determine_custom_fee(gas_price: &GasPrice, gas_limit: Gas) -> Fee {
+        // we need to know 2 of the following 3 parameters (the third one is being implicit) in order to construct Fee:
+        // (source: https://docs.cosmos.network/v0.42/basics/gas-fees.html)
+        // - gas price
+        // - gas limit
+        // - fees
+        let fee = calculate_fee(gas_price, gas_limit);
+        Fee::from_amount_and_gas(fee, gas_limit)
+    }
+
+    pub fn default_fee(&self, gas_price: &GasPrice) -> Fee {
+        Self::determine_custom_fee(gas_price, self.default_gas_limit())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn calculating_fee() {
+        let expected = Coin {
+            denom: "upunk".parse().unwrap(),
+            amount: 1000u64.into(),
+        };
+        let gas_price = "1upunk".parse().unwrap();
+        let gas_limit = 1000u64.into();
+
+        assert_eq!(expected, calculate_fee(&gas_price, gas_limit));
+
+        let expected = Coin {
+            denom: "upunk".parse().unwrap(),
+            amount: 50u64.into(),
+        };
+        let gas_price = "0.05upunk".parse().unwrap();
+        let gas_limit = 1000u64.into();
+
+        assert_eq!(expected, calculate_fee(&gas_price, gas_limit));
+
+        let expected = Coin {
+            denom: "upunk".parse().unwrap(),
+            amount: 100000u64.into(),
+        };
+        let gas_price = "100upunk".parse().unwrap();
+        let gas_limit = 1000u64.into();
+
+        assert_eq!(expected, calculate_fee(&gas_price, gas_limit))
+    }
+}

common/client-libs/validator-client/src/nymd/fee/mod.rs

@@ -2,15 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use cosmrs::tx;
-use serde::{Deserialize, Serialize};
 
 pub mod gas_price;
+pub mod helpers;
 
 pub const DEFAULT_SIMULATED_GAS_MULTIPLIER: f32 = 1.3;
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone)]
 pub enum Fee {
-    Manual(#[serde(with = "sealed::TxFee")] tx::Fee),
+    Manual(tx::Fee),
     Auto(Option<f32>),
 }
 
@@ -31,91 +31,3 @@ impl Default for Fee {
         Fee::Auto(Some(DEFAULT_SIMULATED_GAS_MULTIPLIER))
     }
 }
-
-// a workaround to provide serde implementation for tx::Fee. We don't want to ever expose any of those
-// types to the public and ideally they will get replaced by proper implementation inside comrs
-mod sealed {
-    use cosmrs::tx::{self, Gas};
-    use cosmrs::Coin as CosmosCoin;
-    use cosmrs::{AccountId, Decimal as CosmosDecimal, Denom as CosmosDenom};
-    use serde::{Deserialize, Deserializer, Serialize, Serializer};
-
-    fn cosmos_denom_inner_getter(val: &CosmosDenom) -> String {
-        val.as_ref().to_string()
-    }
-
-    #[derive(Serialize, Deserialize)]
-    #[serde(remote = "CosmosDenom")]
-    struct Denom(#[serde(getter = "cosmos_denom_inner_getter")] String);
-
-    impl From<Denom> for CosmosDenom {
-        fn from(val: Denom) -> Self {
-            val.0.parse().unwrap()
-        }
-    }
-
-    fn cosmos_decimal_inner_getter(val: &CosmosDecimal) -> u64 {
-        // haha, this code is so disgusting. I'll make a PR on cosmrs to slightly alleviate those issues...
-        // note: unwrap here is fine as the to_string is just returning a stringified u64 which, well, is a valid u64
-        val.to_string().parse().unwrap()
-    }
-
-    // at the time of writing it the current cosmrs' Decimal is extremely limited...
-    #[derive(Serialize, Deserialize)]
-    #[serde(remote = "CosmosDecimal")]
-    struct Decimal(#[serde(getter = "cosmos_decimal_inner_getter")] u64);
-
-    impl From<Decimal> for CosmosDecimal {
-        fn from(val: Decimal) -> Self {
-            val.0.into()
-        }
-    }
-
-    #[derive(Serialize, Deserialize, Clone)]
-    struct Coin {
-        #[serde(with = "Denom")]
-        denom: CosmosDenom,
-        #[serde(with = "Decimal")]
-        amount: CosmosDecimal,
-    }
-
-    impl From<Coin> for CosmosCoin {
-        fn from(val: Coin) -> Self {
-            CosmosCoin {
-                denom: val.denom,
-                amount: val.amount,
-            }
-        }
-    }
-
-    impl From<CosmosCoin> for Coin {
-        fn from(val: CosmosCoin) -> Self {
-            Coin {
-                denom: val.denom,
-                amount: val.amount,
-            }
-        }
-    }
-
-    fn coin_vec_ser<S: Serializer>(val: &[CosmosCoin], serializer: S) -> Result<S::Ok, S::Error> {
-        let vec: Vec<Coin> = val.iter().cloned().map(Into::into).collect();
-        vec.serialize(serializer)
-    }
-    fn coin_vec_deser<'de, D: Deserializer<'de>>(
-        deserializer: D,
-    ) -> Result<Vec<CosmosCoin>, D::Error> {
-        let vec: Vec<Coin> = Deserialize::deserialize(deserializer)?;
-        Ok(vec.iter().cloned().map(Into::into).collect())
-    }
-
-    #[derive(Serialize, Deserialize)]
-    #[serde(remote = "tx::Fee")]
-    pub(super) struct TxFee {
-        #[serde(serialize_with = "coin_vec_ser")]
-        #[serde(deserialize_with = "coin_vec_deser")]
-        pub amount: Vec<CosmosCoin>,
-        pub gas_limit: Gas,
-        pub payer: Option<AccountId>,
-        pub granter: Option<AccountId>,
-    }
-}

common/client-libs/validator-client/src/nymd/traits/coconut_bandwidth_signing_client.rs

@@ -1,49 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-pub use crate::nymd::cosmwasm_client::signing_client::SigningCosmWasmClient;
-use crate::nymd::cosmwasm_client::types::ExecuteResult;
-use crate::nymd::error::NymdError;
-use crate::nymd::{Coin, Fee, NymdClient};
-use coconut_bandwidth_contract_common::{deposit::DepositData, msg::ExecuteMsg};
-
-use async_trait::async_trait;
-
-#[async_trait]
-pub trait CoconutBandwidthSigningClient {
-    async fn deposit(
-        &self,
-        amount: Coin,
-        info: String,
-        verification_key: String,
-        encryption_key: String,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
-}
-
-#[async_trait]
-impl<C: SigningCosmWasmClient + Sync + Send> CoconutBandwidthSigningClient for NymdClient<C> {
-    async fn deposit(
-        &self,
-        amount: Coin,
-        info: String,
-        verification_key: String,
-        encryption_key: String,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
-        let req = ExecuteMsg::DepositFunds {
-            data: DepositData::new(info.to_string(), verification_key, encryption_key),
-        };
-        self.client
-            .execute(
-                self.address(),
-                self.coconut_bandwidth_contract_address(),
-                &req,
-                fee,
-                "CoconutBandwidth::Deposit",
-                vec![amount],
-            )
-            .await
-    }
-}

common/client-libs/validator-client/src/nymd/traits/mod.rs

@@ -1,14 +1,8 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-mod coconut_bandwidth_signing_client;
-mod multisig_query_client;
-mod multisig_signing_client;
 mod vesting_query_client;
 mod vesting_signing_client;
 
-pub use coconut_bandwidth_signing_client::CoconutBandwidthSigningClient;
-pub use multisig_query_client::QueryClient;
-pub use multisig_signing_client::MultisigSigningClient;
 pub use vesting_query_client::VestingQueryClient;
 pub use vesting_signing_client::VestingSigningClient;

common/client-libs/validator-client/src/nymd/traits/multisig_query_client.rs

@@ -1,24 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::nymd::error::NymdError;
-use crate::nymd::{CosmWasmClient, NymdClient};
-
-use multisig_contract_common::msg::{ProposalResponse, QueryMsg};
-
-use async_trait::async_trait;
-
-#[async_trait]
-pub trait QueryClient {
-    async fn get_proposal(&self, proposal_id: u64) -> Result<ProposalResponse, NymdError>;
-}
-
-#[async_trait]
-impl<C: CosmWasmClient + Sync + Send> QueryClient for NymdClient<C> {
-    async fn get_proposal(&self, proposal_id: u64) -> Result<ProposalResponse, NymdError> {
-        let request = QueryMsg::Proposal { proposal_id };
-        self.client
-            .query_contract_smart(self.multisig_contract_address(), &request)
-            .await
-    }
-}

common/client-libs/validator-client/src/nymd/traits/multisig_signing_client.rs

@@ -1,116 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-pub use crate::nymd::cosmwasm_client::signing_client::SigningCosmWasmClient;
-use crate::nymd::cosmwasm_client::types::ExecuteResult;
-use crate::nymd::error::NymdError;
-use crate::nymd::{Fee, NymdClient};
-
-use coconut_bandwidth_contract_common::msg::ExecuteMsg as CoconutBandwidthExecuteMsg;
-use multisig_contract_common::msg::ExecuteMsg;
-
-use async_trait::async_trait;
-use cosmwasm_std::{to_binary, Coin, CosmosMsg, WasmMsg};
-use cw3::Vote;
-use network_defaults::DEFAULT_NETWORK;
-
-#[async_trait]
-pub trait MultisigSigningClient {
-    async fn propose_release_funds(
-        &self,
-        title: String,
-        blinded_serial_number: String,
-        voucher_value: u128,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
-
-    async fn vote_proposal(
-        &self,
-        proposal_id: u64,
-        yes: bool,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
-
-    async fn execute_proposal(
-        &self,
-        proposal_id: u64,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
-}
-
-#[async_trait]
-impl<C: SigningCosmWasmClient + Sync + Send> MultisigSigningClient for NymdClient<C> {
-    async fn propose_release_funds(
-        &self,
-        title: String,
-        blinded_serial_number: String,
-        voucher_value: u128,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
-        let release_funds_req = CoconutBandwidthExecuteMsg::ReleaseFunds {
-            funds: Coin::new(voucher_value, DEFAULT_NETWORK.denom()),
-        };
-        let release_funds_msg = CosmosMsg::Wasm(WasmMsg::Execute {
-            contract_addr: self.coconut_bandwidth_contract_address().to_string(),
-            msg: to_binary(&release_funds_req)?,
-            funds: vec![],
-        });
-        let req = ExecuteMsg::Propose {
-            title,
-            description: blinded_serial_number,
-            msgs: vec![release_funds_msg],
-            latest: None,
-        };
-        self.client
-            .execute(
-                self.address(),
-                self.multisig_contract_address(),
-                &req,
-                fee,
-                "Multisig::Propose::Execute::ReleaseFunds",
-                vec![],
-            )
-            .await
-    }
-
-    async fn vote_proposal(
-        &self,
-        proposal_id: u64,
-        vote_yes: bool,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
-        let vote = if vote_yes { Vote::Yes } else { Vote::No };
-        let req = ExecuteMsg::Vote { proposal_id, vote };
-        self.client
-            .execute(
-                self.address(),
-                self.multisig_contract_address(),
-                &req,
-                fee,
-                "Multisig::Vote",
-                vec![],
-            )
-            .await
-    }
-
-    async fn execute_proposal(
-        &self,
-        proposal_id: u64,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
-        let req = ExecuteMsg::Execute { proposal_id };
-        self.client
-            .execute(
-                self.address(),
-                self.multisig_contract_address(),
-                &req,
-                fee,
-                "Multisig::Execute",
-                vec![],
-            )
-            .await
-    }
-}

common/client-libs/validator-client/src/nymd/traits/vesting_query_client.rs

@@ -1,12 +1,11 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd::coin::Coin;
 pub use crate::nymd::cosmwasm_client::client::CosmWasmClient;
 use crate::nymd::error::NymdError;
 use crate::nymd::NymdClient;
 use async_trait::async_trait;
-use cosmwasm_std::{Coin as CosmWasmCoin, Timestamp};
+use cosmwasm_std::{Coin, Timestamp};
 use vesting_contract::vesting::Account;
 use vesting_contract_common::{
     messages::QueryMsg as VestingQueryMsg, OriginalVestingResponse, Period, PledgeData,
@@ -84,9 +83,8 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
             block_time,
         };
         self.client
-            .query_contract_smart::<_, CosmWasmCoin>(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
             .await
-            .map(Into::into)
     }
 
     async fn spendable_coins(
@@ -99,9 +97,8 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
             block_time,
         };
         self.client
-            .query_contract_smart::<_, CosmWasmCoin>(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
             .await
-            .map(Into::into)
     }
     async fn vested_coins(
         &self,
@@ -113,9 +110,8 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
             block_time,
         };
         self.client
-            .query_contract_smart::<_, CosmWasmCoin>(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
             .await
-            .map(Into::into)
     }
     async fn vesting_coins(
         &self,
@@ -127,9 +123,8 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
             block_time,
         };
         self.client
-            .query_contract_smart::<_, CosmWasmCoin>(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
             .await
-            .map(Into::into)
     }
 
     async fn vesting_start_time(
@@ -140,7 +135,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
             vesting_account_address: vesting_account_address.to_string(),
         };
         self.client
-            .query_contract_smart(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
             .await
     }
 
@@ -152,7 +147,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
             vesting_account_address: vesting_account_address.to_string(),
         };
         self.client
-            .query_contract_smart(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
             .await
     }
 
@@ -164,7 +159,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
             vesting_account_address: vesting_account_address.to_string(),
         };
         self.client
-            .query_contract_smart(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
             .await
     }
 
@@ -178,12 +173,10 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
             block_time,
         };
         self.client
-            .query_contract_smart::<_, CosmWasmCoin>(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
             .await
-            .map(Into::into)
     }
 
-    /// Returns the total amount of delegated tokens that have vested
     async fn delegated_vesting(
         &self,
         vesting_account_address: &str,
@@ -194,9 +187,8 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
             block_time,
         };
         self.client
-            .query_contract_smart::<_, CosmWasmCoin>(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
             .await
-            .map(Into::into)
     }
 
     async fn get_account(&self, address: &str) -> Result<Account, NymdError> {
@@ -204,7 +196,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
             address: address.to_string(),
         };
         self.client
-            .query_contract_smart(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
             .await
     }
     async fn get_mixnode_pledge(&self, address: &str) -> Result<Option<PledgeData>, NymdError> {
@@ -212,7 +204,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
             address: address.to_string(),
         };
         self.client
-            .query_contract_smart(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
             .await
     }
     async fn get_gateway_pledge(&self, address: &str) -> Result<Option<PledgeData>, NymdError> {
@@ -220,7 +212,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
             address: address.to_string(),
         };
         self.client
-            .query_contract_smart(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
             .await
     }
 
@@ -229,7 +221,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
             address: address.to_string(),
         };
         self.client
-            .query_contract_smart(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
             .await
     }
 }

common/client-libs/validator-client/src/nymd/traits/vesting_signing_client.rs

@@ -4,8 +4,10 @@
 pub use crate::nymd::cosmwasm_client::signing_client::SigningCosmWasmClient;
 use crate::nymd::cosmwasm_client::types::ExecuteResult;
 use crate::nymd::error::NymdError;
-use crate::nymd::{Coin, Fee, NymdClient};
+use crate::nymd::fee::helpers::Operation;
+use crate::nymd::{cosmwasm_coin_to_cosmos_coin, NymdClient};
 use async_trait::async_trait;
+use cosmwasm_std::Coin;
 use mixnet_contract_common::{Gateway, IdentityKey, IdentityKeyRef, MixNode};
 use vesting_contract_common::messages::{ExecuteMsg as VestingExecuteMsg, VestingSpecification};
 
@@ -14,30 +16,23 @@ pub trait VestingSigningClient {
     async fn vesting_update_mixnode_config(
         &self,
         profix_margin_percent: u8,
-        fee: Option<Fee>,
     ) -> Result<ExecuteResult, NymdError>;
 
-    async fn update_mixnet_address(
-        &self,
-        address: &str,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    async fn update_mixnet_address(&self, address: &str) -> Result<ExecuteResult, NymdError>;
 
     async fn vesting_bond_gateway(
         &self,
         gateway: Gateway,
         owner_signature: &str,
         pledge: Coin,
-        fee: Option<Fee>,
     ) -> Result<ExecuteResult, NymdError>;
 
-    async fn vesting_unbond_gateway(&self, fee: Option<Fee>) -> Result<ExecuteResult, NymdError>;
+    async fn vesting_unbond_gateway(&self) -> Result<ExecuteResult, NymdError>;
 
     async fn vesting_track_unbond_gateway(
         &self,
         owner: &str,
         amount: Coin,
-        fee: Option<Fee>,
     ) -> Result<ExecuteResult, NymdError>;
 
     async fn vesting_bond_mixnode(
@@ -45,42 +40,33 @@ pub trait VestingSigningClient {
         mix_node: MixNode,
         owner_signature: &str,
         pledge: Coin,
-        fee: Option<Fee>,
     ) -> Result<ExecuteResult, NymdError>;
-    async fn vesting_unbond_mixnode(&self, fee: Option<Fee>) -> Result<ExecuteResult, NymdError>;
+    async fn vesting_unbond_mixnode(&self) -> Result<ExecuteResult, NymdError>;
 
     async fn vesting_track_unbond_mixnode(
         &self,
         owner: &str,
         amount: Coin,
-        fee: Option<Fee>,
     ) -> Result<ExecuteResult, NymdError>;
 
-    async fn withdraw_vested_coins(
-        &self,
-        amount: Coin,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    async fn withdraw_vested_coins(&self, amount: Coin) -> Result<ExecuteResult, NymdError>;
 
     async fn vesting_track_undelegation(
         &self,
         address: &str,
         mix_identity: IdentityKey,
         amount: Coin,
-        fee: Option<Fee>,
     ) -> Result<ExecuteResult, NymdError>;
 
     async fn vesting_delegate_to_mixnode<'a>(
         &self,
         mix_identity: IdentityKeyRef<'a>,
-        amount: Coin,
-        fee: Option<Fee>,
+        amount: &Coin,
     ) -> Result<ExecuteResult, NymdError>;
 
     async fn vesting_undelegate_from_mixnode<'a>(
         &self,
         mix_identity: IdentityKeyRef<'a>,
-        fee: Option<Fee>,
     ) -> Result<ExecuteResult, NymdError>;
 
     async fn create_periodic_vesting_account(
@@ -89,71 +75,27 @@ pub trait VestingSigningClient {
         staking_address: Option<String>,
         vesting_spec: Option<VestingSpecification>,
         amount: Coin,
-        fee: Option<Fee>,
     ) -> Result<ExecuteResult, NymdError>;
 }
 
 #[async_trait]
 impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient<C> {
-    async fn vesting_update_mixnode_config(
-        &self,
-        profit_margin_percent: u8,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
-        let req = VestingExecuteMsg::UpdateMixnodeConfig {
-            profit_margin_percent,
-        };
-        self.client
-            .execute(
-                self.address(),
-                self.vesting_contract_address(),
-                &req,
-                fee,
-                "VestingContract::UpdateMixnetConfig",
-                vec![],
-            )
-            .await
-    }
-
-    async fn update_mixnet_address(
-        &self,
-        address: &str,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
-        let req = VestingExecuteMsg::UpdateMixnetAddress {
-            address: address.to_string(),
-        };
-        self.client
-            .execute(
-                self.address(),
-                self.vesting_contract_address(),
-                &req,
-                fee,
-                "VestingContract::UpdateMixnetAddress",
-                vec![],
-            )
-            .await
-    }
-
     async fn vesting_bond_gateway(
         &self,
         gateway: Gateway,
         owner_signature: &str,
         pledge: Coin,
-        fee: Option<Fee>,
     ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
+        let fee = self.operation_fee(Operation::BondGateway);
         let req = VestingExecuteMsg::BondGateway {
             gateway,
             owner_signature: owner_signature.to_string(),
-            amount: pledge.into(),
+            amount: pledge,
         };
         self.client
             .execute(
                 self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                 &req,
                 fee,
                 "VestingContract::BondGateway",
@@ -162,13 +104,13 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
             .await
     }
 
-    async fn vesting_unbond_gateway(&self, fee: Option<Fee>) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
+    async fn vesting_unbond_gateway(&self) -> Result<ExecuteResult, NymdError> {
+        let fee = self.operation_fee(Operation::UnbondGateway);
         let req = VestingExecuteMsg::UnbondGateway {};
         self.client
             .execute(
                 self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                 &req,
                 fee,
                 "VestingContract::UnbondGateway",
@@ -181,17 +123,16 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         &self,
         owner: &str,
         amount: Coin,
-        fee: Option<Fee>,
     ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
+        let fee = self.operation_fee(Operation::TrackUnbondGateway);
         let req = VestingExecuteMsg::TrackUnbondGateway {
             owner: owner.to_string(),
-            amount: amount.into(),
+            amount,
         };
         self.client
             .execute(
                 self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                 &req,
                 fee,
                 "VestingContract::TrackUnbondGateway",
@@ -205,18 +146,17 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         mix_node: MixNode,
         owner_signature: &str,
         pledge: Coin,
-        fee: Option<Fee>,
     ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
+        let fee = self.operation_fee(Operation::BondMixnode);
         let req = VestingExecuteMsg::BondMixnode {
             mix_node,
             owner_signature: owner_signature.to_string(),
-            amount: pledge.into(),
+            amount: pledge,
         };
         self.client
             .execute(
                 self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                 &req,
                 fee,
                 "VestingContract::BondMixnode",
@@ -225,13 +165,13 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
             .await
     }
 
-    async fn vesting_unbond_mixnode(&self, fee: Option<Fee>) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
+    async fn vesting_unbond_mixnode(&self) -> Result<ExecuteResult, NymdError> {
+        let fee = self.operation_fee(Operation::UnbondMixnode);
         let req = VestingExecuteMsg::UnbondMixnode {};
         self.client
             .execute(
                 self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                 &req,
                 fee,
                 "VestingContract::UnbondMixnode",
@@ -244,17 +184,16 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         &self,
         owner: &str,
         amount: Coin,
-        fee: Option<Fee>,
     ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
+        let fee = self.operation_fee(Operation::TrackUnbondMixnode);
         let req = VestingExecuteMsg::TrackUnbondMixnode {
             owner: owner.to_string(),
-            amount: amount.into(),
+            amount,
         };
         self.client
             .execute(
                 self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                 &req,
                 fee,
                 "VestingContract::TrackUnbondMixnode",
@@ -262,19 +201,14 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
             )
             .await
     }
-    async fn withdraw_vested_coins(
-        &self,
-        amount: Coin,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
-        let req = VestingExecuteMsg::WithdrawVestedCoins {
-            amount: amount.into(),
-        };
+
+    async fn withdraw_vested_coins(&self, amount: Coin) -> Result<ExecuteResult, NymdError> {
+        let fee = self.operation_fee(Operation::WithdrawVestedCoins);
+        let req = VestingExecuteMsg::WithdrawVestedCoins { amount };
         self.client
             .execute(
                 self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                 &req,
                 fee,
                 "VestingContract::WithdrawVested",
@@ -282,23 +216,23 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
             )
             .await
     }
+
     async fn vesting_track_undelegation(
         &self,
         address: &str,
         mix_identity: IdentityKey,
         amount: Coin,
-        fee: Option<Fee>,
     ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
+        let fee = self.operation_fee(Operation::TrackUndelegation);
         let req = VestingExecuteMsg::TrackUndelegation {
             owner: address.to_string(),
             mix_identity,
-            amount: amount.into(),
+            amount,
         };
         self.client
             .execute(
                 self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                 &req,
                 fee,
                 "VestingContract::TrackUndelegation",
@@ -309,18 +243,17 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
     async fn vesting_delegate_to_mixnode<'a>(
         &self,
         mix_identity: IdentityKeyRef<'a>,
-        amount: Coin,
-        fee: Option<Fee>,
+        amount: &Coin,
     ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
+        let fee = self.operation_fee(Operation::DelegateToMixnode);
         let req = VestingExecuteMsg::DelegateToMixnode {
             mix_identity: mix_identity.into(),
-            amount: amount.into(),
+            amount: amount.clone(),
         };
         self.client
             .execute(
                 self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                 &req,
                 fee,
                 "VestingContract::DelegateToMixnode",
@@ -328,20 +261,18 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
             )
             .await
     }
-
     async fn vesting_undelegate_from_mixnode<'a>(
         &self,
         mix_identity: IdentityKeyRef<'a>,
-        fee: Option<Fee>,
     ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
+        let fee = self.operation_fee(Operation::UndelegateFromMixnode);
         let req = VestingExecuteMsg::UndelegateFromMixnode {
             mix_identity: mix_identity.into(),
         };
         self.client
             .execute(
                 self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                 &req,
                 fee,
                 "VestingContract::UndelegateFromMixnode",
@@ -349,16 +280,14 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
             )
             .await
     }
-
     async fn create_periodic_vesting_account(
         &self,
         owner_address: &str,
         staking_address: Option<String>,
         vesting_spec: Option<VestingSpecification>,
         amount: Coin,
-        fee: Option<Fee>,
     ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
+        let fee = self.operation_fee(Operation::CreatePeriodicVestingAccount);
         let req = VestingExecuteMsg::CreateAccount {
             owner_address: owner_address.to_string(),
             staking_address,
@@ -367,11 +296,48 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         self.client
             .execute(
                 self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                 &req,
                 fee,
                 "VestingContract::CreatePeriodicVestingAccount",
-                vec![amount],
+                vec![cosmwasm_coin_to_cosmos_coin(amount)],
+            )
+            .await
+    }
+
+    async fn update_mixnet_address(&self, address: &str) -> Result<ExecuteResult, NymdError> {
+        let fee = self.operation_fee(Operation::UpdateMixnetAddress);
+        let req = VestingExecuteMsg::UpdateMixnetAddress {
+            address: address.to_string(),
+        };
+        self.client
+            .execute(
+                self.address(),
+                self.vesting_contract_address()?,
+                &req,
+                fee,
+                "VestingContract::UpdateMixnetAddress",
+                vec![],
+            )
+            .await
+    }
+
+    async fn vesting_update_mixnode_config(
+        &self,
+        profit_margin_percent: u8,
+    ) -> Result<ExecuteResult, NymdError> {
+        let fee = self.operation_fee(Operation::UpdateMixnodeConfig);
+        let req = VestingExecuteMsg::UpdateMixnodeConfig {
+            profit_margin_percent,
+        };
+        self.client
+            .execute(
+                self.address(),
+                self.vesting_contract_address()?,
+                &req,
+                fee,
+                "VestingContract::UpdateMixnetConfig",
+                vec![],
             )
             .await
     }

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

@@ -3,18 +3,14 @@
 
 use crate::validator_api::error::ValidatorAPIError;
 use crate::validator_api::routes::{CORE_STATUS_COUNT, SINCE_ARG};
-use coconut_interface::{
-    BlindSignRequestBody, BlindedSignatureResponse, ExecuteReleaseFundsRequestBody,
-    ProposeReleaseFundsRequestBody, ProposeReleaseFundsResponse, VerificationKeyResponse,
-    VerifyCredentialBody, VerifyCredentialResponse,
-};
+use coconut_interface::{BlindSignRequestBody, BlindedSignatureResponse, VerificationKeyResponse};
 use mixnet_contract_common::{GatewayBond, IdentityKeyRef, MixNodeBond};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use url::Url;
 use validator_api_requests::models::{
-    CoreNodeStatusResponse, InclusionProbabilityResponse, MixNodeBondAnnotated,
-    MixnodeStatusResponse, RewardEstimationResponse, StakeSaturationResponse, UptimeResponse,
+    CoreNodeStatusResponse, InclusionProbabilityResponse, MixnodeStatusResponse,
+    RewardEstimationResponse, StakeSaturationResponse, UptimeResponse,
 };
 
 pub mod error;
@@ -89,16 +85,6 @@ impl Client {
             .await
     }
 
-    pub async fn get_mixnodes_detailed(
-        &self,
-    ) -> Result<Vec<MixNodeBondAnnotated>, ValidatorAPIError> {
-        self.query_validator_api(
-            &[routes::API_VERSION, routes::MIXNODES, routes::DETAILED],
-            NO_PARAMS,
-        )
-        .await
-    }
-
     pub async fn get_gateways(&self) -> Result<Vec<GatewayBond>, ValidatorAPIError> {
         self.query_validator_api(&[routes::API_VERSION, routes::GATEWAYS], NO_PARAMS)
             .await
@@ -112,21 +98,6 @@ impl Client {
         .await
     }
 
-    pub async fn get_active_mixnodes_detailed(
-        &self,
-    ) -> Result<Vec<MixNodeBondAnnotated>, ValidatorAPIError> {
-        self.query_validator_api(
-            &[
-                routes::API_VERSION,
-                routes::MIXNODES,
-                routes::ACTIVE,
-                routes::DETAILED,
-            ],
-            NO_PARAMS,
-        )
-        .await
-    }
-
     pub async fn get_rewarded_mixnodes(&self) -> Result<Vec<MixNodeBond>, ValidatorAPIError> {
         self.query_validator_api(
             &[routes::API_VERSION, routes::MIXNODES, routes::REWARDED],
@@ -135,21 +106,6 @@ impl Client {
         .await
     }
 
-    pub async fn get_rewarded_mixnodes_detailed(
-        &self,
-    ) -> Result<Vec<MixNodeBondAnnotated>, ValidatorAPIError> {
-        self.query_validator_api(
-            &[
-                routes::API_VERSION,
-                routes::MIXNODES,
-                routes::REWARDED,
-                routes::DETAILED,
-            ],
-            NO_PARAMS,
-        )
-        .await
-    }
-
     pub async fn get_probs_mixnode_rewarded(
         &self,
         mixnode_id: &str,
@@ -375,57 +331,6 @@ impl Client {
         )
         .await
     }
-
-    pub async fn verify_bandwidth_credential(
-        &self,
-        request_body: &VerifyCredentialBody,
-    ) -> Result<VerifyCredentialResponse, ValidatorAPIError> {
-        self.post_validator_api(
-            &[
-                routes::API_VERSION,
-                routes::COCONUT_ROUTES,
-                routes::BANDWIDTH,
-                routes::COCONUT_VERIFY_BANDWIDTH_CREDENTIAL,
-            ],
-            NO_PARAMS,
-            request_body,
-        )
-        .await
-    }
-
-    pub async fn propose_release_funds(
-        &self,
-        request_body: &ProposeReleaseFundsRequestBody,
-    ) -> Result<ProposeReleaseFundsResponse, ValidatorAPIError> {
-        self.post_validator_api(
-            &[
-                routes::API_VERSION,
-                routes::COCONUT_ROUTES,
-                routes::BANDWIDTH,
-                routes::COCONUT_PROPOSE_RELEASE_FUNDS,
-            ],
-            NO_PARAMS,
-            request_body,
-        )
-        .await
-    }
-
-    pub async fn execute_release_funds(
-        &self,
-        request_body: &ExecuteReleaseFundsRequestBody,
-    ) -> Result<(), ValidatorAPIError> {
-        self.post_validator_api(
-            &[
-                routes::API_VERSION,
-                routes::COCONUT_ROUTES,
-                routes::BANDWIDTH,
-                routes::COCONUT_EXECUTE_RELEASE_FUNDS,
-            ],
-            NO_PARAMS,
-            request_body,
-        )
-        .await
-    }
 }
 
 // utility function that should solve the double slash problem in validator API forever.

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

@@ -7,7 +7,6 @@ pub const API_VERSION: &str = VALIDATOR_API_VERSION;
 pub const MIXNODES: &str = "mixnodes";
 pub const GATEWAYS: &str = "gateways";
 
-pub const DETAILED: &str = "detailed";
 pub const ACTIVE: &str = "active";
 pub const REWARDED: &str = "rewarded";
 
@@ -17,9 +16,6 @@ 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_VERIFICATION_KEY: &str = "verification-key";
-pub const COCONUT_VERIFY_BANDWIDTH_CREDENTIAL: &str = "verify-bandwidth-credential";
-pub const COCONUT_PROPOSE_RELEASE_FUNDS: &str = "propose-release-funds";
-pub const COCONUT_EXECUTE_RELEASE_FUNDS: &str = "execute-release-funds";
 
 pub const STATUS_ROUTES: &str = "status";
 pub const MIXNODE: &str = "mixnode";

common/coconut-interface/src/error.rs

@@ -1,7 +1,6 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use nymcoconut::CoconutError;
 use thiserror::Error;
 
 #[derive(Debug, Error)]
@@ -12,6 +11,9 @@ pub enum CoconutInterfaceError {
     #[error("Could not decode base 58 string - {0}")]
     MalformedString(#[from] bs58::decode::Error),
 
-    #[error("Coconut error - {0}")]
-    CoconutError(#[from] CoconutError),
+    #[error("Not enough public attributes were specified")]
+    NotEnoughPublicAttributes,
+
+    #[error("Could not recover bandwidth value")]
+    InvalidBandwidth,
 }

common/coconut-interface/src/lib.rs

@@ -5,158 +5,96 @@ pub mod error;
 
 use getset::{CopyGetters, Getters};
 use serde::{Deserialize, Serialize};
+use std::str::FromStr;
 
 use error::CoconutInterfaceError;
 
 pub use nymcoconut::*;
 
-#[derive(Debug, Serialize, Deserialize, Getters, CopyGetters, Clone, PartialEq)]
+#[derive(Serialize, Deserialize, Getters, CopyGetters, Clone)]
 pub struct Credential {
     #[getset(get = "pub")]
     n_params: u32,
     #[getset(get = "pub")]
     theta: Theta,
-    voucher_value: u64,
-    voucher_info: String,
+    public_attributes: Vec<Vec<u8>>,
+    #[getset(get = "pub")]
+    signature: Signature,
 }
 impl Credential {
     pub fn new(
         n_params: u32,
         theta: Theta,
-        voucher_value: u64,
+        voucher_value: String,
         voucher_info: String,
+        signature: &Signature,
     ) -> Credential {
+        let public_attributes = vec![voucher_value.into_bytes(), voucher_info.into_bytes()];
         Credential {
             n_params,
             theta,
-            voucher_value,
-            voucher_info,
+            public_attributes,
+            signature: *signature,
         }
     }
 
-    pub fn blinded_serial_number(&self) -> String {
-        self.theta.blinded_serial_number_bs58()
-    }
+    pub fn voucher_value(&self) -> Result<u64, CoconutInterfaceError> {
+        let bandwidth_vec = self
+            .public_attributes
+            .get(0)
+            .ok_or(CoconutInterfaceError::NotEnoughPublicAttributes)?
+            .to_owned();
+        let bandwidth_str = String::from_utf8(bandwidth_vec)
+            .map_err(|_| CoconutInterfaceError::InvalidBandwidth)?;
+        let value =
+            u64::from_str(&bandwidth_str).map_err(|_| CoconutInterfaceError::InvalidBandwidth)?;
 
-    pub fn has_blinded_serial_number(
-        &self,
-        blinded_serial_number_bs58: &str,
-    ) -> Result<bool, CoconutInterfaceError> {
-        Ok(self
-            .theta
-            .has_blinded_serial_number(blinded_serial_number_bs58)?)
-    }
-
-    pub fn voucher_value(&self) -> u64 {
-        self.voucher_value
+        Ok(value)
     }
 
     pub fn verify(&self, verification_key: &VerificationKey) -> bool {
         let params = Parameters::new(self.n_params).unwrap();
-        let public_attributes = vec![
-            self.voucher_value.to_string().as_bytes(),
-            self.voucher_info.as_bytes(),
-        ]
-        .iter()
-        .map(hash_to_scalar)
-        .collect::<Vec<Attribute>>();
+        let public_attributes = self
+            .public_attributes
+            .iter()
+            .map(hash_to_scalar)
+            .collect::<Vec<Attribute>>();
         nymcoconut::verify_credential(&params, verification_key, &self.theta, &public_attributes)
     }
-
-    pub fn as_bytes(&self) -> Vec<u8> {
-        let n_params_bytes = self.n_params.to_be_bytes();
-        let theta_bytes = self.theta.to_bytes();
-        let theta_bytes_len = theta_bytes.len();
-        let voucher_value_bytes = self.voucher_value.to_be_bytes();
-        let voucher_info_bytes = self.voucher_info.as_bytes();
-        let voucher_info_len = voucher_info_bytes.len();
-
-        let mut bytes = Vec::with_capacity(28 + theta_bytes_len + voucher_info_len);
-        bytes.extend_from_slice(&n_params_bytes);
-        bytes.extend_from_slice(&(theta_bytes_len as u64).to_be_bytes());
-        bytes.extend_from_slice(&theta_bytes);
-        bytes.extend_from_slice(&voucher_value_bytes);
-        bytes.extend_from_slice(voucher_info_bytes);
-
-        bytes
-    }
-
-    pub fn from_bytes(bytes: &[u8]) -> Result<Self, CoconutError> {
-        if bytes.len() < 28 {
-            return Err(CoconutError::Deserialization(String::from(
-                "To few bytes in credential",
-            )));
-        }
-        let mut four_byte = [0u8; 4];
-        let mut eight_byte = [0u8; 8];
-
-        four_byte.copy_from_slice(&bytes[..4]);
-        let n_params = u32::from_be_bytes(four_byte);
-        eight_byte.copy_from_slice(&bytes[4..12]);
-        let theta_len = u64::from_be_bytes(eight_byte);
-        if bytes.len() < 28 + theta_len as usize {
-            return Err(CoconutError::Deserialization(String::from(
-                "To few bytes in credential",
-            )));
-        }
-        let theta = Theta::from_bytes(&bytes[12..12 + theta_len as usize])
-            .map_err(|e| CoconutError::Deserialization(e.to_string()))?;
-        eight_byte.copy_from_slice(&bytes[12 + theta_len as usize..20 + theta_len as usize]);
-        let voucher_value = u64::from_be_bytes(eight_byte);
-        let voucher_info = String::from_utf8(bytes[20 + theta_len as usize..].to_vec())
-            .map_err(|e| CoconutError::Deserialization(e.to_string()))?;
-
-        Ok(Credential {
-            n_params,
-            theta,
-            voucher_value,
-            voucher_info,
-        })
-    }
 }
 
-impl Bytable for Credential {
-    fn to_byte_vec(&self) -> Vec<u8> {
-        self.as_bytes()
-    }
-
-    fn try_from_byte_slice(slice: &[u8]) -> Result<Self, CoconutError> {
-        Credential::from_bytes(slice)
-    }
-}
-
-impl Base58 for Credential {}
-
-#[derive(Serialize, Deserialize, Getters, CopyGetters)]
+#[derive(Serialize, Deserialize, Debug, Getters, CopyGetters)]
 pub struct VerifyCredentialBody {
     #[getset(get = "pub")]
-    credential: Credential,
+    n_params: u32,
     #[getset(get = "pub")]
-    proposal_id: u64,
+    theta: Theta,
+    public_attributes: Vec<String>,
 }
 
 impl VerifyCredentialBody {
-    pub fn new(credential: Credential, proposal_id: u64) -> VerifyCredentialBody {
+    pub fn new(
+        n_params: u32,
+        theta: &Theta,
+        public_attributes: &[Attribute],
+    ) -> VerifyCredentialBody {
         VerifyCredentialBody {
-            credential,
-            proposal_id,
+            n_params,
+            theta: theta.clone(),
+            public_attributes: public_attributes
+                .iter()
+                .map(|attr| attr.to_bs58())
+                .collect(),
         }
     }
-}
 
-#[derive(Debug, Serialize, Deserialize)]
-pub struct VerifyCredentialResponse {
-    pub verification_result: bool,
-}
-
-impl VerifyCredentialResponse {
-    pub fn new(verification_result: bool) -> Self {
-        VerifyCredentialResponse {
-            verification_result,
-        }
+    pub fn public_attributes(&self) -> Vec<Attribute> {
+        self.public_attributes
+            .iter()
+            .map(|x| Attribute::try_from_bs58(x).unwrap())
+            .collect()
     }
 }
-
 //  All strings are base58 encoded representations of structs
 #[derive(Clone, Serialize, Deserialize, Debug, Getters, CopyGetters)]
 pub struct BlindSignRequestBody {
@@ -256,86 +194,3 @@ impl VerificationKeyResponse {
         VerificationKeyResponse { key }
     }
 }
-
-#[derive(Serialize, Deserialize, Getters, CopyGetters)]
-pub struct ProposeReleaseFundsRequestBody {
-    #[getset(get = "pub")]
-    credential: Credential,
-}
-
-impl ProposeReleaseFundsRequestBody {
-    pub fn new(credential: Credential) -> Self {
-        ProposeReleaseFundsRequestBody { credential }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ProposeReleaseFundsResponse {
-    pub proposal_id: u64,
-}
-
-impl ProposeReleaseFundsResponse {
-    pub fn new(proposal_id: u64) -> Self {
-        ProposeReleaseFundsResponse { proposal_id }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize, Getters, CopyGetters)]
-pub struct ExecuteReleaseFundsRequestBody {
-    #[getset(get = "pub")]
-    proposal_id: u64,
-}
-
-impl ExecuteReleaseFundsRequestBody {
-    pub fn new(proposal_id: u64) -> Self {
-        ExecuteReleaseFundsRequestBody { proposal_id }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn serde_coconut_credential() {
-        let voucher_value = 1000000u64;
-        let voucher_info = String::from("BandwidthVoucher");
-        let serial_number =
-            Attribute::try_from_bs58("7Rp3imcuNX3w9se9wm5th8gSvc2czsnMrGsdt5HsrycA").unwrap();
-        let binding_number =
-            Attribute::try_from_bs58("Auf8yVEgyEAWNHaXUZmimS4n9g5YiYnNYqp6F9BtBe9E").unwrap();
-        let signature = Signature::try_from_bs58(
-            "ta3pM9ffj5T6YGbwjSBp2W118rcwyP9PXStc\
-        7ssb91g5GQYMQHhuTNajbdZcjxUFBFL5rhED8EHpRzE8r432ss3qbPBfpNev4CdkfMkQ3wepyM7hy7q1W6Rn9WmFoZL\
-        ZR9j",
-        )
-        .unwrap();
-        let params = Parameters::new(4).unwrap();
-        let verification_key = VerificationKey::try_from_bs58("8CFtVVXdwLy4WHMQPE4\
-        woe89q3DRHoNxBSchftrEjSBPWA4r4xZv4Y9qSvS5x5bMmFtp7BX6ikECAnuXr5EjXWSsgjirZJmpS5XDUynVfht1cD\
-        FWGDvy2XFrRCuoCMotNXi3PoF6wYqdTR9Rqcfoj3i2H5Nid422WBaLtVoC9QNobvpvaqq6vX5PbsSyPayvU8HCXFxM6\
-        JjScYpbRTxQtdwefWLrk3LmXyJQBWi7c2VAhSxu9msp7VTBycqdwQNgxHETStZuwXsozxaGQ2KssVUCaaoYPR4g2RqK\
-        UAvtWwA7pMiAQNcbkXcbsjCgVjWaCpMWC37XA31cLcFf3zbjHD9e5tXjAcqa4M89fbFhuvvSXxowSAZ5NoWrN32kd5d\
-        wxJm1JW3Tt2h6yDDBe84oMy71462dZn7N78DVk2mFNGwBCibrZWA7oUzRBMfYxiQrksoFcou7QfLLd58zoNYmPQPt84\
-        1VpQopEBfdQ7Nf9zoXxBt3zMy7g5NsFGvzh7KTbDUyeeXrdkKJPQBs6dqaizr9sS8CPPmR4uk96vDTRh8CJ5FbSsmb8\
-        nP71dRvvwRZJHGzwYirMo6SXS3ZYxFuiA3mkxYuqDHCwkTWDuRCcAaztrDYRZg7VCMo4Q446AaEso5eqpeWpHZQt53E\
-        ZRpqmNYKASGwMhTeEHPSLgSmtoAAUcaRWpGRzYfd6kzEma8tdGLwyP4rLXgvSvtDLP37dU7YgF3LEXbGAz57U9ATy46\
-        6sroLpHPdaCWB8RF11wvB6Tu196JnJd2KyQBP1iUWP3rtZs3GhAF1QVcxquh8BqDZzAcpQ6wCS1P9c5GxKgww77FVF5\
-        Kp83XtoxSrw3GaYVyKTGxNh3vcKPR31txCjTxPaN2fg7TaPLhoQJX4YaAroFSXqrqbbRsisuHhhCeUP2YwDjHedes9y")
-            .unwrap();
-        let theta = prove_bandwidth_credential(
-            &params,
-            &verification_key,
-            &signature,
-            serial_number,
-            binding_number,
-        )
-        .unwrap();
-        let credential = Credential::new(4, theta, voucher_value, voucher_info);
-
-        let serialized_credential = credential.as_bytes();
-        let deserialized_credential = Credential::from_bytes(&serialized_credential).unwrap();
-
-        assert_eq!(credential, deserialized_credential);
-    }
-}

common/config/src/lib.rs

@@ -15,6 +15,7 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
     fn template() -> &'static str;
 
     fn config_file_name() -> String {
+        log::trace!("NymdConfig::config_file_name");
         "config.toml".to_string()
     }
 
@@ -22,6 +23,7 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
 
     // default, most probable, implementations; can be easily overridden where required
     fn default_config_directory(id: Option<&str>) -> PathBuf {
+        log::trace!("NymdConfig::default_config_directory");
         if let Some(id) = id {
             Self::default_root_directory().join(id).join("config")
         } else {
@@ -30,6 +32,7 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
     }
 
     fn default_data_directory(id: Option<&str>) -> PathBuf {
+        log::trace!("NymdConfig::default_data_path");
         if let Some(id) = id {
             Self::default_root_directory().join(id).join("data")
         } else {
@@ -38,6 +41,7 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
     }
 
     fn default_config_file_path(id: Option<&str>) -> PathBuf {
+        log::trace!("NymdConfig::default_config_file_path");
         Self::default_config_directory(id).join(Self::config_file_name())
     }
 

common/cosmwasm-smart-contracts/coconut-bandwidth-contract/Cargo.toml

@@ -6,6 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cosmwasm-std = "1.0.0"
+cosmwasm-std = "1.0.0-beta6"
 schemars = "0.8"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }

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

@@ -7,4 +7,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cosmwasm-std = "1.0.0"
+cosmwasm-std = "1.0.0-beta8"

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

@@ -7,7 +7,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cosmwasm-std = "1.0.0"
+cosmwasm-std = "1.0.0-beta8"
 
 serde = { version = "1.0", features = ["derive"] }
 serde_repr = "0.1"
@@ -18,13 +18,12 @@ fixed = { version = "1.1", features = ["serde"] }
 az = "1.1"
 log = "0.4.14"
 time = { version = "0.3.6", features = ["parsing", "formatting"] }
-ts-rs = "6.1.2"
 
 contracts-common = { path = "../contracts-common" }
 
 [dev-dependencies]
 time = { version = "0.3.5", features = ["serde", "macros"] }
+ts-rs = "6.1.2"
 
 [features]
 default = []
-generate-ts = []

common/cosmwasm-smart-contracts/mixnet-contract/src/events.rs

@@ -23,9 +23,7 @@ pub const CHANGE_REWARDED_SET_EVENT_TYPE: &str = "change_rewarded_set";
 pub const ADVANCE_INTERVAL_EVENT_TYPE: &str = "advance_interval";
 pub const ADVANCE_EPOCH_EVENT_TYPE: &str = "advance_epoch";
 pub const COMPOUND_DELEGATOR_REWARD_EVENT_TYPE: &str = "compound_delegator_reward";
-pub const CLAIM_DELEGATOR_REWARD_EVENT_TYPE: &str = "claim_delegator_reward";
 pub const COMPOUND_OPERATOR_REWARD_EVENT_TYPE: &str = "compound_operator_reward";
-pub const CLAIM_OPERATOR_REWARD_EVENT_TYPE: &str = "claim_operator_reward";
 pub const SNAPSHOT_MIXNODES_EVENT: &str = "snapshot_mixnodes";
 
 // attributes that are used in multiple places
@@ -153,11 +151,6 @@ pub fn new_compound_operator_reward_event(owner: &Addr, amount: Uint128) -> Even
     event.add_attribute(AMOUNT_KEY, amount.to_string())
 }
 
-pub fn new_claim_operator_reward_event(owner: &Addr, amount: Uint128) -> Event {
-    let event = Event::new(CLAIM_OPERATOR_REWARD_EVENT_TYPE).add_attribute(OWNER_KEY, owner);
-    event.add_attribute(AMOUNT_KEY, amount.to_string())
-}
-
 pub fn new_compound_delegator_reward_event(
     delegator: &Addr,
     proxy: &Option<Addr>,
@@ -178,26 +171,6 @@ pub fn new_compound_delegator_reward_event(
         .add_attribute(DELEGATOR_KEY, delegator)
 }
 
-pub fn new_claim_delegator_reward_event(
-    delegator: &Addr,
-    proxy: &Option<Addr>,
-    amount: Uint128,
-    mix_identity: IdentityKeyRef<'_>,
-) -> Event {
-    let mut event =
-        Event::new(CLAIM_DELEGATOR_REWARD_EVENT_TYPE).add_attribute(DELEGATOR_KEY, delegator);
-
-    if let Some(proxy) = proxy {
-        event = event.add_attribute(PROXY_KEY, proxy)
-    }
-
-    // coin implements Display trait and we use that implementation here
-    event
-        .add_attribute(AMOUNT_KEY, amount.to_string())
-        .add_attribute(DELEGATION_TARGET_KEY, mix_identity)
-        .add_attribute(DELEGATOR_KEY, delegator)
-}
-
 pub fn new_undelegation_event(
     delegator: &Addr,
     proxy: &Option<Addr>,

common/cosmwasm-smart-contracts/mixnet-contract/src/gateway.rs

@@ -8,6 +8,11 @@ use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
 use std::fmt::Display;
 
+#[cfg_attr(test, derive(ts_rs::TS))]
+#[cfg_attr(
+    test,
+    ts(export, export_to = "../../../nym-wallet/src/types/rust/gateway.ts")
+)]
 #[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema)]
 pub struct Gateway {
     pub host: String,
@@ -136,12 +141,6 @@ pub struct GatewayOwnershipResponse {
     pub gateway: Option<GatewayBond>,
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
-pub struct GatewayBondResponse {
-    pub identity: IdentityKey,
-    pub gateway: Option<GatewayBond>,
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

common/cosmwasm-smart-contracts/mixnet-contract/src/interval.rs

@@ -121,14 +121,6 @@ impl Interval {
         self.start_unix_timestamp() <= block_time && block_time < self.end_unix_timestamp()
     }
 
-    pub fn update_duration(&mut self, secs: u64) {
-        self.length = Duration::from_secs(secs);
-    }
-
-    pub const fn length_secs(&self) -> u64 {
-        self.length.as_secs()
-    }
-
     /// Returns the next interval.
     #[must_use]
     pub fn next(&self) -> Self {

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

@@ -4,7 +4,7 @@
 pub mod delegation;
 pub mod error;
 pub mod events;
-pub mod gateway;
+mod gateway;
 mod interval;
 pub mod mixnode;
 mod msg;
@@ -18,13 +18,10 @@ pub use delegation::{
     Delegation, PagedAllDelegationsResponse, PagedDelegatorDelegationsResponse,
     PagedMixDelegationsResponse,
 };
-pub use gateway::{
-    Gateway, GatewayBond, GatewayBondResponse, GatewayOwnershipResponse, PagedGatewayResponse,
-};
+pub use gateway::{Gateway, GatewayBond, GatewayOwnershipResponse, PagedGatewayResponse};
 pub use interval::Interval;
 pub use mixnode::{
-    Layer, MixNode, MixNodeBond, MixOwnershipResponse, MixnodeBondResponse, PagedMixnodeResponse,
-    RewardedSetNodeStatus,
+    Layer, MixNode, MixNodeBond, MixOwnershipResponse, PagedMixnodeResponse, RewardedSetNodeStatus,
 };
 pub use msg::*;
 pub use types::*;

common/cosmwasm-smart-contracts/mixnet-contract/src/mixnode.rs

@@ -14,10 +14,13 @@ use serde_repr::{Deserialize_repr, Serialize_repr};
 use std::cmp::Ordering;
 use std::fmt::Display;
 
-#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
+#[cfg_attr(test, derive(ts_rs::TS))]
 #[cfg_attr(
-    feature = "generate-ts",
-    ts(export_to = "ts-packages/types/src/types/rust/RewardedSetNodeStatus.ts")
+    test,
+    ts(
+        export,
+        export_to = "../../../nym-wallet/src/types/rust/rewardedsetnodestatus.ts"
+    )
 )]
 #[derive(Clone, Copy, Debug, Deserialize, Serialize, JsonSchema, PartialEq)]
 pub enum RewardedSetNodeStatus {
@@ -106,6 +109,11 @@ impl PendingUndelegate {
     }
 }
 
+#[cfg_attr(test, derive(ts_rs::TS))]
+#[cfg_attr(
+    test,
+    ts(export, export_to = "../../../nym-wallet/src/types/rust/mixnode.ts")
+)]
 #[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema)]
 pub struct MixNode {
     pub host: String,
@@ -220,9 +228,9 @@ impl DelegatorRewardParams {
 
         // change all values into their fixed representations
         let delegation_amount = U128::from_num(delegation_amount.u128());
-        let staking_supply = U128::from_num(self.reward_params.staking_supply());
+        let circulating_supply = U128::from_num(self.reward_params.circulating_supply());
 
-        let scaled_delegation_amount = delegation_amount / staking_supply;
+        let scaled_delegation_amount = delegation_amount / circulating_supply;
 
         // Div by zero checked above
         let delegator_reward =
@@ -310,14 +318,6 @@ impl NodeRewardResult {
     }
 }
 
-pub struct RewardEstimate {
-    pub total_node_reward: u64,
-    pub operator_reward: u64,
-    pub delegators_reward: u64,
-    pub node_profit: u64,
-    pub operator_cost: u64,
-}
-
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixNodeBond {
     pub pledge_amount: Coin,
@@ -392,113 +392,94 @@ impl MixNodeBond {
         self.total_delegation.clone()
     }
 
-    pub fn stake_saturation(&self, staking_supply: u128, rewarded_set_size: u32) -> U128 {
-        self.total_bond_to_staking_supply(staking_supply) * U128::from_num(rewarded_set_size)
+    pub fn stake_saturation(&self, circulating_supply: u128, rewarded_set_size: u32) -> U128 {
+        self.total_bond_to_circulating_supply(circulating_supply)
+            * U128::from_num(rewarded_set_size)
     }
 
     // TODO: There is an effect here when adding accumulted rewards to the total bond, ie accumulated rewards will not
     // affect lambda, but will affect sigma, in turn over time, if left unclaimed operator rewards will not compound, but
     // behave similarly to delegations.
     // The question is should this be taken into account when calculating operator rewards?
-    pub fn pledge_to_staking_supply(&self, staking_supply: u128) -> U128 {
-        U128::from_num(self.pledge_amount().amount.u128()) / U128::from_num(staking_supply)
+    pub fn pledge_to_circulating_supply(&self, circulating_supply: u128) -> U128 {
+        U128::from_num(self.pledge_amount().amount.u128()) / U128::from_num(circulating_supply)
     }
 
-    pub fn total_bond_to_staking_supply(&self, staking_supply: u128) -> U128 {
+    pub fn total_bond_to_circulating_supply(&self, circulating_supply: u128) -> U128 {
         U128::from_num(self.pledge_amount().amount.u128() + self.total_delegation().amount.u128())
-            / U128::from_num(staking_supply)
-    }
-
-    pub fn lambda_ticked(&self, params: &RewardParams) -> U128 {
-        // Ratio of a bond to the token circulating supply
-        self.lambda(params).min(params.one_over_k())
+            / U128::from_num(circulating_supply)
     }
 
     pub fn lambda(&self, params: &RewardParams) -> U128 {
         // Ratio of a bond to the token circulating supply
-        self.pledge_to_staking_supply(params.staking_supply())
-    }
-
-    pub fn sigma_ticked(&self, params: &RewardParams) -> U128 {
-        // Ratio of a delegation to the the token circulating supply
-        self.sigma(params).min(params.one_over_k())
+        let pledge_to_circulating_supply_ratio =
+            self.pledge_to_circulating_supply(params.circulating_supply());
+        pledge_to_circulating_supply_ratio.min(params.one_over_k())
     }
 
     pub fn sigma(&self, params: &RewardParams) -> U128 {
         // Ratio of a delegation to the the token circulating supply
-        self.total_bond_to_staking_supply(params.staking_supply())
+        let total_bond_to_circulating_supply_ratio =
+            self.total_bond_to_circulating_supply(params.circulating_supply());
+        total_bond_to_circulating_supply_ratio.min(params.one_over_k())
     }
 
     pub fn estimate_reward(
         &self,
-        base_operator_cost: u64,
         params: &RewardParams,
-    ) -> Result<RewardEstimate, MixnetContractError> {
+    ) -> Result<(u64, u64, u64), MixnetContractError> {
         let total_node_reward = self
             .reward(params)
             .reward()
             .checked_to_num::<u128>()
             .unwrap_or_default();
-        let node_profit = self
-            .node_profit(params, base_operator_cost)
-            .checked_to_num::<u128>()
-            .unwrap_or_default();
-        let operator_cost = params
-            .node
-            .operator_cost(base_operator_cost)
-            .checked_to_num::<u128>()
-            .unwrap_or_default();
-        let operator_reward = self.operator_reward(params, base_operator_cost);
+        let operator_reward = self.operator_reward(params);
         // Total reward has to be the sum of operator and delegator rewards
-        let delegators_reward = node_profit.saturating_sub(operator_reward);
+        let delegators_reward = total_node_reward - operator_reward;
 
-        Ok(RewardEstimate {
-            total_node_reward: total_node_reward.try_into()?,
-            operator_reward: operator_reward.try_into()?,
-            delegators_reward: delegators_reward.try_into()?,
-            node_profit: node_profit.try_into()?,
-            operator_cost: operator_cost.try_into()?,
-        })
+        Ok((
+            total_node_reward.try_into()?,
+            operator_reward.try_into()?,
+            delegators_reward.try_into()?,
+        ))
     }
 
-    // keybase://chat/nymtech#dev-core/14473
     pub fn reward(&self, params: &RewardParams) -> NodeRewardResult {
-        let lambda_ticked = self.lambda_ticked(params);
-        let sigma_ticked = self.sigma_ticked(params);
+        let lambda = self.lambda(params);
+        let sigma = self.sigma(params);
 
         let reward = params.performance()
             * params.epoch_reward_pool()
-            * (sigma_ticked * params.omega()
-                + params.alpha() * lambda_ticked * sigma_ticked * params.rewarded_set_size())
+            * (sigma * params.omega()
+                + params.alpha() * lambda * sigma * params.rewarded_set_size())
             / (ONE + params.alpha());
 
-        // we only need regular lambda and sigma to calculate operator and delegator rewards
         NodeRewardResult {
             reward,
-            lambda: self.lambda(params),
-            sigma: self.sigma(params),
+            lambda,
+            sigma,
         }
     }
 
-    pub fn node_profit(&self, params: &RewardParams, base_operator_cost: u64) -> U128 {
-        self.reward(params)
-            .reward()
-            .saturating_sub(params.node.operator_cost(base_operator_cost))
+    pub fn node_profit(&self, params: &RewardParams) -> U128 {
+        if self.reward(params).reward() < params.node.operator_cost() {
+            U128::from_num(0u128)
+        } else {
+            self.reward(params).reward() - params.node.operator_cost()
+        }
     }
 
-    pub fn operator_reward(&self, params: &RewardParams, base_operator_cost: u64) -> u128 {
+    pub fn operator_reward(&self, params: &RewardParams) -> u128 {
         let reward = self.reward(params);
-        if reward.sigma == 0u128 {
+        if reward.sigma == 0 {
             return 0;
         }
-
-        let profit = reward
-            .reward
-            .saturating_sub(params.node.operator_cost(base_operator_cost));
-
-        let operator_base_reward = reward
-            .reward
-            .min(params.node.operator_cost(base_operator_cost));
+        let profit = if reward.reward < params.node.operator_cost() {
+            U128::from_num(0u128)
+        } else {
+            reward.reward - params.node.operator_cost()
+        };
+        let operator_base_reward = reward.reward.min(params.node.operator_cost());
         // Div by zero checked above
         let operator_reward = (self.profit_margin()
             + (ONE - self.profit_margin()) * reward.lambda / reward.sigma)
@@ -519,23 +500,19 @@ impl MixNodeBond {
     }
 
     pub fn sigma_ratio(&self, params: &RewardParams) -> U128 {
-        if self.total_bond_to_staking_supply(params.staking_supply()) < params.one_over_k() {
-            self.total_bond_to_staking_supply(params.staking_supply())
+        if self.total_bond_to_circulating_supply(params.circulating_supply()) < params.one_over_k()
+        {
+            self.total_bond_to_circulating_supply(params.circulating_supply())
         } else {
             params.one_over_k()
         }
     }
 
-    pub fn reward_delegation(
-        &self,
-        delegation_amount: Uint128,
-        params: &RewardParams,
-        base_operator_cost: u64,
-    ) -> u128 {
+    pub fn reward_delegation(&self, delegation_amount: Uint128, params: &RewardParams) -> u128 {
         let reward_params = DelegatorRewardParams::new(
             self.sigma(params),
             self.profit_margin(),
-            self.node_profit(params, base_operator_cost),
+            self.node_profit(params),
             params.to_owned(),
         );
         reward_params.determine_delegation_reward(delegation_amount)
@@ -645,12 +622,6 @@ pub struct MixOwnershipResponse {
     pub mixnode: Option<MixNodeBond>,
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
-pub struct MixnodeBondResponse {
-    pub identity: IdentityKey,
-    pub mixnode: Option<MixNodeBond>,
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

common/cosmwasm-smart-contracts/mixnet-contract/src/msg.rs

@@ -99,23 +99,11 @@ pub enum ExecuteMsg {
     },
     // AdvanceCurrentInterval {},
     AdvanceCurrentEpoch {},
-    ClaimOperatorReward {},
-    ClaimOperatorRewardOnBehalf {
-        owner: String,
-    },
-    ClaimDelegatorReward {
-        mix_identity: IdentityKey,
-    },
-    ClaimDelegatorRewardOnBehalf {
-        mix_identity: IdentityKey,
-        owner: String,
-    },
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
-    GetCurrentOperatorCost {},
     GetRewardingValidatorAddress {},
     GetAllDelegationKeys {},
     DebugGetAllDelegationValues {},
@@ -134,12 +122,6 @@ pub enum QueryMsg {
     OwnsGateway {
         address: String,
     },
-    GetMixnodeBond {
-        identity: IdentityKey,
-    },
-    GetGatewayBond {
-        identity: IdentityKey,
-    },
     StateParams {},
     // gets all [paged] delegations associated with particular mixnode
     GetMixnodeDelegations {
@@ -166,7 +148,6 @@ pub enum QueryMsg {
     LayerDistribution {},
     GetRewardPool {},
     GetCirculatingSupply {},
-    GetStakingSupply {},
     GetIntervalRewardPercent {},
     GetSybilResistancePercent {},
     GetActiveSetWorkFactor {},