merged with fbdf31b879

- make operations available as requests (typed with any for now, needs changing)
- move `FeeDetails` to `common/types`
- mock `getGasFee()`

.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

@@ -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/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 }}
-```

CHANGELOG.md

@@ -2,69 +2,26 @@
 
 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])
-- 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])
-- 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]).
-
-### Fixed
-
-- 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])
-
-### 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])
-
-[#1249]: https://github.com/nymtech/nym/pull/1249
-[#1256]: https://github.com/nymtech/nym/pull/1256
-[#1260]: https://github.com/nymtech/nym/pull/1260
-[#1261]: https://github.com/nymtech/nym/pull/1261
-[#1267]: https://github.com/nymtech/nym/pull/1267
-[#1278]: https://github.com/nymtech/nym/pull/1278
-[#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
-[#1376]: https://github.com/nymtech/nym/pull/1376
-
-## [nym-contracts-v1.0.1](https://github.com/nymtech/nym/tree/nym-contracts-v1.0.1) (2022-06-22)
-
-### Added
-
 - mixnet-contract: Added ClaimOperatorReward and ClaimDelegatorReward messages ([#1292])
 - 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]).
+- 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])
-- vesting-contract: Added limit to the amount of tokens one can pledge ([#1331])
+- 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.
+- network-statistics: a new mixnet service that aggregates and exposes anonymized data about mixnet services ([#1328])
 
 ### Fixed
 
@@ -73,42 +30,34 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - 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.
 - vesting-contract: replaced `checked_sub` with `saturating_sub` to fix the underflow in `get_vesting_tokens` ([#1275])
+- native & socks5 clients: fail early when clients try to re-init with a different gateway, which is not supported yet ([#1322])
 
+### Changed
 
-[#1255]: https://github.com/nymtech/nym/pull/1255
+- 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]]
+- network-requester: allow to voluntarily store and send statistical data about the number of bytes the proxied server serves ([#1328])
+
+[#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
-[#1331]: https://github.com/nymtech/nym/pull/1331
-[#1369]: https://github.com/nymtech/nym/pull/1369
-[#1373]: https://github.com/nymtech/nym/pull/1373
-
-## [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
+[#1295]: https://github.com/nymtech/nym/pull/1295
 [#1302]: https://github.com/nymtech/nym/pull/1302
+[#1318]: https://github.com/nymtech/nym/pull/1318
+[#1322]: https://github.com/nymtech/nym/pull/1322
+[#1328]: https://github.com/nymtech/nym/pull/1328
 
 ## [nym-wallet-v1.0.4](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.4) (2022-05-04)
 

Cargo.lock

@@ -14,15 +14,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[package]]
-name = "aead"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877"
-dependencies = [
- "generic-array 0.14.5",
-]
-
 [[package]]
 name = "aes"
 version = "0.7.5"
@@ -47,20 +38,6 @@ dependencies = [
  "cpufeatures",
 ]
 
-[[package]]
-name = "aes-gcm"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6"
-dependencies = [
- "aead",
- "aes 0.7.5",
- "cipher 0.3.0",
- "ctr 0.8.0",
- "ghash",
- "subtle 2.4.1",
-]
-
 [[package]]
 name = "ahash"
 version = "0.7.6"
@@ -221,6 +198,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "base-x"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
+
 [[package]]
 name = "base16ct"
 version = "0.1.1"
@@ -267,7 +250,7 @@ dependencies = [
  "pbkdf2",
  "rand_core 0.6.3",
  "ripemd160",
- "sha2 0.9.9",
+ "sha2",
  "subtle 2.4.1",
  "zeroize",
 ]
@@ -427,7 +410,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
 dependencies = [
- "sha2 0.9.9",
+ "sha2",
 ]
 
 [[package]]
@@ -718,6 +701,12 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"
 
+[[package]]
+name = "const_fn"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935"
+
 [[package]]
 name = "constant_time_eq"
 version = "0.1.5"
@@ -739,19 +728,12 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
 [[package]]
 name = "cookie"
-version = "0.16.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94d4706de1b0fa5b132270cddffa8585166037822e260a944fe161acd137ca05"
+checksum = "d5f1c7727e460397e56abc4bddc1d49e07a1ad78fc98eb2e1c8f032a58a2f80d"
 dependencies = [
- "aes-gcm",
- "base64",
- "hkdf 0.12.3",
- "hmac 0.12.1",
  "percent-encoding",
- "rand 0.8.5",
- "sha2 0.10.2",
- "subtle 2.4.1",
- "time 0.3.9",
+ "time 0.2.27",
  "version_check",
 ]
 
@@ -1140,16 +1122,6 @@ dependencies = [
  "cipher 0.4.3",
 ]
 
-[[package]]
-name = "cupid"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bad352a84b567cc38a5854e3aa8ee903cb8519a25d0b799b739bafffd1f91a1"
-dependencies = [
- "gcc",
- "rustc_version 0.2.3",
-]
-
 [[package]]
 name = "curve25519-dalek"
 version = "3.2.0"
@@ -1360,6 +1332,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "discard"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
+
 [[package]]
 name = "dkg"
 version = "0.1.0"
@@ -1376,7 +1354,7 @@ dependencies = [
  "rand_core 0.6.3",
  "serde",
  "serde_derive",
- "sha2 0.9.9",
+ "sha2",
  "thiserror",
  "zeroize",
 ]
@@ -1432,7 +1410,7 @@ dependencies = [
  "rand 0.7.3",
  "serde",
  "serde_bytes",
- "sha2 0.9.9",
+ "sha2",
  "zeroize",
 ]
 
@@ -1446,7 +1424,7 @@ dependencies = [
  "hex",
  "rand_core 0.6.3",
  "serde",
- "sha2 0.9.9",
+ "sha2",
  "thiserror",
  "zeroize",
 ]
@@ -1976,12 +1954,6 @@ dependencies = [
  "tungstenite",
 ]
 
-[[package]]
-name = "gcc"
-version = "0.3.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
-
 [[package]]
 name = "generator"
 version = "0.7.0"
@@ -2052,16 +2024,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "ghash"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99"
-dependencies = [
- "opaque-debug 0.3.0",
- "polyval",
-]
-
 [[package]]
 name = "git2"
 version = "0.14.2"
@@ -2634,7 +2596,7 @@ dependencies = [
  "ecdsa",
  "elliptic-curve",
  "sec1",
- "sha2 0.9.9",
+ "sha2",
  "sha3",
 ]
 
@@ -2890,7 +2852,6 @@ dependencies = [
  "nymsphinx-types",
  "rand 0.8.5",
  "serde",
- "task",
  "tokio",
  "tokio-util 0.7.3",
  "url",
@@ -3112,7 +3073,6 @@ dependencies = [
  "rand 0.7.3",
  "serde",
  "sqlx",
- "statistics-common",
  "subtle-encoding",
  "thiserror",
  "tokio",
@@ -3136,7 +3096,6 @@ dependencies = [
  "colored",
  "config",
  "crypto",
- "cupid",
  "dirs",
  "dotenv",
  "futures",
@@ -3155,7 +3114,6 @@ dependencies = [
  "rocket",
  "serde",
  "serial_test",
- "sysinfo",
  "task",
  "tokio",
  "tokio-util 0.7.3",
@@ -3171,7 +3129,6 @@ dependencies = [
 name = "nym-network-requester"
 version = "1.0.1"
 dependencies = [
- "async-trait",
  "clap 2.34.0",
  "dirs",
  "futures",
@@ -3188,7 +3145,7 @@ dependencies = [
  "serde",
  "socks5-requests",
  "sqlx",
- "statistics-common",
+ "statistics",
  "thiserror",
  "tokio",
  "tokio-tungstenite",
@@ -3205,7 +3162,7 @@ dependencies = [
  "rocket",
  "serde",
  "sqlx",
- "statistics-common",
+ "statistics",
  "thiserror",
  "tokio",
  "tokio-tungstenite",
@@ -3363,7 +3320,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_derive",
- "sha2 0.9.9",
+ "sha2",
  "thiserror",
 ]
 
@@ -3894,18 +3851,6 @@ dependencies = [
  "plotters-backend",
 ]
 
-[[package]]
-name = "polyval"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "opaque-debug 0.3.0",
- "universal-hash",
-]
-
 [[package]]
 name = "ppv-lite86"
 version = "0.2.16"
@@ -3969,6 +3914,12 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "proc-macro-hack"
+version = "0.5.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.37"
@@ -4530,9 +4481,9 @@ dependencies = [
 
 [[package]]
 name = "rocket"
-version = "0.5.0-rc.2"
+version = "0.5.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98ead083fce4a405feb349cf09abdf64471c6077f14e0ce59364aa90d4b99317"
+checksum = "0a71c18c42a0eb15bf3816831caf0dad11e7966f2a41aaf486a701979c4dd1f2"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -4548,7 +4499,7 @@ dependencies = [
  "memchr",
  "multer",
  "num_cpus",
- "parking_lot 0.12.0",
+ "parking_lot 0.11.2",
  "pin-project-lite",
  "rand 0.8.5",
  "ref-cast",
@@ -4558,10 +4509,10 @@ dependencies = [
  "serde_json",
  "state",
  "tempfile",
- "time 0.3.9",
+ "time 0.2.27",
  "tokio",
  "tokio-stream",
- "tokio-util 0.7.3",
+ "tokio-util 0.6.9",
  "ubyte",
  "version_check",
  "yansi",
@@ -4569,9 +4520,9 @@ dependencies = [
 
 [[package]]
 name = "rocket_codegen"
-version = "0.5.0-rc.2"
+version = "0.5.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6aeb6bb9c61e9cd2c00d70ea267bf36f76a4cc615e5908b349c2f9d93999b47"
+checksum = "66f5fa462f7eb958bba8710c17c5d774bbbd59809fa76fb1957af7e545aea8bb"
 dependencies = [
  "devise",
  "glob",
@@ -4600,18 +4551,19 @@ dependencies = [
 
 [[package]]
 name = "rocket_http"
-version = "0.5.0-rc.2"
+version = "0.5.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ded65d127954de3c12471630bf4b81a2792f065984461e65b91d0fdaafc17a2"
+checksum = "23c8b7d512d2fcac2316ebe590cde67573844b99e6cc9ee0f53375fa16e25ebd"
 dependencies = [
  "cookie",
  "either",
- "futures",
  "http",
  "hyper",
  "indexmap",
  "log",
  "memchr",
+ "mime",
+ "parking_lot 0.11.2",
  "pear",
  "percent-encoding",
  "pin-project-lite",
@@ -4620,16 +4572,16 @@ dependencies = [
  "smallvec 1.8.0",
  "stable-pattern",
  "state",
- "time 0.3.9",
+ "time 0.2.27",
  "tokio",
  "uncased",
 ]
 
 [[package]]
 name = "rocket_okapi"
-version = "0.8.0-rc.2"
+version = "0.8.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "489f4f5b120762f7974e65b919fc462d0660fd8b839026d8985b850fe5acccb0"
+checksum = "0025aa04994af8cd8e1fcdd5a73579a395c941ae090ecb0a39b41cca7e237a20"
 dependencies = [
  "either",
  "log",
@@ -4643,9 +4595,9 @@ dependencies = [
 
 [[package]]
 name = "rocket_okapi_codegen"
-version = "0.8.0-rc.2"
+version = "0.8.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54f94d1ffe41472e08463d7a2674f1db04dc4df745285e8369b33d3cfd6b0308"
+checksum = "dc114779fc27afb78179233e966f469e47fd7a98dc15181cff2574cdddb65612"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -4656,9 +4608,9 @@ dependencies = [
 
 [[package]]
 name = "rocket_sync_db_pools"
-version = "0.1.0-rc.2"
+version = "0.1.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fa48b6ab25013e9812f1b0c592741900b3a2a83c0936292e0565c0ac842f558"
+checksum = "38cfdfebd552d075c368e641c88a5cd6ce1c58c5c710548aeb777abb48830f4b"
 dependencies = [
  "r2d2",
  "rocket",
@@ -4669,9 +4621,9 @@ dependencies = [
 
 [[package]]
 name = "rocket_sync_db_pools_codegen"
-version = "0.1.0-rc.2"
+version = "0.1.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "280ef2d232923e69cb93da156972eb5476a7cce5ba44843f6608f46a4abf7aab"
+checksum = "5267808c094db5366e1d8925aaf9f2ce05ff9b3bd92cb18c7040a1fe219c2e25"
 dependencies = [
  "devise",
  "quote",
@@ -4768,9 +4720,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "0.8.10"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1847b767a3d62d95cbf3d8a9f0e421cf57a0d8aa4f411d4b16525afb0284d4ed"
+checksum = "c6b5a3c80cea1ab61f4260238409510e814e38b4b563c06044edf91e7dc070e3"
 dependencies = [
  "dyn-clone",
  "indexmap",
@@ -4781,9 +4733,9 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.10"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af4d7e1b012cb3d9129567661a63755ea4b8a7386d339dc945ae187e403c6743"
+checksum = "41ae4dce13e8614c46ac3c38ef1c0d668b101df6ac39817aebdaa26642ddae9b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4962,9 +4914,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive_internals"
-version = "0.26.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
+checksum = "1dbab34ca63057a1f15280bdf3c39f2b1eb1b54c17e98360e511637aef7418c6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5075,6 +5027,21 @@ dependencies = [
  "digest 0.10.3",
 ]
 
+[[package]]
+name = "sha1"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
+dependencies = [
+ "sha1_smol",
+]
+
+[[package]]
+name = "sha1_smol"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
+
 [[package]]
 name = "sha2"
 version = "0.9.9"
@@ -5088,17 +5055,6 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
-[[package]]
-name = "sha2"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest 0.10.3",
-]
-
 [[package]]
 name = "sha3"
 version = "0.9.1"
@@ -5249,7 +5205,7 @@ dependencies = [
  "log",
  "rand 0.7.3",
  "rand_distr",
- "sha2 0.9.9",
+ "sha2",
  "subtle 2.4.1",
 ]
 
@@ -5332,7 +5288,7 @@ dependencies = [
  "paste",
  "percent-encoding",
  "rustls",
- "sha2 0.9.9",
+ "sha2",
  "smallvec 1.8.0",
  "sqlformat",
  "sqlx-rt",
@@ -5356,7 +5312,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "sha2 0.9.9",
+ "sha2",
  "sqlx-core",
  "sqlx-rt",
  "syn",
@@ -5384,10 +5340,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "state"
-version = "0.5.3"
+name = "standback"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b"
+checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "state"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cf4f5369e6d3044b5e365c9690f451516ac8f0954084622b49ea3fde2f6de5"
 dependencies = [
  "loom",
 ]
@@ -5399,20 +5364,64 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
-name = "statistics-common"
+name = "statistics"
 version = "1.0.1"
 dependencies = [
- "async-trait",
- "log",
- "network-defaults",
  "reqwest",
  "serde",
  "serde_json",
- "sqlx",
  "thiserror",
- "tokio",
 ]
 
+[[package]]
+name = "stdweb"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
+dependencies = [
+ "discard",
+ "rustc_version 0.2.3",
+ "stdweb-derive",
+ "stdweb-internal-macros",
+ "stdweb-internal-runtime",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "stdweb-derive"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_derive",
+ "syn",
+]
+
+[[package]]
+name = "stdweb-internal-macros"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
+dependencies = [
+ "base-x",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "sha1",
+ "syn",
+]
+
+[[package]]
+name = "stdweb-internal-runtime"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
+
 [[package]]
 name = "stringprep"
 version = "0.1.2"
@@ -5501,21 +5510,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "sysinfo"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a8e71535da31837213ac114531d31def75d7aebd133264e420a3451fa7f703"
-dependencies = [
- "cfg-if 1.0.0",
- "core-foundation-sys",
- "libc",
- "ntapi",
- "once_cell",
- "rayon",
- "winapi",
-]
-
 [[package]]
 name = "tap"
 version = "1.0.1"
@@ -5567,7 +5561,7 @@ dependencies = [
  "serde_bytes",
  "serde_json",
  "serde_repr",
- "sha2 0.9.9",
+ "sha2",
  "signature",
  "subtle 2.4.1",
  "subtle-encoding",
@@ -5705,6 +5699,21 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "time"
+version = "0.2.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242"
+dependencies = [
+ "const_fn",
+ "libc",
+ "standback",
+ "stdweb",
+ "time-macros 0.1.1",
+ "version_check",
+ "winapi",
+]
+
 [[package]]
 name = "time"
 version = "0.3.9"
@@ -5715,7 +5724,17 @@ dependencies = [
  "libc",
  "num_threads",
  "serde",
- "time-macros",
+ "time-macros 0.2.4",
+]
+
+[[package]]
+name = "time-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1"
+dependencies = [
+ "proc-macro-hack",
+ "time-macros-impl",
 ]
 
 [[package]]
@@ -5724,6 +5743,19 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792"
 
+[[package]]
+name = "time-macros-impl"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f"
+dependencies = [
+ "proc-macro-hack",
+ "proc-macro2",
+ "quote",
+ "standback",
+ "syn",
+]
+
 [[package]]
 name = "tiny-keccak"
 version = "2.0.2"
@@ -6209,16 +6241,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
 
-[[package]]
-name = "universal-hash"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05"
-dependencies = [
- "generic-array 0.14.5",
- "subtle 2.4.1",
-]
-
 [[package]]
 name = "untrusted"
 version = "0.7.1"
@@ -6286,7 +6308,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
- "sha2 0.9.9",
+ "sha2",
  "thiserror",
  "tokio",
  "ts-rs",

Makefile

@@ -1,13 +1,11 @@
 test: build clippy-all cargo-test wasm fmt
-test-all: test cargo-test-expensive
 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,9 +52,6 @@ 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
 

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');
-}

clients/client-core/Cargo.toml

@@ -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/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

@@ -26,4 +26,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

@@ -8,7 +8,7 @@ use url::Url;
 use crate::error::Result;
 use crate::{MNEMONIC, NYMD_URL};
 
-use network_defaults::{DEFAULT_NETWORK, DENOM, VOUCHER_INFO};
+use network_defaults::{DEFAULT_NETWORK, MIX_DENOM, VOUCHER_INFO};
 use validator_client::nymd::traits::CoconutBandwidthSigningClient;
 use validator_client::nymd::{Coin, Fee, NymdClient, SigningNymdClient};
 
@@ -34,7 +34,7 @@ impl Client {
         encryption_key: String,
         fee: Option<Fee>,
     ) -> Result<String> {
-        let amount = Coin::new(amount as u128, DENOM.to_string());
+        let amount = Coin::new(amount as u128, MIX_DENOM.base.to_string());
         Ok(self
             .nymd_client
             .deposit(

clients/native/Cargo.toml

@@ -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")
@@ -186,68 +181,25 @@ 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() {
+        if matches.is_present("gateway") {
+            panic!("At the moment, gateway information can't be overwritten. If you want to point to a different gateway, client {}'s directory will need to be manually removed", id);
+        }
+        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 +207,36 @@ 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");
+        log::trace!("Chosen gateway: {:?}", chosen_gateway_id);
+
+        let gateway_details = gateway_details(
+            config.get_base().get_validator_api_endpoints(),
+            chosen_gateway_id,
+        )
+        .await;
+        log::trace!("Used gateway: {}", gateway_details);
+        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();

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

@@ -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,26 @@ 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() {
+        if matches.is_present("gateway") {
+            panic!("At the moment, gateway information can't be overwritten. If you want to point to a different gateway, client {}'s directory will need to be manually removed", id);
+        }
+        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 +207,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 +242,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;
 

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

@@ -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/validator-client/Cargo.toml

@@ -43,7 +43,6 @@ itertools = { version = "0.10", optional = true }
 cosmwasm-std = { version = "1.0.0", optional = true }
 execute = { path = "../../execute" }
 
-[dev-dependencies]
 ts-rs = "6.1.2"
 
 [features]

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

@@ -318,13 +318,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,

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

@@ -26,7 +26,7 @@ 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 as CosmosCoin, Tx};
 use prost::Message;
 use serde::{Deserialize, Serialize};
 use std::convert::{TryFrom, TryInto};
@@ -121,7 +121,7 @@ pub trait CosmWasmClient: rpc::Client {
     async fn get_balance(
         &self,
         address: &AccountId,
-        search_denom: Denom,
+        search_denom: String,
     ) -> Result<Option<Coin>, NymdError> {
         let path = Some("/cosmos.bank.v1beta1.Query/Balance".parse().unwrap());
 

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

@@ -1,8 +1,10 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::nymd::Coin;
 use cosmrs::tx;
 use serde::{Deserialize, Serialize};
+use std::fmt::{Display, Formatter};
 
 pub mod gas_price;
 
@@ -14,6 +16,40 @@ pub enum Fee {
     Auto(Option<f32>),
 }
 
+impl Display for Fee {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Fee::Manual(fee) => {
+                write!(f, "Fee in manual mode with ")?;
+                for fee in &fee.amount {
+                    write!(f, "{}{} paid in fees, ", fee.amount, fee.denom)?;
+                }
+                write!(f, "{} set as gas limit, ", fee.gas_limit)?;
+                if let Some(payer) = &fee.payer {
+                    write!(f, "{payer} set as payer, ")?;
+                }
+                if let Some(granter) = &fee.granter {
+                    write!(f, "{granter} set as granter")?;
+                }
+                Ok(())
+            }
+            Fee::Auto(Some(multiplier)) => {
+                write!(f, "Fee in auto mode with {multiplier} simulated multiplier")
+            }
+            Fee::Auto(None) => write!(f, "Fee in auto mode with no custom simulated multiplier"),
+        }
+    }
+}
+
+impl Fee {
+    pub fn try_get_manual_amount(&self) -> Option<Vec<Coin>> {
+        match self {
+            Fee::Manual(tx_fee) => Some(tx_fee.amount.iter().cloned().map(Into::into).collect()),
+            Fee::Auto(_) => None,
+        }
+    }
+}
+
 impl From<tx::Fee> for Fee {
     fn from(fee: tx::Fee) -> Self {
         Fee::Manual(fee)

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

@@ -18,18 +18,16 @@ use execute::execute;
 pub use fee::gas_price::GasPrice;
 use mixnet_contract_common::mixnode::DelegationEvent;
 use mixnet_contract_common::{
-    ContractStateParams, Delegation, ExecuteMsg, Gateway, GatewayBond, GatewayBondResponse,
-    GatewayOwnershipResponse, IdentityKey, Interval, LayerDistribution, MixNode, MixNodeBond,
-    MixOwnershipResponse, MixnetContractVersion, MixnodeBondResponse,
-    MixnodeRewardingStatusResponse, PagedDelegatorDelegationsResponse, PagedGatewayResponse,
-    PagedMixDelegationsResponse, PagedMixnodeResponse, PagedRewardedSetResponse, QueryMsg,
-    RewardedSetUpdateDetails,
+    ContractStateParams, Delegation, ExecuteMsg, Gateway, GatewayBond, GatewayOwnershipResponse,
+    IdentityKey, Interval, LayerDistribution, MixNode, MixNodeBond, MixOwnershipResponse,
+    MixnetContractVersion, MixnodeRewardingStatusResponse, PagedDelegatorDelegationsResponse,
+    PagedGatewayResponse, PagedMixDelegationsResponse, PagedMixnodeResponse,
+    PagedRewardedSetResponse, QueryMsg, RewardedSetUpdateDetails,
 };
 use network_defaults::DEFAULT_NETWORK;
 use serde::Serialize;
 use std::convert::TryInto;
 use vesting_contract_common::ExecuteMsg as VestingExecuteMsg;
-use vesting_contract_common::QueryMsg as VestingQueryMsg;
 
 pub use crate::nymd::cosmwasm_client::client::CosmWasmClient;
 pub use crate::nymd::cosmwasm_client::signing_client::SigningCosmWasmClient;
@@ -136,7 +134,7 @@ impl NymdClient<SigningNymdClient> {
     where
         U: TryInto<HttpClientUrl, Error = TendermintRpcError>,
     {
-        let denom = network.denom();
+        let denom = network.mix_denom().base;
         let client_address = signer
             .try_derive_accounts()?
             .into_iter()
@@ -178,7 +176,7 @@ impl NymdClient<SigningNymdClient> {
         U: TryInto<HttpClientUrl, Error = TendermintRpcError>,
     {
         let prefix = network.bech32_prefix();
-        let denom = network.denom();
+        let denom = network.mix_denom().base;
         let wallet = DirectSecp256k1HdWallet::from_mnemonic(prefix, mnemonic)?;
         let client_address = wallet
             .try_derive_accounts()?
@@ -340,7 +338,7 @@ impl<C> NymdClient<C> {
     pub async fn get_balance(
         &self,
         address: &AccountId,
-        denom: Denom,
+        denom: String,
     ) -> Result<Option<Coin>, NymdError>
     where
         C: CosmWasmClient + Sync,
@@ -382,16 +380,6 @@ impl<C> NymdClient<C> {
             .await
     }
 
-    pub async fn vesting_get_locked_pledge_cap(&self) -> Result<Uint128, NymdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        let request = VestingQueryMsg::GetLockedPledgeCap {};
-        self.client
-            .query_contract_smart(self.vesting_contract_address(), &request)
-            .await
-    }
-
     pub async fn get_delegator_rewards(
         &self,
         address: String,
@@ -438,16 +426,6 @@ impl<C> NymdClient<C> {
             .await
     }
 
-    pub async fn get_current_operator_cost(&self) -> Result<u64, NymdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        let request = QueryMsg::GetCurrentOperatorCost {};
-        self.client
-            .query_contract_smart(self.mixnet_contract_address(), &request)
-            .await
-    }
-
     pub async fn get_mixnet_contract_version(&self) -> Result<MixnetContractVersion, NymdError>
     where
         C: CosmWasmClient + Sync,
@@ -617,38 +595,6 @@ impl<C> NymdClient<C> {
         Ok(response.gateway)
     }
 
-    /// Checks whether there is a bonded mixnode associated with the provided identity key
-    pub async fn get_mixnode_bond(
-        &self,
-        identity: IdentityKey,
-    ) -> Result<Option<MixNodeBond>, NymdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        let request = QueryMsg::GetMixnodeBond { identity };
-        let response: MixnodeBondResponse = self
-            .client
-            .query_contract_smart(self.mixnet_contract_address(), &request)
-            .await?;
-        Ok(response.mixnode)
-    }
-
-    /// Checks whether there is a bonded gateway associated with the provided identity key
-    pub async fn get_gateway_bond(
-        &self,
-        identity: IdentityKey,
-    ) -> Result<Option<GatewayBond>, NymdError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        let request = QueryMsg::GetGatewayBond { identity };
-        let response: GatewayBondResponse = self
-            .client
-            .query_contract_smart(self.mixnet_contract_address(), &request)
-            .await?;
-        Ok(response.gateway)
-    }
-
     pub async fn get_mixnodes_paged(
         &self,
         start_after: Option<IdentityKey>,
@@ -914,29 +860,6 @@ impl<C> NymdClient<C> {
             .await
     }
 
-    #[execute("mixnet")]
-    fn _compound_reward(
-        &self,
-        operator: Option<String>,
-        delegator: Option<String>,
-        mix_identity: Option<IdentityKey>,
-        proxy: Option<String>,
-        fee: Option<Fee>,
-    ) -> (ExecuteMsg, Option<Fee>)
-    where
-        C: SigningCosmWasmClient + Sync,
-    {
-        (
-            ExecuteMsg::CompoundReward {
-                operator,
-                delegator,
-                mix_identity,
-                proxy,
-            },
-            fee,
-        )
-    }
-
     #[execute("mixnet")]
     fn _compound_operator_reward(&self, fee: Option<Fee>) -> (ExecuteMsg, Option<Fee>)
     where
@@ -1026,18 +949,6 @@ impl<C> NymdClient<C> {
         )
     }
 
-    #[execute("vesting")]
-    fn _vesting_update_locked_pledge_cap(
-        &self,
-        amount: Uint128,
-        fee: Option<Fee>,
-    ) -> (VestingExecuteMsg, Option<Fee>)
-    where
-        C: SigningCosmWasmClient + Sync,
-    {
-        (VestingExecuteMsg::UpdateLockedPledgeCap { amount }, fee)
-    }
-
     /// Announce a mixnode, paying a fee.
     pub async fn bond_mixnode(
         &self,

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

@@ -49,7 +49,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> MultisigSigningClient for NymdClien
     ) -> 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()),
+            funds: Coin::new(voucher_value, DEFAULT_NETWORK.mix_denom().base),
         };
         let release_funds_msg = CosmosMsg::Wasm(WasmMsg::Execute {
             contract_addr: self.coconut_bandwidth_contract_address().to_string(),

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

@@ -33,7 +33,7 @@ pub struct Delegation {
     pub node_identity: IdentityKey,
     pub amount: Coin,
     pub block_height: u64,
-    pub proxy: Option<Addr>, // proxy address used to delegate the funds on behalf of anouther address
+    pub proxy: Option<Addr>, // proxy address used to delegate the funds on behalf of another address
 }
 
 impl Eq for Delegation {}

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

@@ -136,12 +136,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

@@ -37,6 +37,16 @@ pub enum DelegationEvent {
     Undelegate(PendingUndelegate),
 }
 
+impl DelegationEvent {
+    pub fn delegation_amount(&self) -> Option<Coin> {
+        match self {
+            DelegationEvent::Delegate(delegation) => Some(delegation.amount.clone()),
+            // I think it would be nice to also expose an amount here to know how much we're undelegating
+            DelegationEvent::Undelegate(_) => None,
+        }
+    }
+}
+
 #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
 pub struct PendingUndelegate {
     mix_identity: IdentityKey,
@@ -220,9 +230,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 =
@@ -392,21 +402,22 @@ 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)
+            / U128::from_num(circulating_supply)
     }
 
     pub fn lambda_ticked(&self, params: &RewardParams) -> U128 {
@@ -416,7 +427,7 @@ impl MixNodeBond {
 
     pub fn lambda(&self, params: &RewardParams) -> U128 {
         // Ratio of a bond to the token circulating supply
-        self.pledge_to_staking_supply(params.staking_supply())
+        self.pledge_to_circulating_supply(params.circulating_supply())
     }
 
     pub fn sigma_ticked(&self, params: &RewardParams) -> U128 {
@@ -426,12 +437,11 @@ impl MixNodeBond {
 
     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())
+        self.total_bond_to_circulating_supply(params.circulating_supply())
     }
 
     pub fn estimate_reward(
         &self,
-        base_operator_cost: u64,
         params: &RewardParams,
     ) -> Result<RewardEstimate, MixnetContractError> {
         let total_node_reward = self
@@ -440,15 +450,15 @@ impl MixNodeBond {
             .checked_to_num::<u128>()
             .unwrap_or_default();
         let node_profit = self
-            .node_profit(params, base_operator_cost)
+            .node_profit(params)
             .checked_to_num::<u128>()
             .unwrap_or_default();
         let operator_cost = params
             .node
-            .operator_cost(base_operator_cost)
+            .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);
 
@@ -480,25 +490,21 @@ impl MixNodeBond {
         }
     }
 
-    pub fn node_profit(&self, params: &RewardParams, base_operator_cost: u64) -> U128 {
+    pub fn node_profit(&self, params: &RewardParams) -> U128 {
         self.reward(params)
             .reward()
-            .saturating_sub(params.node.operator_cost(base_operator_cost))
+            .saturating_sub(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 profit = reward.reward.saturating_sub(params.node.operator_cost());
 
-        let operator_base_reward = reward
-            .reward
-            .min(params.node.operator_cost(base_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 +525,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 +647,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

@@ -32,12 +32,6 @@ pub enum ExecuteMsg {
     CompoundDelegatorReward {
         mix_identity: IdentityKey,
     },
-    CompoundReward {
-        operator: Option<String>,
-        delegator: Option<String>,
-        mix_identity: Option<IdentityKey>,
-        proxy: Option<String>,
-    },
     BondMixnode {
         mix_node: MixNode,
         owner_signature: String,
@@ -121,7 +115,6 @@ pub enum ExecuteMsg {
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
-    GetCurrentOperatorCost {},
     GetRewardingValidatorAddress {},
     GetAllDelegationKeys {},
     DebugGetAllDelegationValues {},
@@ -140,12 +133,6 @@ pub enum QueryMsg {
     OwnsGateway {
         address: String,
     },
-    GetMixnodeBond {
-        identity: IdentityKey,
-    },
-    GetGatewayBond {
-        identity: IdentityKey,
-    },
     StateParams {},
     // gets all [paged] delegations associated with particular mixnode
     GetMixnodeDelegations {
@@ -172,7 +159,6 @@ pub enum QueryMsg {
     LayerDistribution {},
     GetRewardPool {},
     GetCirculatingSupply {},
-    GetStakingSupply {},
     GetIntervalRewardPercent {},
     GetSybilResistancePercent {},
     GetActiveSetWorkFactor {},

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

@@ -1,6 +1,7 @@
 use crate::{error::MixnetContractError, mixnode::StoredNodeRewardResult, ONE, U128};
 use az::CheckedCast;
 use cosmwasm_std::Uint128;
+use network_defaults::DEFAULT_OPERATOR_INTERVAL_COST;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
@@ -40,23 +41,19 @@ impl NodeEpochRewards {
         self.result.reward()
     }
 
-    pub fn operator_cost(&self, base_operator_cost: u64) -> U128 {
-        self.params.operator_cost(base_operator_cost)
+    pub fn operator_cost(&self) -> U128 {
+        self.params.operator_cost()
     }
 
-    pub fn node_profit(&self, base_operator_cost: u64) -> U128 {
+    pub fn node_profit(&self) -> U128 {
         let reward = U128::from_num(self.reward().u128());
         // if operating cost is higher then the reward node profit is 0
-        reward.saturating_sub(self.operator_cost(base_operator_cost))
+        reward.saturating_sub(self.operator_cost())
     }
 
-    pub fn operator_reward(
-        &self,
-        profit_margin: U128,
-        base_operator_cost: u64,
-    ) -> Result<Uint128, MixnetContractError> {
-        let reward = self.node_profit(base_operator_cost);
-        let operator_base_reward = reward.min(self.operator_cost(base_operator_cost));
+    pub fn operator_reward(&self, profit_margin: U128) -> Result<Uint128, MixnetContractError> {
+        let reward = self.node_profit();
+        let operator_base_reward = reward.min(self.operator_cost());
         let div_by_zero_check = if let Some(value) = self.lambda().checked_div(self.sigma()) {
             value
         } else {
@@ -77,14 +74,13 @@ impl NodeEpochRewards {
         &self,
         delegation_amount: Uint128,
         profit_margin: U128,
-        base_operator_cost: u64,
         epoch_reward_params: EpochRewardParams,
     ) -> Result<Uint128, MixnetContractError> {
         // change all values into their fixed representations
         let delegation_amount = U128::from_num(delegation_amount.u128());
-        let staking_supply = U128::from_num(epoch_reward_params.staking_supply());
+        let circulating_supply = U128::from_num(epoch_reward_params.circulating_supply());
 
-        let scaled_delegation_amount = delegation_amount / staking_supply;
+        let scaled_delegation_amount = delegation_amount / circulating_supply;
 
         let check_div_by_zero =
             if let Some(value) = scaled_delegation_amount.checked_div(self.sigma()) {
@@ -93,8 +89,7 @@ impl NodeEpochRewards {
                 return Err(MixnetContractError::DivisionByZero);
             };
 
-        let delegator_reward =
-            (ONE - profit_margin) * check_div_by_zero * self.node_profit(base_operator_cost);
+        let delegator_reward = (ONE - profit_margin) * check_div_by_zero * self.node_profit();
 
         let reward = delegator_reward.max(U128::ZERO);
         if let Some(int_reward) = reward.checked_cast() {
@@ -110,8 +105,7 @@ pub struct EpochRewardParams {
     epoch_reward_pool: Uint128,
     rewarded_set_size: Uint128,
     active_set_size: Uint128,
-    #[serde(alias = "circulating_supply")]
-    staking_supply: Uint128,
+    circulating_supply: Uint128,
     sybil_resistance_percent: u8,
     active_set_work_factor: u8,
 }
@@ -121,7 +115,7 @@ impl EpochRewardParams {
         epoch_reward_pool: u128,
         rewarded_set_size: u128,
         active_set_size: u128,
-        staking_supply: u128,
+        circulating_supply: u128,
         sybil_resistance_percent: u8,
         active_set_work_factor: u8,
     ) -> EpochRewardParams {
@@ -129,7 +123,7 @@ impl EpochRewardParams {
             epoch_reward_pool: Uint128::new(epoch_reward_pool),
             rewarded_set_size: Uint128::new(rewarded_set_size),
             active_set_size: Uint128::new(active_set_size),
-            staking_supply: Uint128::new(staking_supply),
+            circulating_supply: Uint128::new(circulating_supply),
             sybil_resistance_percent,
             active_set_work_factor,
         }
@@ -142,7 +136,7 @@ impl EpochRewardParams {
     pub fn new_empty() -> Self {
         EpochRewardParams {
             epoch_reward_pool: Uint128::new(0),
-            staking_supply: Uint128::new(0),
+            circulating_supply: Uint128::new(0),
             sybil_resistance_percent: 0,
             rewarded_set_size: Uint128::new(0),
             active_set_size: Uint128::new(0),
@@ -158,21 +152,13 @@ impl EpochRewardParams {
         self.active_set_size.u128()
     }
 
-    pub fn staking_supply(&self) -> u128 {
-        self.staking_supply.u128()
+    pub fn circulating_supply(&self) -> u128 {
+        self.circulating_supply.u128()
     }
 
     pub fn epoch_reward_pool(&self) -> u128 {
         self.epoch_reward_pool.u128()
     }
-
-    pub fn sybil_resistance_percent(&self) -> u8 {
-        self.sybil_resistance_percent
-    }
-
-    pub fn active_set_work_factor(&self) -> u8 {
-        self.active_set_work_factor
-    }
 }
 
 #[derive(Debug, Clone, JsonSchema, PartialEq, Serialize, Deserialize, Copy)]
@@ -191,8 +177,8 @@ impl NodeRewardParams {
         }
     }
 
-    pub fn operator_cost(&self, base_operator_cost: u64) -> U128 {
-        self.performance() * U128::from_num(base_operator_cost)
+    pub fn operator_cost(&self) -> U128 {
+        self.performance() * U128::from_num(DEFAULT_OPERATOR_INTERVAL_COST)
     }
 
     pub fn uptime(&self) -> Uint128 {
@@ -266,8 +252,8 @@ impl RewardParams {
         self.epoch.rewarded_set_size.u128()
     }
 
-    pub fn staking_supply(&self) -> u128 {
-        self.epoch.staking_supply.u128()
+    pub fn circulating_supply(&self) -> u128 {
+        self.epoch.circulating_supply.u128()
     }
 
     pub fn reward_blockstamp(&self) -> u64 {

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

@@ -43,7 +43,6 @@ pub struct ContractStateParams {
     // subset of rewarded mixnodes that are actively receiving mix traffic
     // used to handle shorter-term (e.g. hourly) fluctuations of demand
     pub mixnode_active_set_size: u32,
-    pub staking_supply: Uint128,
 }
 
 impl Display for ContractStateParams {

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

@@ -11,4 +11,4 @@ cw3 = { version = "0.13.1" }
 cw4 = { version = "0.13.1" }
 cosmwasm-std = "1.0.0"
 schemars = "0.8"
-serde = { version = "1.0.103", default-features = false, features = ["derive"] }
+serde = { version = "1.0.103", default-features = false, features = ["derive"] }

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

@@ -1,6 +1,6 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
-use config::defaults::DENOM;
+use config::defaults::MIX_DENOM;
 use cosmwasm_std::{Coin, Timestamp};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -11,7 +11,7 @@ pub mod events;
 pub mod messages;
 
 pub fn one_ucoin() -> Coin {
-    Coin::new(1, DENOM)
+    Coin::new(1, MIX_DENOM.base)
 }
 
 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
@@ -28,8 +28,8 @@ pub enum Period {
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct PledgeData {
-    amount: Coin,
-    block_time: Timestamp,
+    pub amount: Coin,
+    pub block_time: Timestamp,
 }
 
 impl PledgeData {
@@ -48,9 +48,9 @@ impl PledgeData {
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct OriginalVestingResponse {
-    amount: Coin,
-    number_of_periods: usize,
-    period_duration: u64,
+    pub amount: Coin,
+    pub number_of_periods: usize,
+    pub period_duration: u64,
 }
 
 impl OriginalVestingResponse {

common/cosmwasm-smart-contracts/vesting-contract/src/messages.rs

@@ -1,4 +1,4 @@
-use cosmwasm_std::{Coin, Timestamp, Uint128};
+use cosmwasm_std::{Coin, Timestamp};
 use mixnet_contract_common::{Gateway, IdentityKey, MixNode};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -113,9 +113,6 @@ pub enum ExecuteMsg {
     UpdateStakingAddress {
         to_address: Option<String>,
     },
-    UpdateLockedPledgeCap {
-        amount: Uint128,
-    },
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
@@ -166,5 +163,4 @@ pub enum QueryMsg {
     GetCurrentVestingPeriod {
         address: String,
     },
-    GetLockedPledgeCap {},
 }

common/credential-storage/Cargo.toml

@@ -17,4 +17,4 @@ tokio = { version = "1.19.1", features = [ "rt-multi-thread", "net", "signal", "
 
 [build-dependencies]
 sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"] }
-tokio = { version = "1.19.1", features = ["rt-multi-thread", "macros"] }
+tokio = { version = "1.19.1", features = ["rt-multi-thread", "macros"] }

common/credentials/Cargo.toml

@@ -21,4 +21,4 @@ validator-client = { path = "../client-libs/validator-client" }
 rand = "0.7.3"
 
 [features]
-coconut = ["cosmrs"]
+coconut = ["cosmrs"]

common/crypto/dkg/Cargo.toml

@@ -38,4 +38,4 @@ criterion = "0.3"
 
 [[bench]]
 name = "benchmarks"
-harness = false
+harness = false

common/crypto/dkg/src/bte/encryption.rs

@@ -458,7 +458,6 @@ mod tests {
     }
 
     #[test]
-    #[ignore] // expensive test
     fn share_decryption_20() {
         let dummy_seed = [1u8; 32];
         let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
@@ -488,7 +487,6 @@ mod tests {
     }
 
     #[test]
-    #[ignore] // expensive test
     fn share_encryption_under_nonzero_epoch() {
         let dummy_seed = [1u8; 32];
         let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
@@ -559,7 +557,6 @@ mod tests {
     }
 
     #[test]
-    #[ignore] // expensive test
     fn update_and_decrypt_10() {
         let dummy_seed = [1u8; 32];
         let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
@@ -584,7 +581,6 @@ mod tests {
     }
 
     #[test]
-    #[ignore] // expensive test
     fn reblinding_node_doesnt_affect_decryption() {
         let dummy_seed = [1u8; 32];
         let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
@@ -627,7 +623,6 @@ mod tests {
     }
 
     #[test]
-    #[ignore] // expensive test
     fn ciphertext_integrity_check_passes_for_valid_data() {
         let params = setup();
 
@@ -645,7 +640,6 @@ mod tests {
     }
 
     #[test]
-    #[ignore] // expensive test
     fn ciphertext_integrity_check_passes_fails_for_malformed_data() {
         let params = setup();
 
@@ -674,7 +668,6 @@ mod tests {
     }
 
     #[test]
-    #[ignore] // expensive test
     fn ciphertext_integrity_check_passes_fails_for_wrong_epoch() {
         let params = setup();
 

common/crypto/dkg/src/bte/keys.rs

@@ -651,7 +651,6 @@ mod tests {
     use rand_core::SeedableRng;
 
     #[test]
-    #[ignore] // expensive test
     fn basic_coverage_nodes() {
         // it's some basic test I've been performing when writing the update function, but figured
         // might as well put it into a unit test. note that it doesn't check the entire structure,
@@ -762,7 +761,6 @@ mod tests {
     }
 
     #[test]
-    #[ignore] // expensive test
     fn updating_to_next_epoch() {
         let params = setup();
 
@@ -818,7 +816,6 @@ mod tests {
     }
 
     #[test]
-    #[ignore] // expensive test
     fn bte_node_roundtrip() {
         let params = setup();
 
@@ -842,7 +839,6 @@ mod tests {
     }
 
     #[test]
-    #[ignore] // expensive test
     fn decryption_key_node_roundtrip() {
         let params = setup();
 

common/crypto/dkg/src/bte/proof_chunking.rs

@@ -761,7 +761,6 @@ mod tests {
     }
 
     #[test]
-    #[ignore] // expensive test
     fn should_verify_a_valid_proof() {
         let dummy_seed = [1u8; 32];
         let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);

common/crypto/dkg/src/dealing.rs

@@ -351,7 +351,6 @@ mod tests {
     use rand_core::SeedableRng;
 
     #[test]
-    #[ignore] // expensive test
     fn recovering_partial_verification_keys() {
         // START OF SETUP
         let dummy_seed = [42u8; 32];
@@ -420,7 +419,6 @@ mod tests {
     }
 
     #[test]
-    #[ignore] // expensive test
     fn verifying_partial_verification_keys() {
         let dummy_seed = [42u8; 32];
         let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
@@ -469,7 +467,6 @@ mod tests {
     }
 
     #[test]
-    #[ignore] // expensive test
     fn dealing_roundtrip() {
         let dummy_seed = [1u8; 32];
         let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);

common/crypto/dkg/tests/integration.rs

@@ -9,7 +9,6 @@ use rand_core::SeedableRng;
 use std::collections::BTreeMap;
 
 #[test]
-#[ignore] // expensive test
 fn single_sender() {
     // makes it easier to understand than `full_threshold_secret_sharing`
     // and is a good stepping stone, because its everything each node will have to perform (from one point of view)
@@ -67,7 +66,6 @@ fn single_sender() {
 }
 
 #[test]
-#[ignore] // expensive test
 fn full_threshold_secret_sharing() {
     let dummy_seed = [42u8; 32];
     let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
@@ -163,7 +161,6 @@ fn full_threshold_secret_sharing() {
 }
 
 #[test]
-#[ignore] // expensive test
 fn full_threshold_secret_resharing() {
     let dummy_seed = [42u8; 32];
     let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);

common/mixnode-common/Cargo.toml

@@ -26,6 +26,5 @@ nymsphinx-forwarding = { path = "../nymsphinx/forwarding" }
 nymsphinx-framing = { path = "../nymsphinx/framing" }
 nymsphinx-params = { path = "../nymsphinx/params" }
 nymsphinx-types = { path = "../nymsphinx/types" }
-task = { path = "../task" }
 validator-client = { path = "../client-libs/validator-client" }
 version-checker = { path = "../version-checker" }

common/mixnode-common/src/verloc/error.rs

@@ -24,8 +24,6 @@ pub enum RttError {
     ConnectionWriteTimeout(String),
 
     UnexpectedReplySequence,
-
-    ShutdownReceived,
 }
 
 impl Display for RttError {
@@ -71,9 +69,6 @@ impl Display for RttError {
                 f,
                 "The received reply packet had an unexpected sequence number"
             ),
-            RttError::ShutdownReceived => {
-                write!(f, "Shutdown signal received")
-            }
         }
     }
 }

common/mixnode-common/src/verloc/listener.rs

@@ -11,7 +11,6 @@ use std::fmt::{Display, Formatter};
 use std::net::SocketAddr;
 use std::sync::Arc;
 use std::{fmt, io, process};
-use task::ShutdownListener;
 use tokio::io::AsyncWriteExt;
 use tokio::net::{TcpListener, TcpStream};
 use tokio_util::codec::{Decoder, Encoder, Framed};
@@ -19,19 +18,13 @@ use tokio_util::codec::{Decoder, Encoder, Framed};
 pub(crate) struct PacketListener {
     address: SocketAddr,
     connection_handler: Arc<ConnectionHandler>,
-    shutdown: ShutdownListener,
 }
 
 impl PacketListener {
-    pub(crate) fn new(
-        address: SocketAddr,
-        identity: Arc<identity::KeyPair>,
-        shutdown: ShutdownListener,
-    ) -> Self {
+    pub(crate) fn new(address: SocketAddr, identity: Arc<identity::KeyPair>) -> Self {
         PacketListener {
             address,
             connection_handler: Arc::new(ConnectionHandler { identity }),
-            shutdown,
         }
     }
 }
@@ -41,37 +34,24 @@ impl PacketListener {
         let listener = match TcpListener::bind(self.address).await {
             Ok(listener) => listener,
             Err(err) => {
-                error!(
-                    "Failed to bind to {} - {}. Are you sure nothing else is running on the specified port and your user has sufficient permission to bind to the requested address?",
-                    self.address, err
-                );
+                error!("Failed to bind to {} - {}. Are you sure nothing else is running on the specified port and your user has sufficient permission to bind to the requested address?", self.address, err);
                 process::exit(1);
             }
         };
 
         info!("Started listening for echo packets on {}", self.address);
 
-        let mut shutdown_listener = self.shutdown.clone();
-
-        while !shutdown_listener.is_shutdown() {
+        loop {
             // cloning the arc as each accepted socket is handled in separate task
             let connection_handler = Arc::clone(&self.connection_handler);
-            let handler_shutdown_listener = self.shutdown.clone();
 
-            tokio::select! {
-                socket = listener.accept() => {
-                    match socket {
-                        Ok((socket, remote_addr)) => {
-                            debug!("New verloc connection from {}", remote_addr);
+            match listener.accept().await {
+                Ok((socket, remote_addr)) => {
+                    debug!("New verloc connection from {}", remote_addr);
 
-                            tokio::spawn(connection_handler.handle_connection(socket, remote_addr, handler_shutdown_listener));
-                        }
-                        Err(err) => warn!("Failed to accept incoming connection - {:?}", err),
-                    }
-                },
-                _ = shutdown_listener.recv() => {
-                    log::trace!("PacketListener: Received shutdown");
+                    tokio::spawn(connection_handler.handle_connection(socket, remote_addr));
                 }
+                Err(err) => warn!("Failed to accept incoming connection - {:?}", err),
             }
         }
     }
@@ -87,46 +67,34 @@ impl ConnectionHandler {
         packet.construct_reply(self.identity.private_key())
     }
 
-    pub(crate) async fn handle_connection(
-        self: Arc<Self>,
-        conn: TcpStream,
-        remote: SocketAddr,
-        mut shutdown_listener: ShutdownListener,
-    ) {
+    pub(crate) async fn handle_connection(self: Arc<Self>, conn: TcpStream, remote: SocketAddr) {
         debug!("Starting connection handler for {:?}", remote);
 
         let mut framed_conn = Framed::new(conn, EchoPacketCodec);
-        while !shutdown_listener.is_shutdown() {
-            tokio::select! {
-                Some(echo_packet) = framed_conn.next() => {
-                    // handle echo packet
-                    let reply_packet = match echo_packet {
-                        Ok(echo_packet) => self.handle_echo_packet(echo_packet),
-                        Err(err) => {
-                            error!(
-                                "The socket connection got corrupted with error: {}. Closing the socket",
-                                err
-                            );
-                            return;
-                        }
-                    };
-
-                    // write back the reply (note the lack of framing)
-                    if let Err(err) = framed_conn
-                        .get_mut()
-                        .write_all(reply_packet.to_bytes().as_ref())
-                        .await
-                    {
-                        error!(
-                            "Failed to write reply packet back to the sender - {}. Closing the socket on our end",
-                            err
-                        );
-                        return;
-                    }
-                },
-                _ = shutdown_listener.recv() => {
-                    trace!("ConnectionHandler: Shutdown received");
+        while let Some(echo_packet) = framed_conn.next().await {
+            // handle echo packet
+            let reply_packet = match echo_packet {
+                Ok(echo_packet) => self.handle_echo_packet(echo_packet),
+                Err(err) => {
+                    error!(
+                        "The socket connection got corrupted with error: {}. Closing the socket",
+                        err
+                    );
+                    return;
                 }
+            };
+
+            // write back the reply (note the lack of framing)
+            if let Err(err) = framed_conn
+                .get_mut()
+                .write_all(reply_packet.to_bytes().as_ref())
+                .await
+            {
+                error!(
+                    "Failed to write reply packet back to the sender - {}. Closing the socket on our end",
+                    err
+                );
+                return;
             }
         }
     }

common/mixnode-common/src/verloc/mod.rs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::verloc::listener::PacketListener;
+pub use crate::verloc::measurement::{AtomicVerlocResult, Verloc, VerlocResult};
 use crate::verloc::sender::{PacketSender, TestedNode};
 use crypto::asymmetric::identity;
 use futures::stream::FuturesUnordered;
@@ -12,14 +13,11 @@ use rand::thread_rng;
 use std::net::{SocketAddr, ToSocketAddrs};
 use std::sync::Arc;
 use std::time::Duration;
-use task::ShutdownListener;
 use tokio::task::JoinHandle;
 use tokio::time::sleep;
 use url::Url;
 use version_checker::parse_version;
 
-pub use crate::verloc::measurement::{AtomicVerlocResult, Verloc, VerlocResult};
-
 pub mod error;
 pub(crate) mod listener;
 pub(crate) mod measurement;
@@ -139,10 +137,9 @@ impl ConfigBuilder {
 
     pub fn build(self) -> Config {
         // panics here are fine as those are only ever constructed at the initial setup
-        assert!(
-            !self.0.validator_api_urls.is_empty(),
-            "at least one validator endpoint must be provided",
-        );
+        if self.0.validator_api_urls.is_empty() {
+            panic!("at least one validator endpoint must be provided")
+        }
         self.0
     }
 }
@@ -168,7 +165,6 @@ pub struct VerlocMeasurer {
     config: Config,
     packet_sender: Arc<PacketSender>,
     packet_listener: Arc<PacketListener>,
-    shutdown_listener: ShutdownListener,
 
     currently_used_api: usize,
 
@@ -181,11 +177,7 @@ pub struct VerlocMeasurer {
 }
 
 impl VerlocMeasurer {
-    pub fn new(
-        mut config: Config,
-        identity: Arc<identity::KeyPair>,
-        shutdown_listener: ShutdownListener,
-    ) -> Self {
+    pub fn new(mut config: Config, identity: Arc<identity::KeyPair>) -> Self {
         config.validator_api_urls.shuffle(&mut thread_rng());
 
         VerlocMeasurer {
@@ -195,14 +187,11 @@ impl VerlocMeasurer {
                 config.packet_timeout,
                 config.connection_timeout,
                 config.delay_between_packets,
-                shutdown_listener.clone(),
             )),
             packet_listener: Arc::new(PacketListener::new(
                 config.listening_address,
                 Arc::clone(&identity),
-                shutdown_listener.clone(),
             )),
-            shutdown_listener,
             currently_used_api: 0,
             validator_client: validator_client::ApiClient::new(
                 config.validator_api_urls[0].clone(),
@@ -233,11 +222,7 @@ impl VerlocMeasurer {
         tokio::spawn(packet_listener.run())
     }
 
-    async fn perform_measurement(&self, nodes_to_test: Vec<TestedNode>) -> MeasurementOutcome {
-        log::trace!("Performing measurements");
-
-        let mut shutdown_listener = self.shutdown_listener.clone();
-
+    async fn perform_measurement(&self, nodes_to_test: Vec<TestedNode>) {
         for chunk in nodes_to_test.chunks(self.config.tested_nodes_batch_size) {
             let mut chunk_results = Vec::with_capacity(chunk.len());
 
@@ -261,44 +246,33 @@ impl VerlocMeasurer {
                 .collect::<FuturesUnordered<_>>();
 
             // exhaust the results
-            while !shutdown_listener.is_shutdown() {
-                tokio::select! {
-                    Some(result) = measurement_chunk.next() => {
-                        // if we receive JoinError it means the task failed to get executed, so either there's a bigger issue with tokio
-                        // or there was a panic inside the task itself. In either case, we should just terminate ourselves.
-                        let execution_result = result.expect("the measurement task panicked!");
-                        let measurement_result = match execution_result.0 {
-                            Err(err) => {
-                                debug!(
-                                    "Failed to perform measurement for {} - {}",
-                                    execution_result.1.to_base58_string(),
-                                    err
-                                );
-                                None
-                            }
-                            Ok(result) => Some(result),
-                        };
-                        chunk_results.push(Verloc::new(execution_result.1, measurement_result));
-                    },
-                    _ = shutdown_listener.recv() => {
-                        trace!("Shutdown received while measuring");
-                        return MeasurementOutcome::Shutdown;
+            while let Some(result) = measurement_chunk.next().await {
+                // if we receive JoinError it means the task failed to get executed, so either there's a bigger issue with tokio
+                // or there was a panic inside the task itself. In either case, we should just terminate ourselves.
+                let execution_result = result.expect("the measurement task panicked!");
+                let measurement_result = match execution_result.0 {
+                    Err(err) => {
+                        debug!(
+                            "Failed to perform measurement for {} - {}",
+                            execution_result.1.to_base58_string(),
+                            err
+                        );
+                        None
                     }
-                }
+                    Ok(result) => Some(result),
+                };
+                chunk_results.push(Verloc::new(execution_result.1, measurement_result));
             }
 
             // update the results vector with chunks as they become available (by default every 50 nodes)
             self.results.append_results(chunk_results).await;
         }
-
-        MeasurementOutcome::Done
     }
 
     pub async fn run(&mut self) {
         self.start_listening();
-
-        while !self.shutdown_listener.is_shutdown() {
-            info!("Starting verloc measurements");
+        loop {
+            info!(target: "verloc", "Starting verloc measurements");
             // TODO: should we also measure gateways?
 
             let all_mixes = match self.validator_client.get_cached_mixnodes().await {
@@ -348,32 +322,13 @@ impl VerlocMeasurer {
             // on start of each run remove old results
             self.results.reset_results(tested_nodes.len()).await;
 
-            if let MeasurementOutcome::Shutdown = self.perform_measurement(tested_nodes).await {
-                log::trace!("Shutting down after aborting measurements");
-                break;
-            }
+            self.perform_measurement(tested_nodes).await;
 
             // write current time to "run finished" field
             self.results.finish_measurements().await;
 
-            info!(
-                "Finished performing verloc measurements. The next one will happen in {:?}",
-                self.config.testing_interval
-            );
-
-            tokio::select! {
-                _ = sleep(self.config.testing_interval) => {},
-                _ = self.shutdown_listener.recv() => {
-                    log::trace!("Shutdown received while sleeping");
-                }
-            }
+            info!(target: "verloc", "Finished performing verloc measurements. The next one will happen in {:?}", self.config.testing_interval);
+            sleep(self.config.testing_interval).await
         }
-
-        log::trace!("Verloc: Exiting");
     }
 }
-
-enum MeasurementOutcome {
-    Done,
-    Shutdown,
-}

common/mixnode-common/src/verloc/sender.rs

@@ -7,11 +7,10 @@ use crate::verloc::packet::{EchoPacket, ReplyPacket};
 use crypto::asymmetric::identity;
 use log::*;
 use rand::{thread_rng, Rng};
+use std::io;
 use std::net::SocketAddr;
 use std::sync::Arc;
 use std::time::Duration;
-use std::{fmt, io};
-use task::ShutdownListener;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpStream;
 use tokio::time::sleep;
@@ -28,16 +27,6 @@ impl TestedNode {
     }
 }
 
-impl fmt::Display for TestedNode {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "TestedNode(id: {}, address: {})",
-            self.identity, self.address
-        )
-    }
-}
-
 pub(crate) struct PacketSender {
     identity: Arc<identity::KeyPair>,
     // timeout for receiving before sending new one
@@ -45,7 +34,6 @@ pub(crate) struct PacketSender {
     packet_timeout: Duration,
     connection_timeout: Duration,
     delay_between_packets: Duration,
-    shutdown_listener: ShutdownListener,
 }
 
 impl PacketSender {
@@ -55,7 +43,6 @@ impl PacketSender {
         packet_timeout: Duration,
         connection_timeout: Duration,
         delay_between_packets: Duration,
-        shutdown_listener: ShutdownListener,
     ) -> Self {
         PacketSender {
             identity,
@@ -63,7 +50,6 @@ impl PacketSender {
             packet_timeout,
             connection_timeout,
             delay_between_packets,
-            shutdown_listener,
         }
     }
 
@@ -83,8 +69,6 @@ impl PacketSender {
         self: Arc<Self>,
         tested_node: TestedNode,
     ) -> Result<Measurement, RttError> {
-        let mut shutdown_listener = self.shutdown_listener.clone();
-
         let mut conn = match tokio::time::timeout(
             self.connection_timeout,
             TcpStream::connect(tested_node.address),
@@ -114,40 +98,35 @@ impl PacketSender {
             let start = tokio::time::Instant::now();
             // TODO: should we get the start time after or before actually sending the data?
             // there's going to definitely some scheduler and network stack bias here
-            let packet_bytes = packet.to_bytes();
-
-            tokio::select! {
-                write = tokio::time::timeout(self.packet_timeout, conn.write_all(packet_bytes.as_ref())) => {
-                    match write {
-                        Err(_timeout) => {
-                            let identity_string = tested_node.identity.to_base58_string();
-                            debug!(
-                                "failed to write echo packet to {} within {:?}. Stopping the test.",
-                                identity_string, self.packet_timeout
-                            );
-                            return Err(RttError::UnexpectedConnectionFailureWrite(
-                                identity_string,
-                                io::ErrorKind::TimedOut.into(),
-                            ));
-                        }
-                        Ok(Err(err)) => {
-                            let identity_string = tested_node.identity.to_base58_string();
-                            debug!(
-                                "failed to write echo packet to {} - {}. Stopping the test.",
-                                identity_string, err
-                            );
-                            return Err(RttError::UnexpectedConnectionFailureWrite(
-                                identity_string,
-                                err,
-                            ));
-                        }
-                        Ok(Ok(_)) => {}
-                        }
-                },
-                _ = shutdown_listener.recv() => {
-                    log::trace!("PacketSender: Received shutdown while sending");
-                    return Err(RttError::ShutdownReceived);
-                },
+            match tokio::time::timeout(
+                self.packet_timeout,
+                conn.write_all(packet.to_bytes().as_ref()),
+            )
+            .await
+            {
+                Err(_timeout) => {
+                    let identity_string = tested_node.identity.to_base58_string();
+                    debug!(
+                        "failed to write echo packet to {} within {:?}. Stopping the test.",
+                        identity_string, self.packet_timeout
+                    );
+                    return Err(RttError::UnexpectedConnectionFailureWrite(
+                        identity_string,
+                        io::ErrorKind::TimedOut.into(),
+                    ));
+                }
+                Ok(Err(err)) => {
+                    let identity_string = tested_node.identity.to_base58_string();
+                    debug!(
+                        "failed to write echo packet to {} - {}. Stopping the test.",
+                        identity_string, err
+                    );
+                    return Err(RttError::UnexpectedConnectionFailureWrite(
+                        identity_string,
+                        err,
+                    ));
+                }
+                Ok(Ok(_)) => {}
             }
 
             // there's absolutely no need to put a codec on ReplyPackets as we know exactly
@@ -168,28 +147,21 @@ impl PacketSender {
                 ReplyPacket::try_from_bytes(&buf, &tested_node.identity)
             };
 
-            let reply_packet = tokio::select! {
-                reply = tokio::time::timeout(self.packet_timeout, reply_packet_future) => {
-                    match reply {
-                        Ok(reply_packet) => reply_packet,
-                        Err(_timeout) => {
-                            // TODO: should we continue regardless (with the rest of the packets, or abandon the whole thing?)
-                            // Note: if we decide to continue, it would increase the complexity of the whole thing
-                            debug!(
-                                "failed to receive reply to our echo packet within {:?}. Stopping the test",
-                                self.packet_timeout
-                            );
-                            return Err(RttError::ConnectionReadTimeout(
-                                tested_node.identity.to_base58_string(),
-                            ));
-                        }
+            let reply_packet =
+                match tokio::time::timeout(self.packet_timeout, reply_packet_future).await {
+                    Ok(reply_packet) => reply_packet,
+                    Err(_timeout) => {
+                        // TODO: should we continue regardless (with the rest of the packets, or abandon the whole thing?)
+                        // Note: if we decide to continue, it would increase the complexity of the whole thing
+                        debug!(
+                        "failed to receive reply to our echo packet within {:?}. Stopping the test",
+                        self.packet_timeout
+                    );
+                        return Err(RttError::ConnectionReadTimeout(
+                            tested_node.identity.to_base58_string(),
+                        ));
                     }
-                },
-                _ = shutdown_listener.recv() => {
-                    log::trace!("PacketSender: Received shutdown while waiting for reply");
-                    return Err(RttError::ShutdownReceived);
-                }
-            };
+                };
 
             let reply_packet = reply_packet?;
             // make sure it's actually the expected packet...

common/network-defaults/src/all.rs

@@ -5,7 +5,8 @@ use serde::{Deserialize, Serialize};
 use std::{collections::HashMap, fmt, str::FromStr};
 
 use crate::{
-    DefaultNetworkDetails, ValidatorDetails, MAINNET_DEFAULTS, QA_DEFAULTS, SANDBOX_DEFAULTS,
+    DefaultNetworkDetails, DenomDetails, DenomDetailsOwned, ValidatorDetails, MAINNET_DEFAULTS,
+    QA_DEFAULTS, SANDBOX_DEFAULTS,
 };
 
 use thiserror::Error;
@@ -24,7 +25,7 @@ pub enum Network {
 }
 
 impl Network {
-    fn details(&self) -> &DefaultNetworkDetails<'_> {
+    fn details(&self) -> &DefaultNetworkDetails {
         match self {
             Self::QA => &QA_DEFAULTS,
             Self::SANDBOX => &SANDBOX_DEFAULTS,
@@ -36,8 +37,12 @@ impl Network {
         self.details().bech32_prefix
     }
 
-    pub fn denom(&self) -> &str {
-        self.details().denom
+    pub fn mix_denom(&self) -> &DenomDetails {
+        &self.details().mix_denom
+    }
+
+    pub fn stake_denom(&self) -> &DenomDetails {
+        &self.details().stake_denom
     }
 
     pub fn mixnet_contract_address(&self) -> &str {
@@ -64,10 +69,6 @@ impl Network {
         self.details().rewarding_validator_address
     }
 
-    pub fn statistics_service_url(&self) -> &str {
-        self.details().statistics_service_url
-    }
-
     pub fn validators(&self) -> impl Iterator<Item = &ValidatorDetails> {
         self.details().validators.iter()
     }
@@ -101,28 +102,34 @@ impl fmt::Display for Network {
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
 pub struct NetworkDetails {
     bech32_prefix: String,
-    denom: String,
+    mix_denom: DenomDetailsOwned,
+    stake_denom: DenomDetailsOwned,
     mixnet_contract_address: String,
     vesting_contract_address: String,
     bandwidth_claim_contract_address: String,
-    statistics_service_url: String,
     validators: Vec<ValidatorDetails>,
 }
 
-impl From<&DefaultNetworkDetails<'_>> for NetworkDetails {
-    fn from(details: &DefaultNetworkDetails<'_>) -> Self {
+impl From<&DefaultNetworkDetails> for NetworkDetails {
+    fn from(details: &DefaultNetworkDetails) -> Self {
         NetworkDetails {
             bech32_prefix: details.bech32_prefix.into(),
-            denom: details.denom.into(),
+            mix_denom: details.mix_denom.into(),
+            stake_denom: details.stake_denom.into(),
             mixnet_contract_address: details.mixnet_contract_address.into(),
             vesting_contract_address: details.vesting_contract_address.into(),
             bandwidth_claim_contract_address: details.bandwidth_claim_contract_address.into(),
-            statistics_service_url: details.statistics_service_url.into(),
             validators: details.validators.clone(),
         }
     }
 }
 
+impl NetworkDetails {
+    pub fn base_mix_denom(&self) -> &str {
+        &self.mix_denom.base
+    }
+}
+
 #[derive(Clone, Debug, Default, Deserialize, Serialize, PartialEq, Eq)]
 pub struct SupportedNetworks {
     networks: HashMap<Network, NetworkDetails>,
@@ -147,7 +154,7 @@ impl SupportedNetworks {
     pub fn denom(&self, network: Network) -> Option<&str> {
         self.networks
             .get(&network)
-            .map(|network_details| network_details.denom.as_str())
+            .map(|network_details| network_details.base_mix_denom())
     }
 
     pub fn mixnet_contract_address(&self, network: Network) -> Option<&str> {

common/network-defaults/src/lib.rs

@@ -17,24 +17,24 @@ pub mod sandbox;
 cfg_if::cfg_if! {
     if #[cfg(network = "mainnet")] {
         pub const DEFAULT_NETWORK: all::Network = all::Network::MAINNET;
-        pub const DENOM: &str = mainnet::DENOM;
-        pub const STAKE_DENOM: &str = mainnet::STAKE_DENOM;
+        pub const MIX_DENOM: DenomDetails = mainnet::MIX_DENOM;
+        pub const STAKE_DENOM: DenomDetails = mainnet::STAKE_DENOM;
 
         pub const ETH_CONTRACT_ADDRESS: [u8; 20] = mainnet::_ETH_CONTRACT_ADDRESS;
         pub const ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] = mainnet::_ETH_ERC20_CONTRACT_ADDRESS;
 
     } else if #[cfg(network = "qa")] {
         pub const DEFAULT_NETWORK: all::Network = all::Network::QA;
-        pub const DENOM: &str = qa::DENOM;
-        pub const STAKE_DENOM: &str = qa::STAKE_DENOM;
+        pub const MIX_DENOM: DenomDetails = qa::MIX_DENOM;
+        pub const STAKE_DENOM: DenomDetails = qa::STAKE_DENOM;
 
         pub const ETH_CONTRACT_ADDRESS: [u8; 20] = qa::_ETH_CONTRACT_ADDRESS;
         pub const ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] = qa::_ETH_ERC20_CONTRACT_ADDRESS;
 
     } else if #[cfg(network = "sandbox")] {
         pub const DEFAULT_NETWORK: all::Network = all::Network::SANDBOX;
-        pub const DENOM: &str = sandbox::DENOM;
-        pub const STAKE_DENOM: &str = sandbox::STAKE_DENOM;
+        pub const MIX_DENOM: DenomDetails = sandbox::MIX_DENOM;
+        pub const STAKE_DENOM: DenomDetails = sandbox::STAKE_DENOM;
 
         pub const ETH_CONTRACT_ADDRESS: [u8; 20] = sandbox::_ETH_CONTRACT_ADDRESS;
         pub const ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] = sandbox::_ETH_ERC20_CONTRACT_ADDRESS;
@@ -45,60 +45,94 @@ cfg_if::cfg_if! {
 // future. If we do this, and also get rid of the references we could potentially unify with
 // `NetworkDetails`.
 #[derive(Debug)]
-pub struct DefaultNetworkDetails<'a> {
-    bech32_prefix: &'a str,
-    denom: &'a str,
-    mixnet_contract_address: &'a str,
-    vesting_contract_address: &'a str,
-    bandwidth_claim_contract_address: &'a str,
-    coconut_bandwidth_contract_address: &'a str,
-    multisig_contract_address: &'a str,
-    rewarding_validator_address: &'a str,
-    statistics_service_url: &'a str,
+pub struct DefaultNetworkDetails {
+    bech32_prefix: &'static str,
+    mix_denom: DenomDetails,
+    stake_denom: DenomDetails,
+    mixnet_contract_address: &'static str,
+    vesting_contract_address: &'static str,
+    bandwidth_claim_contract_address: &'static str,
+    coconut_bandwidth_contract_address: &'static str,
+    multisig_contract_address: &'static str,
+    rewarding_validator_address: &'static str,
     validators: Vec<ValidatorDetails>,
 }
 
-static MAINNET_DEFAULTS: Lazy<DefaultNetworkDetails<'static>> =
-    Lazy::new(|| DefaultNetworkDetails {
-        bech32_prefix: mainnet::BECH32_PREFIX,
-        denom: mainnet::DENOM,
-        mixnet_contract_address: mainnet::MIXNET_CONTRACT_ADDRESS,
-        vesting_contract_address: mainnet::VESTING_CONTRACT_ADDRESS,
-        bandwidth_claim_contract_address: mainnet::BANDWIDTH_CLAIM_CONTRACT_ADDRESS,
-        coconut_bandwidth_contract_address: mainnet::COCONUT_BANDWIDTH_CONTRACT_ADDRESS,
-        multisig_contract_address: mainnet::MULTISIG_CONTRACT_ADDRESS,
-        rewarding_validator_address: mainnet::REWARDING_VALIDATOR_ADDRESS,
-        statistics_service_url: mainnet::STATISTICS_SERVICE_DOMAIN_ADDRESS,
-        validators: mainnet::validators(),
-    });
+static MAINNET_DEFAULTS: Lazy<DefaultNetworkDetails> = Lazy::new(|| DefaultNetworkDetails {
+    bech32_prefix: mainnet::BECH32_PREFIX,
+    mix_denom: mainnet::MIX_DENOM,
+    stake_denom: mainnet::STAKE_DENOM,
+    mixnet_contract_address: mainnet::MIXNET_CONTRACT_ADDRESS,
+    vesting_contract_address: mainnet::VESTING_CONTRACT_ADDRESS,
+    bandwidth_claim_contract_address: mainnet::BANDWIDTH_CLAIM_CONTRACT_ADDRESS,
+    coconut_bandwidth_contract_address: mainnet::COCONUT_BANDWIDTH_CONTRACT_ADDRESS,
+    multisig_contract_address: mainnet::MULTISIG_CONTRACT_ADDRESS,
+    rewarding_validator_address: mainnet::REWARDING_VALIDATOR_ADDRESS,
+    validators: mainnet::validators(),
+});
 
-static SANDBOX_DEFAULTS: Lazy<DefaultNetworkDetails<'static>> =
-    Lazy::new(|| DefaultNetworkDetails {
-        bech32_prefix: sandbox::BECH32_PREFIX,
-        denom: sandbox::DENOM,
-        mixnet_contract_address: sandbox::MIXNET_CONTRACT_ADDRESS,
-        vesting_contract_address: sandbox::VESTING_CONTRACT_ADDRESS,
-        bandwidth_claim_contract_address: sandbox::BANDWIDTH_CLAIM_CONTRACT_ADDRESS,
-        coconut_bandwidth_contract_address: sandbox::COCONUT_BANDWIDTH_CONTRACT_ADDRESS,
-        multisig_contract_address: sandbox::MULTISIG_CONTRACT_ADDRESS,
-        rewarding_validator_address: sandbox::REWARDING_VALIDATOR_ADDRESS,
-        statistics_service_url: sandbox::STATISTICS_SERVICE_DOMAIN_ADDRESS,
-        validators: sandbox::validators(),
-    });
+static SANDBOX_DEFAULTS: Lazy<DefaultNetworkDetails> = Lazy::new(|| DefaultNetworkDetails {
+    bech32_prefix: sandbox::BECH32_PREFIX,
+    mix_denom: sandbox::MIX_DENOM,
+    stake_denom: sandbox::STAKE_DENOM,
+    mixnet_contract_address: sandbox::MIXNET_CONTRACT_ADDRESS,
+    vesting_contract_address: sandbox::VESTING_CONTRACT_ADDRESS,
+    bandwidth_claim_contract_address: sandbox::BANDWIDTH_CLAIM_CONTRACT_ADDRESS,
+    coconut_bandwidth_contract_address: sandbox::COCONUT_BANDWIDTH_CONTRACT_ADDRESS,
+    multisig_contract_address: sandbox::MULTISIG_CONTRACT_ADDRESS,
+    rewarding_validator_address: sandbox::REWARDING_VALIDATOR_ADDRESS,
+    validators: sandbox::validators(),
+});
 
-static QA_DEFAULTS: Lazy<DefaultNetworkDetails<'static>> = Lazy::new(|| DefaultNetworkDetails {
+static QA_DEFAULTS: Lazy<DefaultNetworkDetails> = Lazy::new(|| DefaultNetworkDetails {
     bech32_prefix: qa::BECH32_PREFIX,
-    denom: qa::DENOM,
+    mix_denom: qa::MIX_DENOM,
+    stake_denom: qa::STAKE_DENOM,
     mixnet_contract_address: qa::MIXNET_CONTRACT_ADDRESS,
     vesting_contract_address: qa::VESTING_CONTRACT_ADDRESS,
     bandwidth_claim_contract_address: qa::BANDWIDTH_CLAIM_CONTRACT_ADDRESS,
     coconut_bandwidth_contract_address: qa::COCONUT_BANDWIDTH_CONTRACT_ADDRESS,
     multisig_contract_address: qa::MULTISIG_CONTRACT_ADDRESS,
     rewarding_validator_address: qa::REWARDING_VALIDATOR_ADDRESS,
-    statistics_service_url: qa::STATISTICS_SERVICE_DOMAIN_ADDRESS,
     validators: qa::validators(),
 });
 
+#[derive(Debug, Copy, Serialize, Deserialize, Clone, PartialEq, Eq)]
+pub struct DenomDetails {
+    pub base: &'static str,
+    pub display: &'static str,
+    // i.e. display_amount * 10^display_exponent = base_amount
+    pub display_exponent: u32,
+}
+
+impl DenomDetails {
+    pub const fn new(base: &'static str, display: &'static str, display_exponent: u32) -> Self {
+        DenomDetails {
+            base,
+            display,
+            display_exponent,
+        }
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
+pub struct DenomDetailsOwned {
+    pub base: String,
+    pub display: String,
+    // i.e. display_amount * 10^display_exponent = base_amount
+    pub display_exponent: u32,
+}
+
+impl From<DenomDetails> for DenomDetailsOwned {
+    fn from(details: DenomDetails) -> Self {
+        DenomDetailsOwned {
+            base: details.base.to_owned(),
+            display: details.display.to_owned(),
+            display_exponent: details.display_exponent,
+        }
+    }
+}
+
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
 pub struct ValidatorDetails {
     // it is assumed those values are always valid since they're being provided in our defaults file
@@ -136,13 +170,6 @@ impl ValidatorDetails {
     }
 }
 
-pub fn default_statistics_service_url() -> Url {
-    DEFAULT_NETWORK
-        .statistics_service_url()
-        .parse()
-        .expect("the provided statistics service url is invalid!")
-}
-
 pub fn default_nymd_endpoints() -> Vec<Url> {
     DEFAULT_NETWORK
         .validators()
@@ -210,8 +237,7 @@ pub const VALIDATOR_API_VERSION: &str = "v1";
 
 /// We'll be assuming a few more things, profit margin and cost function. Since we don't have relialable package measurement, we'll be using uptime. We'll also set the value of 1 Nym to 1 $, to be able to translate interval costs to Nyms. We'll also assume a cost of 40$ per interval(month), converting that to Nym at our 1$ rate translates to 40_000_000 uNyms
 // pub const DEFAULT_OPERATOR_INTERVAL_COST: u64 = 40_000_000; // 40$/(30 days) at 1 Nym == 1$
-// pub const DEFAULT_OPERATOR_INTERVAL_COST: u64 = 55_556; // 40$/1hr at 1 Nym == 1$
-// pub const DEFAULT_OPERATOR_INTERVAL_COST: u64 = 9259; // 40$/1hr/6 at 1 Nym == 1$
+pub const DEFAULT_OPERATOR_INTERVAL_COST: u64 = 55_556; // 40$/1hr at 1 Nym == 1$
 
 // TODO: is there a way to get this from the chain
 pub const TOTAL_SUPPLY: u128 = 1_000_000_000_000_000;

common/network-defaults/src/mainnet.rs

@@ -1,11 +1,13 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::ValidatorDetails;
+use crate::{DenomDetails, ValidatorDetails};
 
 pub(crate) const BECH32_PREFIX: &str = "n";
 pub const DENOM: &str = "unym";
-pub const STAKE_DENOM: &str = "unyx";
+
+pub const MIX_DENOM: DenomDetails = DenomDetails::new("unym", "nym", 6);
+pub const STAKE_DENOM: DenomDetails = DenomDetails::new("unyx", "nyx", 6);
 
 pub(crate) const MIXNET_CONTRACT_ADDRESS: &str =
     "n14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sjyvg3g";
@@ -22,7 +24,6 @@ pub(crate) const _ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] =
     hex_literal::hex!("0000000000000000000000000000000000000000");
 pub(crate) const REWARDING_VALIDATOR_ADDRESS: &str = "n10yyd98e2tuwu0f7ypz9dy3hhjw7v772q6287gy";
 
-pub(crate) const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "http://127.0.0.1:8090";
 pub(crate) fn validators() -> Vec<ValidatorDetails> {
     vec![ValidatorDetails::new(
         "https://rpc.nyx.nodes.guru/",

common/network-defaults/src/qa.rs

@@ -1,11 +1,13 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::ValidatorDetails;
+use crate::{DenomDetails, ValidatorDetails};
 
 pub(crate) const BECH32_PREFIX: &str = "n";
 pub const DENOM: &str = "unym";
-pub const STAKE_DENOM: &str = "unyx";
+
+pub const MIX_DENOM: DenomDetails = DenomDetails::new("unym", "nym", 6);
+pub const STAKE_DENOM: DenomDetails = DenomDetails::new("unyx", "nyx", 6);
 
 pub(crate) const MIXNET_CONTRACT_ADDRESS: &str =
     "n1suhgf5svhu4usrurvxzlgn54ksxmn8gljarjtxqnapv8kjnp4nrsd3qaep";
@@ -22,7 +24,6 @@ pub(crate) const _ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] =
     hex_literal::hex!("0000000000000000000000000000000000000000");
 pub(crate) const REWARDING_VALIDATOR_ADDRESS: &str = "n1tfzd4qz3a45u8p4mr5zmzv66457uwjgcl05jdq";
 
-pub(crate) const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "";
 pub(crate) fn validators() -> Vec<ValidatorDetails> {
     vec![ValidatorDetails::new(
         "https://qa-validator.nymtech.net",

common/network-defaults/src/sandbox.rs

@@ -1,11 +1,13 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::ValidatorDetails;
+use crate::{DenomDetails, ValidatorDetails};
 
 pub(crate) const BECH32_PREFIX: &str = "nymt";
 pub const DENOM: &str = "unymt";
-pub const STAKE_DENOM: &str = "unyxt";
+
+pub const MIX_DENOM: DenomDetails = DenomDetails::new("unymt", "nymt", 6);
+pub const STAKE_DENOM: DenomDetails = DenomDetails::new("unyxt", "nyxt", 6);
 
 pub(crate) const MIXNET_CONTRACT_ADDRESS: &str = "nymt1ghd753shjuwexxywmgs4xz7x2q732vcnstz02j";
 pub(crate) const VESTING_CONTRACT_ADDRESS: &str = "nymt14ejqjyq8um4p3xfqj74yld5waqljf88fn549lh";
@@ -20,7 +22,6 @@ pub(crate) const _ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] =
     hex_literal::hex!("E8883BAeF3869e14E4823F46662e81D4F7d2A81F");
 pub(crate) const REWARDING_VALIDATOR_ADDRESS: &str = "nymt1jh0s6qu6tuw9ut438836mmn7f3f2wencrnmdj4";
 
-pub(crate) const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "";
 pub(crate) fn validators() -> Vec<ValidatorDetails> {
     vec![ValidatorDetails::new(
         "https://sandbox-validator.nymtech.net",

common/nymsphinx/addressing/Cargo.toml

@@ -12,4 +12,4 @@ nymsphinx-types = { path = "../types" } # we need to be able to refer to some ty
 serde = "1.0" # implementing serialization/deserialization for some types, like `Recipient`
 
 [dev-dependencies]
-rand = "0.7"
+rand = "0.7"

common/nymsphinx/cover/Cargo.toml

@@ -16,4 +16,4 @@ nymsphinx-chunking = { path = "../chunking" }
 nymsphinx-params = { path = "../params" }
 nymsphinx-forwarding = { path = "../forwarding" }
 nymsphinx-types = { path = "../types" }
-topology = { path = "../../topology" }
+topology = { path = "../../topology" }

common/nymsphinx/params/Cargo.toml

@@ -8,4 +8,4 @@ edition = "2021"
 
 [dependencies]
 crypto = { path = "../../crypto", features = ["hashing", "symmetric"] }
-nymsphinx-types = { path = "../types" }
+nymsphinx-types = { path = "../types" }

common/socks5/proxy-helpers/Cargo.toml

@@ -18,4 +18,4 @@ socks5-requests = { path = "../requests" }
 ordered-buffer = { path = "../ordered-buffer" }
 
 [dev-dependencies]
-tokio-test = "0.4.2"
+tokio-test = "0.4.2"

common/statistics/Cargo.toml

@@ -2,20 +2,14 @@
 # SPDX-License-Identifier: Apache-2.0
 
 [package]
-name = "statistics-common"
+name = "statistics"
 version = "1.0.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-async-trait = { version = "0.1.51" }
-log = "0.4"
-reqwest = { version = "0.11", features = ["json"] }
+reqwest = "0.11"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
-sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "chrono"]}
-thiserror = "1"
-tokio = { version = "1.19.1", features = [ "time" ] }
-
-network-defaults = { path = "../network-defaults" }
+thiserror = "1"

common/statistics/src/api.rs

@@ -10,29 +10,13 @@ pub const DEFAULT_STATISTICS_SERVICE_PORT: u16 = 8090;
 pub const STATISTICS_SERVICE_VERSION: &str = "/v1";
 pub const STATISTICS_SERVICE_API_STATISTICS: &str = "statistic";
 
-pub async fn build_and_send_statistics_request(
-    msg: StatsMessage,
-    url: String,
-) -> Result<(), StatsError> {
-    reqwest::Client::new()
-        .post(format!(
-            "{}{}/{}",
-            url, STATISTICS_SERVICE_VERSION, STATISTICS_SERVICE_API_STATISTICS
-        ))
-        .json(&msg)
-        .send()
-        .await?;
-
-    Ok(())
-}
-
 pub fn build_statistics_request_bytes(msg: StatsMessage) -> Result<Vec<u8>, StatsError> {
     let json_msg = msg.to_json()?;
 
     let req = reqwest::Request::new(
         reqwest::Method::POST,
         reqwest::Url::parse(&format!(
-            "http://{}:{}{}/{}",
+            "http://{}:{}/{}/{}",
             DEFAULT_STATISTICS_SERVICE_ADDRESS,
             DEFAULT_STATISTICS_SERVICE_PORT,
             STATISTICS_SERVICE_VERSION,

common/statistics/src/collector.rs

@@ -1,57 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use async_trait::async_trait;
-use log::error;
-use sqlx::types::chrono::{DateTime, Utc};
-use std::time::Duration;
-use tokio::time;
-
-use crate::error::StatsError;
-use crate::StatsMessage;
-
-const STATISTICS_TIMER_INTERVAL: Duration = Duration::from_secs(60);
-
-#[async_trait]
-pub trait StatisticsCollector {
-    async fn create_stats_message(
-        &self,
-        interval: Duration,
-        timestamp: DateTime<Utc>,
-    ) -> StatsMessage;
-    async fn send_stats_message(&self, stats_message: StatsMessage) -> Result<(), StatsError>;
-    async fn reset_stats(&mut self);
-}
-
-pub struct StatisticsSender<T: StatisticsCollector> {
-    collector: T,
-    interval: Duration,
-    timestamp: DateTime<Utc>,
-}
-
-impl<T: StatisticsCollector> StatisticsSender<T> {
-    pub fn new(collector: T) -> Self {
-        StatisticsSender {
-            collector,
-            interval: STATISTICS_TIMER_INTERVAL,
-            timestamp: Utc::now(),
-        }
-    }
-
-    pub async fn run(&mut self) {
-        let mut interval = time::interval(self.interval);
-        loop {
-            interval.tick().await;
-
-            let stats_message = self
-                .collector
-                .create_stats_message(self.interval, self.timestamp)
-                .await;
-            if let Err(e) = self.collector.send_stats_message(stats_message).await {
-                error!("Statistics not sent: {}", e);
-            }
-            self.collector.reset_stats().await;
-            self.timestamp = Utc::now();
-        }
-    }
-}

common/statistics/src/error.rs

@@ -7,7 +7,4 @@ use thiserror::Error;
 pub enum StatsError {
     #[error("Serde JSON error: {0}")]
     SerdeJsonError(#[from] serde_json::Error),
-
-    #[error("Reqwest error: {0}")]
-    ReqwestError(#[from] reqwest::Error),
 }

common/statistics/src/lib.rs

@@ -6,12 +6,11 @@ use serde::{Deserialize, Serialize};
 use error::StatsError;
 
 pub mod api;
-pub mod collector;
 pub mod error;
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct StatsMessage {
-    pub stats_data: Vec<StatsData>,
+    pub stats_data: Vec<StatsServiceData>,
     pub interval_seconds: u32,
     pub timestamp: String,
 }
@@ -26,23 +25,6 @@ impl StatsMessage {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub enum StatsData {
-    Service(StatsServiceData),
-    Gateway(StatsGatewayData),
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct StatsGatewayData {
-    pub inbox_count: u32,
-}
-
-impl StatsGatewayData {
-    pub fn new(inbox_count: u32) -> Self {
-        StatsGatewayData { inbox_count }
-    }
-}
-
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct StatsServiceData {
     pub requested_service: String,

common/types/src/account.rs

@@ -1,4 +1,4 @@
-use crate::currency::{CurrencyDenom, MajorCurrencyAmount};
+use crate::currency::{DecCoin, Denom};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
@@ -9,13 +9,16 @@ use serde::{Deserialize, Serialize};
 )]
 #[derive(Serialize, Deserialize, JsonSchema)]
 pub struct Account {
+    // TODO: discuss with @MS whether it makes sense:
+    // 1. why are we restricting to single denom here? What if user holds both stake and mix currencies?
+    // 2. what's the `contract_address`? is it mixnet? vesting? coconut? why does it relate to an account anyway?
     pub contract_address: String,
     pub client_address: String,
-    pub denom: CurrencyDenom,
+    pub denom: Denom,
 }
 
 impl Account {
-    pub fn new(contract_address: String, client_address: String, denom: CurrencyDenom) -> Self {
+    pub fn new(contract_address: String, client_address: String, denom: Denom) -> Self {
         Account {
             contract_address,
             client_address,
@@ -53,6 +56,15 @@ pub struct AccountEntry {
 )]
 #[derive(Serialize, Deserialize)]
 pub struct Balance {
-    pub amount: MajorCurrencyAmount,
+    pub amount: DecCoin,
     pub printable_balance: String,
 }
+
+impl Balance {
+    pub fn new(amount: DecCoin) -> Self {
+        Balance {
+            printable_balance: amount.to_string(),
+            amount,
+        }
+    }
+}

common/types/src/currency.rs

@@ -1,22 +1,26 @@
 use crate::error::TypesError;
-use cosmrs::Denom as CosmosDenom;
-use cosmwasm_std::Coin as CosmWasmCoin;
+use config::defaults::all::Network;
+use config::defaults::DenomDetails;
+use cosmwasm_std::Fraction;
 use cosmwasm_std::{Decimal, Uint128};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+use std::cmp::Ordering;
+use std::collections::HashMap;
 use std::convert::TryFrom;
 use std::fmt::{Display, Formatter};
-use std::ops::{Add, Mul};
-use std::str::FromStr;
 use strum::{Display, EnumString, EnumVariantNames};
-use validator_client::nymd::{Coin, CosmosCoin};
+use validator_client::nymd::Coin;
+
+#[cfg(feature = "generate-ts")]
+use ts_rs::{Dependency, TS};
 
 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
     feature = "generate-ts",
     ts(export_to = "ts-packages/types/src/types/rust/CurrencyDenom.ts")
 )]
-#[cfg_attr(feature = "generate-ts", ts(rename_all = "UPPERCASE"))]
+#[cfg_attr(feature = "generate-ts", ts(rename_all = "lowercase"))]
 #[derive(
     Display,
     Serialize,
@@ -28,9 +32,8 @@ use validator_client::nymd::{Coin, CosmosCoin};
     PartialEq,
     JsonSchema,
 )]
-#[serde(rename_all = "UPPERCASE")]
-#[strum(serialize_all = "UPPERCASE")]
-// TODO: this shouldn't be an enum...
+#[serde(rename_all = "lowercase")]
+#[strum(serialize_all = "lowercase")]
 pub enum CurrencyDenom {
     #[strum(ascii_case_insensitive)]
     Nym,
@@ -42,448 +45,460 @@ pub enum CurrencyDenom {
     Nyxt,
 }
 
-impl CurrencyDenom {
-    pub fn parse(value: &str) -> Result<CurrencyDenom, TypesError> {
-        let mut denom = value.to_string();
-        if denom.starts_with('u') {
-            denom = denom[1..].to_string();
+pub type Denom = String;
+
+#[derive(Debug, Default)]
+pub struct RegisteredCoins(HashMap<Denom, CoinMetadata>);
+
+impl RegisteredCoins {
+    pub fn default_denoms(network: Network) -> Self {
+        let mut network_coins = HashMap::new();
+        network_coins.insert(
+            network.mix_denom().base.into(),
+            (*network.mix_denom()).into(),
+        );
+        network_coins.insert(
+            network.stake_denom().base.into(),
+            (*network.stake_denom()).into(),
+        );
+        RegisteredCoins(network_coins)
+    }
+
+    pub fn insert(&mut self, denom: Denom, metadata: CoinMetadata) -> Option<CoinMetadata> {
+        self.0.insert(denom, metadata)
+    }
+
+    pub fn remove(&mut self, denom: &Denom) -> Option<CoinMetadata> {
+        self.0.remove(denom)
+    }
+
+    pub fn attempt_convert_to_base_coin(&self, coin: DecCoin) -> Result<Coin, TypesError> {
+        // check if this is already in the base denom
+        if self.0.contains_key(&coin.denom) {
+            // if we're converting a base DecCoin it CANNOT fail, unless somebody is providing
+            // bullshit data on purpose : )
+            return coin.try_into();
+        } else {
+            // TODO: this kinda suggests we may need a better data structure
+            for registered_coin in self.0.values() {
+                if let Some(exponent) = registered_coin.get_exponent(&coin.denom) {
+                    let amount = try_convert_decimal_to_u128(coin.try_scale_up_value(exponent)?)?;
+                    return Ok(Coin::new(amount, &registered_coin.base));
+                }
+            }
         }
-        match CurrencyDenom::from_str(&denom) {
-            Ok(res) => Ok(res),
-            Err(_e) => Err(TypesError::InvalidDenom(value.to_string())),
+        Err(TypesError::UnknownCoinDenom(coin.denom))
+    }
+
+    pub fn attempt_convert_to_display_dec_coin(&self, coin: Coin) -> Result<DecCoin, TypesError> {
+        for registered_coin in self.0.values() {
+            if let Some(exponent) = registered_coin.get_exponent(&coin.denom) {
+                // if this fails it means we haven't registered our display denom which honestly should never be the case
+                // unless somebody is rocking their own custom network
+                let display_exponent = registered_coin
+                    .get_exponent(&registered_coin.display)
+                    .ok_or_else(|| TypesError::UnknownCoinDenom(coin.denom.clone()))?;
+
+                return match exponent.cmp(&display_exponent) {
+                    Ordering::Greater => {
+                        // we need to scale up, unlikely to ever be needed but included for completion sake,
+                        // for example if we decided to created knym with exponent 9 and wanted to convert to nym with exponent 6
+                        Ok(DecCoin::new_scaled_up(
+                            coin.amount,
+                            &registered_coin.display,
+                            exponent - display_exponent,
+                        )?)
+                    }
+                    // we're already in the display denom
+                    Ordering::Equal => Ok(coin.into()),
+                    Ordering::Less => {
+                        // we need to scale down, the most common case, for example we're in base unym with exponent 0 and want to convert to nym with exponent 6
+                        Ok(DecCoin::new_scaled_down(
+                            coin.amount,
+                            &registered_coin.display,
+                            display_exponent - exponent,
+                        )?)
+                    }
+                };
+            }
         }
+
+        Err(TypesError::UnknownCoinDenom(coin.denom))
     }
 }
 
-impl TryFrom<CosmosDenom> for CurrencyDenom {
-    type Error = TypesError;
+// TODO: should this live here?
+// attempts to replicate cosmos-sdk's coin metadata
+// https://docs.cosmos.network/master/architecture/adr-024-coin-metadata.html
+// this way we could more easily handle multiple coin types simultaneously (like nym/nyx/nymt/nyx + local currencies)
+#[derive(Debug)]
+pub struct DenomUnit {
+    pub denom: Denom,
+    pub exponent: u32,
+    // pub aliases: Vec<String>,
+}
 
-    fn try_from(value: CosmosDenom) -> Result<Self, Self::Error> {
-        CurrencyDenom::parse(&value.to_string())
+impl DenomUnit {
+    pub fn new(denom: Denom, exponent: u32) -> Self {
+        DenomUnit { denom, exponent }
     }
 }
 
-#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
-#[cfg_attr(
-    feature = "generate-ts",
-    ts(export_to = "ts-packages/types/src/types/rust/CurrencyStringMajorAmount.ts")
-)]
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-pub struct MajorAmountString(String); // see https://github.com/Aleph-Alpha/ts-rs/issues/51 for exporting type aliases
-
-#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
-#[cfg_attr(
-    feature = "generate-ts",
-    ts(export_to = "ts-packages/types/src/types/rust/Currency.ts")
-)]
-// #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-pub struct MajorCurrencyAmount {
-    // temporarly going back to original impl to speed up merge
-    pub amount: MajorAmountString,
-    pub denom: CurrencyDenom,
-    // // temporary...
-    // #[cfg_attr(feature = "generate-ts", ts(skip))]
-    // pub coin: Coin,
+#[derive(Debug)]
+pub struct CoinMetadata {
+    pub denom_units: Vec<DenomUnit>,
+    pub base: Denom,
+    pub display: Denom,
 }
 
-// impl JsonSchema for MajorCurrencyAmount {
-//     fn schema_name() -> String {
-//         todo!()
-//     }
-//
-//     fn json_schema(gen: &mut SchemaGenerator) -> Schema {
-//         todo!()
-//     }
-// }
+impl CoinMetadata {
+    pub fn new(denom_units: Vec<DenomUnit>, base: Denom, display: Denom) -> Self {
+        CoinMetadata {
+            denom_units,
+            base,
+            display,
+        }
+    }
+
+    pub fn get_exponent(&self, denom: &str) -> Option<u32> {
+        self.denom_units
+            .iter()
+            .find(|denom_unit| denom_unit.denom == denom)
+            .map(|denom_unit| denom_unit.exponent)
+    }
+}
+
+impl From<DenomDetails> for CoinMetadata {
+    fn from(denom_details: DenomDetails) -> Self {
+        CoinMetadata::new(
+            vec![
+                DenomUnit::new(denom_details.base.into(), 0),
+                DenomUnit::new(denom_details.display.into(), denom_details.display_exponent),
+            ],
+            denom_details.base.into(),
+            denom_details.display.into(),
+        )
+    }
+}
 
 // tries to semi-replicate cosmos-sdk's DecCoin for being able to handle tokens with decimal amounts
 // https://github.com/cosmos/cosmos-sdk/blob/v0.45.4/types/dec_coin.go
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct DecCoin {
-    //
+    pub denom: Denom,
+    // Decimal is already serialized to string and using string in its schema, so lets also go straight to string for ts_rs
+    // todo: is `Decimal` the correct type to use? Do we want to depend on cosmwasm_std here?
+    pub amount: Decimal,
 }
 
-impl MajorCurrencyAmount {
-    pub fn new(amount: &str, denom: CurrencyDenom) -> MajorCurrencyAmount {
-        MajorCurrencyAmount {
-            amount: MajorAmountString(amount.to_string()),
-            denom,
+// I had to implement it manually to correctly set dependencies
+#[cfg(feature = "generate-ts")]
+impl TS for DecCoin {
+    const EXPORT_TO: Option<&'static str> = Some("ts-packages/types/src/types/rust/DecCoin.ts");
+
+    fn decl() -> String {
+        format!("type {} = {};", Self::name(), Self::inline())
+    }
+
+    fn name() -> String {
+        "DecCoin".into()
+    }
+
+    fn inline() -> String {
+        "{ denom: CurrencyDenom, amount: string }".into()
+    }
+
+    fn dependencies() -> Vec<Dependency> {
+        vec![Dependency::from_ty::<CurrencyDenom>()
+            .expect("TS was incorrectly defined on `CurrencyDenom`")]
+    }
+
+    fn transparent() -> bool {
+        false
+    }
+}
+
+impl DecCoin {
+    pub fn new_base<S: Into<String>>(amount: impl Into<Uint128>, denom: S) -> Self {
+        DecCoin {
+            denom: denom.into(),
+            amount: Decimal::from_atomics(amount, 0).unwrap(),
         }
     }
 
-    pub fn zero(denom: &CurrencyDenom) -> MajorCurrencyAmount {
-        MajorCurrencyAmount::new("0", denom.clone())
+    pub fn zero<S: Into<String>>(denom: S) -> Self {
+        DecCoin {
+            denom: denom.into(),
+            amount: Decimal::zero(),
+        }
     }
-    //
-    // pub fn from_cosmrs_coin(coin: &CosmosCoin) -> Result<MajorCurrencyAmount, TypesError> {
-    //     MajorCurrencyAmount::from_cosmrs_decimal_and_denom(coin.amount, coin.denom.to_string())
-    // }
-    //
-    // pub fn from_minor_uint128_and_denom(
-    //     amount_minor: Uint128,
-    //     denom_minor: &str,
-    // ) -> Result<MajorCurrencyAmount, TypesError> {
-    //     MajorCurrencyAmount::from_minor_decimal_and_denom(
-    //         Decimal::from_atomics(amount_minor, 0)?,
-    //         denom_minor,
-    //     )
-    // }
-    //
-    // pub fn from_minor_decimal_and_denom(
-    //     amount_minor: Decimal,
-    //     denom_minor: &str,
-    // ) -> Result<MajorCurrencyAmount, TypesError> {
-    //     if !(denom_minor.starts_with('u') || denom_minor.starts_with('U')) {
-    //         return Err(TypesError::InvalidDenom(denom_minor.to_string()));
-    //     }
-    //     let major = amount_minor / Uint128::from(1_000_000u64);
-    //     if let Ok(denom) = CurrencyDenom::from_str(&denom_minor[1..].to_string()) {
-    //         return Ok(MajorCurrencyAmount {
-    //             amount: MajorAmountString(major.to_string()),
-    //             denom,
-    //         });
-    //     }
-    //     Err(TypesError::InvalidDenom(denom_minor.to_string()))
-    // }
-    // pub fn from_decimal_and_denom(
-    //     amount: Decimal,
-    //     denom: String,
-    // ) -> Result<MajorCurrencyAmount, TypesError> {
-    //     if denom.starts_with('u') || denom.starts_with('U') {
-    //         return MajorCurrencyAmount::from_minor_decimal_and_denom(amount, &denom);
-    //     }
-    //     if let Ok(denom) = CurrencyDenom::from_str(denom.as_str()) {
-    //         return Ok(MajorCurrencyAmount {
-    //             amount: MajorAmountString(amount.to_string()),
-    //             denom,
-    //         });
-    //     }
-    //     Err(TypesError::InvalidDenom(denom))
-    // }
-    // pub fn from_cosmrs_decimal_and_denom(
-    //     amount: CosmosDecimal,
-    //     denom: String,
-    // ) -> Result<MajorCurrencyAmount, TypesError> {
-    //     if denom.starts_with('u') || denom.starts_with('U') {
-    //         return match Decimal::from_str(&amount.to_string()) {
-    //             Ok(amount) => MajorCurrencyAmount::from_minor_decimal_and_denom(amount, &denom),
-    //             Err(_e) => Err(TypesError::InvalidAmount(amount.to_string())),
-    //         };
-    //     }
-    //
-    //     if let Ok(denom) = CurrencyDenom::from_str(denom.as_str()) {
-    //         return Ok(MajorCurrencyAmount {
-    //             amount: MajorAmountString(amount.to_string()),
-    //             denom,
-    //         });
-    //     }
-    //     Err(TypesError::InvalidDenom(denom))
-    // }
-    //
-    // pub fn into_cosmos_coin(self) -> CosmosCoin {
-    //     self.coin.into()
-    // }
-    //
-    // pub fn to_minor_uint128(&self) -> Result<Uint128, TypesError> {
-    //     if self.amount.0.contains('.') {
-    //         // has a decimal point (Cosmos assumes "." is the decimal separator)
-    //         let parts = self.amount.0.split('.');
-    //         let str = parts.collect_vec();
-    //         if str.is_empty() || str.len() > 2 {
-    //             return Err(TypesError::InvalidAmount("Amount is invalid".to_string()));
-    //         }
-    //         if str.len() == 2 {
-    //             // has a decimal, so check decimal places first
-    //             if str[1].len() > 6 {
-    //                 return Err(TypesError::InvalidDenom(
-    //                     "Amount is invalid, only 6 decimal places of precision are allowed"
-    //                         .to_string(),
-    //                 ));
-    //             }
-    //
-    //             // so multiple whole part by 1e6 and add decimal part
-    //             let whole_part = Uint128::from_str(str[0])? * Uint128::from(1_000_000u64);
-    //
-    //             // TODO: has Rust got anything that deals with fixed point values, or parsing from format strings? Leading zeroes are causing issues
-    //             return match format!("0.{}", str[1]).parse::<f64>() {
-    //                 Ok(decimal_part_float) => {
-    //                     // this makes an assumption that 6 decimal places of f64 can never lose precision
-    //                     let truncated = (decimal_part_float * 1_000_000.).trunc() as u32;
-    //                     let decimal_part = Uint128::from(truncated);
-    //                     let sum = whole_part + decimal_part;
-    //                     Ok(sum)
-    //                 }
-    //                 Err(_e) => Err(TypesError::InvalidAmount(
-    //                     "Amount decimal part is invalid".to_string(),
-    //                 )),
-    //             };
-    //         }
-    //     }
-    //
-    //     let major = Uint128::from_str(&self.amount.0)?;
-    //     let scaled = major * Uint128::new(1_000_000u128);
-    //     Ok(scaled)
-    // }
 
-    // pub fn denom_to_string(&self) -> String {
-    //     self.denom.to_string()
-    // }
+    pub fn new_scaled_up<S: Into<String>>(
+        base_amount: impl Into<Uint128>,
+        denom: S,
+        exponent: u32,
+    ) -> Result<Self, TypesError> {
+        let base_amount = Decimal::from_atomics(base_amount, 0).unwrap();
+        Ok(DecCoin {
+            denom: denom.into(),
+            amount: try_scale_up_decimal(base_amount, exponent)?,
+        })
+    }
+
+    pub fn new_scaled_down<S: Into<String>>(
+        base_amount: impl Into<Uint128>,
+        denom: S,
+        exponent: u32,
+    ) -> Result<Self, TypesError> {
+        let base_amount = Decimal::from_atomics(base_amount, 0).unwrap();
+        Ok(DecCoin {
+            denom: denom.into(),
+            amount: try_scale_down_decimal(base_amount, exponent)?,
+        })
+    }
+
+    pub fn try_scale_down_value(&self, exponent: u32) -> Result<Decimal, TypesError> {
+        try_scale_down_decimal(self.amount, exponent)
+    }
+
+    pub fn try_scale_up_value(&self, exponent: u32) -> Result<Decimal, TypesError> {
+        try_scale_up_decimal(self.amount, exponent)
+    }
 }
 
-impl Display for MajorCurrencyAmount {
+// TODO: should thoese live here?
+pub fn try_scale_down_decimal(dec: Decimal, exponent: u32) -> Result<Decimal, TypesError> {
+    let rhs = 10u128
+        .checked_pow(exponent)
+        .ok_or(TypesError::UnsupportedExponent(exponent))?;
+    let denominator = dec
+        .denominator()
+        .checked_mul(rhs.into())
+        .map_err(|_| TypesError::UnsupportedExponent(exponent))?;
+
+    Ok(Decimal::from_ratio(dec.numerator(), denominator))
+}
+
+pub fn try_scale_up_decimal(dec: Decimal, exponent: u32) -> Result<Decimal, TypesError> {
+    let rhs = 10u128
+        .checked_pow(exponent)
+        .ok_or(TypesError::UnsupportedExponent(exponent))?;
+    let denominator = dec
+        .denominator()
+        .checked_div(rhs.into())
+        .map_err(|_| TypesError::UnsupportedExponent(exponent))?;
+
+    Ok(Decimal::from_ratio(dec.numerator(), denominator))
+}
+
+pub fn try_convert_decimal_to_u128(dec: Decimal) -> Result<u128, TypesError> {
+    let whole = dec.numerator() / dec.denominator();
+
+    // unwrap is fine as we're not dividing by zero here
+    let fractional = (dec.numerator()).checked_rem(dec.denominator()).unwrap();
+
+    // we cannot convert as we'd lose our decimal places
+    // (for example if somebody attempted to represent our gas price (WHICH YOU SHOULDN'T DO) as DecCoin)
+    if fractional != Uint128::zero() {
+        return Err(TypesError::LossyCoinConversion);
+    }
+    Ok(whole.u128())
+}
+
+// TODO: adjust the implementation to as required by @MS or @FT
+impl Display for DecCoin {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{} {}", self.amount.0, self.denom)
+        write!(f, "{}{}", self.amount, self.denom)
     }
 }
 
-// TODO: cleanup after merge
-impl From<CosmosCoin> for MajorCurrencyAmount {
-    fn from(c: CosmosCoin) -> Self {
-        MajorCurrencyAmount::from(Coin::from(c))
-    }
-}
-
-impl From<CosmWasmCoin> for MajorCurrencyAmount {
-    fn from(c: CosmWasmCoin) -> Self {
-        MajorCurrencyAmount::from(Coin::from(c))
-    }
-}
-
-impl From<Coin> for MajorCurrencyAmount {
+impl From<Coin> for DecCoin {
     fn from(coin: Coin) -> Self {
-        // current assumption: MajorCurrencyAmount is represented as decimal with 6 decimal points
-        // unwrap is fine as we haven't exceeded decimal range since our coins are at max 1B in value
-        // (this is a weak assumption, but for solving this merge conflict it's good enough temporary workaround)
-        let amount = Decimal::from_atomics(coin.amount, 6).unwrap();
-        MajorCurrencyAmount {
-            amount: MajorAmountString(amount.to_string()),
-            denom: CurrencyDenom::parse(&coin.denom).expect("this will go away after the merge..."),
-        }
+        DecCoin::new_base(coin.amount, coin.denom)
     }
 }
 
-// temporary...
-impl From<MajorCurrencyAmount> for CosmosCoin {
-    fn from(c: MajorCurrencyAmount) -> CosmosCoin {
-        let c: Coin = c.into();
-        c.into()
-    }
-}
+// this conversion assumes same denomination
+impl TryFrom<DecCoin> for Coin {
+    type Error = TypesError;
 
-impl From<MajorCurrencyAmount> for CosmWasmCoin {
-    fn from(c: MajorCurrencyAmount) -> CosmWasmCoin {
-        let c: Coin = c.into();
-        c.into()
-    }
-}
-
-impl From<MajorCurrencyAmount> for Coin {
-    fn from(c: MajorCurrencyAmount) -> Coin {
-        let decimal: Decimal = c
-            .amount
-            .0
-            .parse()
-            .expect("stringified amount should have been a valid decimal");
-
-        // again, temporary
-        let exp = Uint128::new(1000000);
-        let val = decimal.mul(exp);
-
-        // again, terrible assumption for denom, but it works temporarily...
-        Coin {
-            amount: val.u128(),
-            denom: format!("u{}", c.denom).to_lowercase(),
-        }
-    }
-}
-
-impl Add for MajorCurrencyAmount {
-    type Output = Self;
-
-    fn add(self, rhs: Self) -> Self::Output {
-        // again, temporary workaround to help with merge
-        (Coin::from(self).try_add(&Coin::from(rhs)))
-            .expect("provided coins had different denoms")
-            .into()
+    fn try_from(value: DecCoin) -> Result<Self, Self::Error> {
+        Ok(Coin {
+            amount: try_convert_decimal_to_u128(value.try_scale_down_value(0)?)?,
+            denom: value.denom,
+        })
     }
 }
 
 #[cfg(test)]
 mod test {
     use super::*;
-    use cosmrs::Coin as CosmosCoin;
-    use cosmrs::Decimal as CosmosDecimal;
-    use cosmrs::Denom as CosmosDenom;
-    use cosmwasm_std::Coin as CosmWasmCoin;
-    use cosmwasm_std::Decimal as CosmWasmDecimal;
-    use serde_json::json;
-    use std::str::FromStr;
+    use std::convert::TryFrom;
     use std::string::ToString;
 
     #[test]
-    fn json_to_major_currency_amount() {
-        let nym = json!({
-            "amount": "1",
-            "denom": "NYM"
-        });
-        let nymt = json!({
-            "amount": "1",
-            "denom": "NYMT"
-        });
+    fn dec_value_scale_down() {
+        let dec = DecCoin {
+            denom: "foo".to_string(),
+            amount: "1234007000".parse().unwrap(),
+        };
 
-        let test_nym_amount = MajorCurrencyAmount::new("1", CurrencyDenom::Nym);
-        let test_nymt_amount = MajorCurrencyAmount::new("1", CurrencyDenom::Nymt);
-
-        let nym_amount = serde_json::from_value::<MajorCurrencyAmount>(nym).unwrap();
-        let nymt_amount = serde_json::from_value::<MajorCurrencyAmount>(nymt).unwrap();
-
-        assert_eq!(nym_amount, test_nym_amount);
-        assert_eq!(nymt_amount, test_nymt_amount);
-    }
-
-    #[test]
-    fn minor_amount_json_to_major_currency_amount() {
-        let one_micro_nym = json!({
-            "amount": "0.000001",
-            "denom": "NYM"
-        });
-
-        let expected_nym_amount = MajorCurrencyAmount::new("0.000001", CurrencyDenom::Nym);
-        let actual_nym_amount =
-            serde_json::from_value::<MajorCurrencyAmount>(one_micro_nym).unwrap();
-
-        assert_eq!(expected_nym_amount, actual_nym_amount);
-    }
-
-    #[test]
-    fn denom_from_str() {
-        assert_eq!(CurrencyDenom::from_str("nym").unwrap(), CurrencyDenom::Nym);
         assert_eq!(
-            CurrencyDenom::from_str("nymt").unwrap(),
-            CurrencyDenom::Nymt
-        );
-        assert_eq!(CurrencyDenom::from_str("NYM").unwrap(), CurrencyDenom::Nym);
-        assert_eq!(
-            CurrencyDenom::from_str("NYMT").unwrap(),
-            CurrencyDenom::Nymt
-        );
-        assert_eq!(CurrencyDenom::from_str("NyM").unwrap(), CurrencyDenom::Nym);
-        assert_eq!(
-            CurrencyDenom::from_str("NYmt").unwrap(),
-            CurrencyDenom::Nymt
-        );
-
-        assert!(matches!(
-            CurrencyDenom::from_str("foo").unwrap_err(),
-            strum::ParseError::VariantNotFound,
-        ));
-
-        // denominations must all be major
-        assert!(matches!(
-            CurrencyDenom::from_str("unym").unwrap_err(),
-            strum::ParseError::VariantNotFound,
-        ));
-        assert!(matches!(
-            CurrencyDenom::from_str("unymt").unwrap_err(),
-            strum::ParseError::VariantNotFound,
-        ));
-    }
-
-    #[test]
-    fn to_string() {
-        assert_eq!(
-            MajorCurrencyAmount::new("1", CurrencyDenom::Nym).to_string(),
-            "1 NYM"
+            "1234007000".parse::<Decimal>().unwrap(),
+            dec.try_scale_down_value(0).unwrap()
         );
         assert_eq!(
-            MajorCurrencyAmount::new("1", CurrencyDenom::Nymt).to_string(),
-            "1 NYMT"
+            "123400700".parse::<Decimal>().unwrap(),
+            dec.try_scale_down_value(1).unwrap()
         );
         assert_eq!(
-            MajorCurrencyAmount::new("1000000000000", CurrencyDenom::Nym).to_string(),
-            "1000000000000 NYM"
+            "12340070".parse::<Decimal>().unwrap(),
+            dec.try_scale_down_value(2).unwrap()
+        );
+        assert_eq!(
+            "123400.7".parse::<Decimal>().unwrap(),
+            dec.try_scale_down_value(4).unwrap()
+        );
+
+        let dec = DecCoin {
+            denom: "foo".to_string(),
+            amount: "10000000000".parse().unwrap(),
+        };
+
+        assert_eq!(
+            "100".parse::<Decimal>().unwrap(),
+            dec.try_scale_down_value(8).unwrap()
+        );
+        assert_eq!(
+            "1".parse::<Decimal>().unwrap(),
+            dec.try_scale_down_value(10).unwrap()
+        );
+        assert_eq!(
+            "0.01".parse::<Decimal>().unwrap(),
+            dec.try_scale_down_value(12).unwrap()
         );
     }
 
     #[test]
-    fn minor_coin_to_major_currency() {
-        let cosmos_coin = CosmosCoin {
-            amount: CosmosDecimal::from(1u64),
-            denom: CosmosDenom::from_str("unym").unwrap(),
+    fn dec_value_scale_up() {
+        let dec = DecCoin {
+            denom: "foo".to_string(),
+            amount: "1234.56".parse().unwrap(),
         };
-        let c = MajorCurrencyAmount::from(cosmos_coin);
-        assert_eq!(c, MajorCurrencyAmount::new("0.000001", CurrencyDenom::Nym));
-    }
 
-    #[test]
-    fn minor_cosmwasm_coin_to_major_currency() {
-        let coin = CosmWasmCoin {
-            amount: Uint128::from(1u64),
-            denom: "unym".to_string(),
-        };
-        println!(
-            "from_atomics = {}",
-            CosmWasmDecimal::from_atomics(coin.amount, 6).unwrap()
+        assert_eq!(
+            "1234.56".parse::<Decimal>().unwrap(),
+            dec.try_scale_up_value(0).unwrap()
         );
-        let c: MajorCurrencyAmount = coin.into();
-        assert_eq!(c, MajorCurrencyAmount::new("0.000001", CurrencyDenom::Nym));
-    }
-
-    #[test]
-    fn minor_cosmwasm_coin_to_major_currency_2() {
-        let coin = CosmWasmCoin {
-            amount: Uint128::from(1_000_000u64),
-            denom: "unym".to_string(),
-        };
-        println!(
-            "from_atomics = {:?}",
-            CosmWasmDecimal::from_atomics(coin.amount, 6)
-                .unwrap()
-                .to_string()
+        assert_eq!(
+            "12345.6".parse::<Decimal>().unwrap(),
+            dec.try_scale_up_value(1).unwrap()
+        );
+        assert_eq!(
+            "123456".parse::<Decimal>().unwrap(),
+            dec.try_scale_up_value(2).unwrap()
+        );
+        assert_eq!(
+            "1234560".parse::<Decimal>().unwrap(),
+            dec.try_scale_up_value(3).unwrap()
+        );
+        assert_eq!(
+            "12345600".parse::<Decimal>().unwrap(),
+            dec.try_scale_up_value(4).unwrap()
         );
-        let c: MajorCurrencyAmount = coin.into();
-        assert_eq!(c, MajorCurrencyAmount::new("1", CurrencyDenom::Nym));
-    }
 
-    #[test]
-    fn major_currency_to_minor_cosmos_coin() {
-        let expected_cosmos_coin = CosmosCoin {
-            amount: CosmosDecimal::from(1u64),
-            denom: CosmosDenom::from_str("unym").unwrap(),
+        let dec = DecCoin {
+            denom: "foo".to_string(),
+            amount: "0.00000123".parse().unwrap(),
         };
-        let c = MajorCurrencyAmount::new("0.000001", CurrencyDenom::Nym);
-        let minor_cosmos_coin = c.into();
-        assert_eq!(expected_cosmos_coin, minor_cosmos_coin);
-        assert_eq!("unym", minor_cosmos_coin.denom.to_string());
+
+        assert_eq!(
+            "0.0000123".parse::<Decimal>().unwrap(),
+            dec.try_scale_up_value(1).unwrap()
+        );
+        assert_eq!(
+            "0.000123".parse::<Decimal>().unwrap(),
+            dec.try_scale_up_value(2).unwrap()
+        );
+        assert_eq!(
+            "123".parse::<Decimal>().unwrap(),
+            dec.try_scale_up_value(8).unwrap()
+        );
+        assert_eq!(
+            "1230".parse::<Decimal>().unwrap(),
+            dec.try_scale_up_value(9).unwrap()
+        );
+        assert_eq!(
+            "12300".parse::<Decimal>().unwrap(),
+            dec.try_scale_up_value(10).unwrap()
+        );
     }
 
     #[test]
-    fn major_currency_to_minor_cosmos_coin_2() {
-        let expected_cosmos_coin = CosmosCoin {
-            amount: CosmosDecimal::from(1000000u64),
-            denom: CosmosDenom::from_str("unym").unwrap(),
+    fn coin_to_dec_coin() {
+        let coin = Coin::new(123, "foo");
+        let dec = DecCoin::from(coin.clone());
+        assert_eq!(coin.denom, dec.denom);
+        assert_eq!(dec.amount, Decimal::from_atomics(coin.amount, 0).unwrap());
+    }
+
+    #[test]
+    fn dec_coin_to_coin() {
+        let dec = DecCoin {
+            denom: "foo".to_string(),
+            amount: "123".parse().unwrap(),
         };
-        let c = MajorCurrencyAmount::new("1", CurrencyDenom::Nym);
-        let minor_cosmos_coin = c.into();
-        assert_eq!(expected_cosmos_coin, minor_cosmos_coin);
-        assert_eq!("unym", minor_cosmos_coin.denom.to_string());
+        let coin = Coin::try_from(dec.clone()).unwrap();
+        assert_eq!(dec.denom, coin.denom);
+        assert_eq!(coin.amount, 123u128);
     }
 
     #[test]
-    fn minor_cosmos_coin_to_major_currency_string() {
-        // check minor cosmos coin is converted to major value
-        let cosmos_coin = CosmosCoin {
-            amount: CosmosDecimal::from(1u64),
-            denom: CosmosDenom::from_str("unym").unwrap(),
-        };
-        let c = MajorCurrencyAmount::from(cosmos_coin);
-        assert_eq!(c.to_string(), "0.000001 NYM");
+    fn converting_to_display() {
+        let reg = RegisteredCoins::default_denoms(Network::MAINNET);
+        let values = vec![
+            (1u128, "0.000001"),
+            (10u128, "0.00001"),
+            (100u128, "0.0001"),
+            (1000u128, "0.001"),
+            (10000u128, "0.01"),
+            (100000u128, "0.1"),
+            (1000000u128, "1"),
+            (1234567u128, "1.234567"),
+            (123456700u128, "123.4567"),
+        ];
+
+        for (raw, expected) in values {
+            let coin = Coin::new(raw, Network::MAINNET.mix_denom().base);
+            let display = reg.attempt_convert_to_display_dec_coin(coin).unwrap();
+            assert_eq!(Network::MAINNET.mix_denom().display, display.denom);
+            assert_eq!(expected, display.amount.to_string());
+        }
     }
 
     #[test]
-    fn denom_to_string() {
-        let c = MajorCurrencyAmount::new("1", CurrencyDenom::Nym);
-        let denom = c.denom.to_string();
-        assert_eq!(denom, "NYM".to_string());
+    fn converting_to_base() {
+        let reg = RegisteredCoins::default_denoms(Network::MAINNET);
+        let values = vec![
+            (1u128, "0.000001"),
+            (10u128, "0.00001"),
+            (100u128, "0.0001"),
+            (1000u128, "0.001"),
+            (10000u128, "0.01"),
+            (100000u128, "0.1"),
+            (1000000u128, "1"),
+            (1234567u128, "1.234567"),
+            (123456700u128, "123.4567"),
+        ];
+
+        for (expected, raw_display) in values {
+            let coin = DecCoin {
+                denom: Network::MAINNET.mix_denom().display.into(),
+                amount: raw_display.parse().unwrap(),
+            };
+            let base = reg.attempt_convert_to_base_coin(coin).unwrap();
+            assert_eq!(Network::MAINNET.mix_denom().base, base.denom);
+            assert_eq!(expected, base.amount);
+        }
     }
 }

common/types/src/delegation.rs

@@ -1,13 +1,10 @@
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-use log::error;
+use crate::currency::{DecCoin, RegisteredCoins};
+use crate::error::TypesError;
 use mixnet_contract_common::mixnode::DelegationEvent as ContractDelegationEvent;
 use mixnet_contract_common::mixnode::PendingUndelegate as ContractPendingUndelegate;
 use mixnet_contract_common::Delegation as MixnetContractDelegation;
-
-use crate::currency::MajorCurrencyAmount;
-use crate::error::TypesError;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
 
 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
@@ -18,31 +15,22 @@ use crate::error::TypesError;
 pub struct Delegation {
     pub owner: String,
     pub node_identity: String,
-    pub amount: MajorCurrencyAmount,
+    pub amount: DecCoin,
     pub block_height: u64,
     pub proxy: Option<String>, // proxy address used to delegate the funds on behalf of another address
 }
 
-impl TryFrom<MixnetContractDelegation> for Delegation {
-    type Error = TypesError;
-
-    fn try_from(value: MixnetContractDelegation) -> Result<Self, Self::Error> {
-        let MixnetContractDelegation {
-            owner,
-            node_identity,
-            amount,
-            block_height,
-            proxy,
-        } = value;
-
-        let amount: MajorCurrencyAmount = amount.into();
-
+impl Delegation {
+    pub fn from_mixnet_contract(
+        delegation: MixnetContractDelegation,
+        reg: &RegisteredCoins,
+    ) -> Result<Self, TypesError> {
         Ok(Delegation {
-            owner: owner.into_string(),
-            node_identity,
-            amount,
-            block_height,
-            proxy: proxy.map(|p| p.into_string()),
+            owner: delegation.owner.to_string(),
+            node_identity: delegation.node_identity,
+            amount: reg.attempt_convert_to_display_dec_coin(delegation.amount.into())?,
+            block_height: delegation.block_height,
+            proxy: delegation.proxy.map(|d| d.to_string()),
         })
     }
 }
@@ -54,10 +42,9 @@ impl TryFrom<MixnetContractDelegation> for Delegation {
 )]
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, JsonSchema)]
 pub struct DelegationRecord {
-    pub amount: MajorCurrencyAmount,
+    pub amount: DecCoin,
     pub block_height: u64,
     pub delegated_on_iso_datetime: String,
-    pub uses_vesting_contract_tokens: bool,
 }
 
 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
@@ -69,16 +56,16 @@ pub struct DelegationRecord {
 pub struct DelegationWithEverything {
     pub owner: String,
     pub node_identity: String,
-    pub amount: MajorCurrencyAmount,
-    pub total_delegation: Option<MajorCurrencyAmount>,
-    pub pledge_amount: Option<MajorCurrencyAmount>,
+    pub amount: DecCoin,
+    pub total_delegation: Option<DecCoin>,
+    pub pledge_amount: Option<DecCoin>,
     pub block_height: u64,
     pub delegated_on_iso_datetime: String,
     pub profit_margin_percent: Option<u8>,
     pub avg_uptime_percent: Option<u8>,
     pub stake_saturation: Option<f32>,
-    pub uses_vesting_contract_tokens: bool,
-    pub accumulated_rewards: Option<MajorCurrencyAmount>,
+    pub proxy: Option<String>,
+    pub accumulated_rewards: Option<DecCoin>,
     pub pending_events: Vec<DelegationEvent>,
     pub history: Vec<DelegationRecord>,
 }
@@ -92,34 +79,7 @@ pub struct DelegationWithEverything {
 pub struct DelegationResult {
     source_address: String,
     target_address: String,
-    amount: Option<MajorCurrencyAmount>,
-}
-
-impl DelegationResult {
-    pub fn new(
-        source_address: &str,
-        target_address: &str,
-        amount: Option<MajorCurrencyAmount>,
-    ) -> DelegationResult {
-        DelegationResult {
-            source_address: source_address.to_string(),
-            target_address: target_address.to_string(),
-            amount,
-        }
-    }
-}
-
-impl TryFrom<MixnetContractDelegation> for DelegationResult {
-    type Error = TypesError;
-
-    fn try_from(delegation: MixnetContractDelegation) -> Result<Self, Self::Error> {
-        let amount: MajorCurrencyAmount = delegation.amount.clone().into();
-        Ok(DelegationResult {
-            source_address: delegation.owner().to_string(),
-            target_address: delegation.node_identity(),
-            amount: Some(amount),
-        })
-    }
+    amount: Option<DecCoin>,
 }
 
 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
@@ -143,36 +103,31 @@ pub struct DelegationEvent {
     pub kind: DelegationEventKind,
     pub node_identity: String,
     pub address: String,
-    pub amount: Option<MajorCurrencyAmount>,
+    pub amount: Option<DecCoin>,
     pub block_height: u64,
-    pub proxy: Option<String>,
 }
 
-impl TryFrom<ContractDelegationEvent> for DelegationEvent {
-    type Error = TypesError;
-
-    fn try_from(event: ContractDelegationEvent) -> Result<Self, Self::Error> {
-        match event {
-            ContractDelegationEvent::Delegate(delegation) => {
-                let amount: MajorCurrencyAmount = delegation.amount.into();
-                Ok(DelegationEvent {
-                    kind: DelegationEventKind::Delegate,
-                    block_height: delegation.block_height,
-                    address: delegation.owner.into_string(),
-                    node_identity: delegation.node_identity,
-                    amount: Some(amount),
-                    proxy: delegation.proxy.map(|p| p.into_string()),
-                })
-            }
-            ContractDelegationEvent::Undelegate(pending_undelegate) => Ok(DelegationEvent {
+impl DelegationEvent {
+    pub fn from_mixnet_contract(
+        event: ContractDelegationEvent,
+        reg: &RegisteredCoins,
+    ) -> Result<Self, TypesError> {
+        Ok(match event {
+            ContractDelegationEvent::Delegate(delegation) => DelegationEvent {
+                kind: DelegationEventKind::Delegate,
+                block_height: delegation.block_height,
+                address: delegation.owner.into_string(),
+                node_identity: delegation.node_identity,
+                amount: Some(reg.attempt_convert_to_display_dec_coin(delegation.amount.into())?),
+            },
+            ContractDelegationEvent::Undelegate(pending_undelegate) => DelegationEvent {
                 kind: DelegationEventKind::Undelegate,
                 block_height: pending_undelegate.block_height(),
                 address: pending_undelegate.delegate().into_string(),
                 node_identity: pending_undelegate.mix_identity(),
                 amount: None,
-                proxy: pending_undelegate.proxy().map(|p| p.into_string()),
-            }),
-        }
+            },
+        })
     }
 }
 
@@ -200,30 +155,6 @@ impl From<ContractPendingUndelegate> for PendingUndelegate {
     }
 }
 
-pub fn from_contract_delegation_events(
-    events: Vec<ContractDelegationEvent>,
-) -> Result<Vec<DelegationEvent>, TypesError> {
-    let (events, errors): (Vec<_>, Vec<_>) = events
-        .into_iter()
-        .map(|delegation_event| delegation_event.try_into())
-        .partition(Result::is_ok);
-
-    if errors.is_empty() {
-        let events = events
-            .into_iter()
-            .filter_map(|e| e.ok())
-            .collect::<Vec<DelegationEvent>>();
-        return Ok(events);
-    }
-    let errors = errors
-        .into_iter()
-        .filter_map(|e| e.err())
-        .collect::<Vec<TypesError>>();
-
-    error!("Failed to convert delegations: {:?}", errors);
-    Err(TypesError::DelegationsInvalid)
-}
-
 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
     feature = "generate-ts",
@@ -232,6 +163,6 @@ pub fn from_contract_delegation_events(
 #[derive(Deserialize, Serialize)]
 pub struct DelegationsSummaryResponse {
     pub delegations: Vec<DelegationWithEverything>,
-    pub total_delegations: MajorCurrencyAmount,
-    pub total_rewards: MajorCurrencyAmount,
+    pub total_delegations: DecCoin,
+    pub total_rewards: DecCoin,
 }

common/types/src/error.rs

@@ -4,6 +4,7 @@ use thiserror::Error;
 use validator_client::validator_api::error::ValidatorAPIError;
 use validator_client::{nymd::error::NymdError, ValidatorClientError};
 
+// TODO: ask @MS why this even exists
 #[derive(Error, Debug)]
 pub enum TypesError {
     #[error("{source}")]
@@ -61,6 +62,12 @@ pub enum TypesError {
     InvalidGatewayBond(),
     #[error("Invalid delegations")]
     DelegationsInvalid,
+    #[error("Attempted to use too huge currency exponent ({0})")]
+    UnsupportedExponent(u32),
+    #[error("Attempted to convert coin that would have resulted in loss of precision")]
+    LossyCoinConversion,
+    #[error("The provided coin has an unknown denomination - {0}")]
+    UnknownCoinDenom(String),
 }
 
 impl Serialize for TypesError {

common/types/src/fees.rs

@@ -1,9 +1,7 @@
+use crate::currency::DecCoin;
 use serde::{Deserialize, Serialize};
-
 use validator_client::nymd::Fee;
 
-use crate::currency::MajorCurrencyAmount;
-
 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
     feature = "generate-ts",
@@ -12,7 +10,13 @@ use crate::currency::MajorCurrencyAmount;
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct FeeDetails {
     // expected to be used by the wallet in order to display detailed fee information to the user
-    pub amount: Option<MajorCurrencyAmount>,
+    pub amount: Option<DecCoin>,
     #[cfg_attr(feature = "generate-ts", ts(skip))]
     pub fee: Fee,
 }
+
+impl FeeDetails {
+    pub fn new(amount: Option<DecCoin>, fee: Fee) -> Self {
+        FeeDetails { amount, fee }
+    }
+}

common/types/src/gas.rs

@@ -1,48 +1,29 @@
-use crate::currency::MajorCurrencyAmount;
-use crate::error::TypesError;
 use cosmrs::tx::Gas as CosmrsGas;
 use serde::{Deserialize, Serialize};
 use validator_client::nymd::cosmwasm_client::types::GasInfo as ValidatorClientGasInfo;
-use validator_client::nymd::GasPrice;
 
 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
     feature = "generate-ts",
     ts(export_to = "ts-packages/types/src/types/rust/Gas.ts")
 )]
-#[derive(Deserialize, Serialize, Clone)]
+#[derive(Deserialize, Serialize, Copy, Clone, Debug)]
 pub struct Gas {
     /// units of gas used
     pub gas_units: u64,
-    //
-    // /// gas units converted to fee as major coin amount
-    // pub amount: MajorCurrencyAmount,
 }
 
 impl Gas {
-    pub fn from_cosmrs_gas(value: CosmrsGas, _denom_minor: &str) -> Result<Gas, TypesError> {
-        Ok(Gas {
-            gas_units: value.value(),
-        })
-
-        // // TODO: use simulator struct to do conversion to fee
-        // let value_u128 = Uint128::from(value.value());
-        // let amount = Decimal::new(value_u128) * Decimal::from_str("0.0025")?;
-        // Ok(Gas {
-        //     gas_units: value.value(),
-        //     amount: MajorCurrencyAmount::from_minor_decimal_and_denom(amount, denom_minor)?,
-        // })
+    pub fn from_u64(value: u64) -> Gas {
+        Gas { gas_units: value }
     }
-    pub fn from_u64(value: u64, _denom_minor: &str) -> Result<Gas, TypesError> {
-        Ok(Gas { gas_units: value })
-        // todo!()
-        // // TODO: use simulator struct to do conversion to fee
-        // let value_u128 = Uint128::from(value);
-        // let amount = Decimal::new(value_u128) * Decimal::from_str("0.0025")?;
-        // Ok(Gas {
-        //     gas_units: value,
-        //     amount: MajorCurrencyAmount::from_minor_decimal_and_denom(amount, denom_minor)?,
-        // })
+}
+
+impl From<CosmrsGas> for Gas {
+    fn from(gas: CosmrsGas) -> Self {
+        Gas {
+            gas_units: gas.value(),
+        }
     }
 }
 
@@ -51,44 +32,29 @@ impl Gas {
     feature = "generate-ts",
     ts(export_to = "ts-packages/types/src/types/rust/GasInfo.ts")
 )]
-#[derive(Deserialize, Serialize, Debug)]
+#[derive(Deserialize, Serialize, Copy, Clone, Debug)]
 pub struct GasInfo {
     /// GasWanted is the maximum units of work we allow this tx to perform.
-    pub gas_wanted: u64,
+    pub gas_wanted: Gas,
 
     /// GasUsed is the amount of gas actually consumed.
-    pub gas_used: u64,
+    pub gas_used: Gas,
+}
 
-    /// gas units converted to fee as major coin amount
-    pub fee: MajorCurrencyAmount,
+impl From<ValidatorClientGasInfo> for GasInfo {
+    fn from(info: ValidatorClientGasInfo) -> Self {
+        GasInfo {
+            gas_wanted: info.gas_wanted.into(),
+            gas_used: info.gas_used.into(),
+        }
+    }
 }
 
 impl GasInfo {
-    pub fn from_validator_client_gas_info(
-        value: ValidatorClientGasInfo,
-        denom_minor: &str,
-    ) -> Result<GasInfo, TypesError> {
-        // terrible workaround, but I don't want to break the current flow (just yet)
-        let gas_price = GasPrice::new_with_default_price(denom_minor)?;
-        let fee = (&gas_price) * value.gas_used;
-        Ok(GasInfo {
-            gas_wanted: value.gas_wanted.value(),
-            gas_used: value.gas_used.value(),
-            fee: fee.into(),
-        })
-    }
-    pub fn from_u64(
-        gas_wanted: u64,
-        gas_used: u64,
-        denom_minor: &str,
-    ) -> Result<GasInfo, TypesError> {
-        // terrible workaround, but I don't want to break the current flow (just yet)
-        let gas_price = GasPrice::new_with_default_price(denom_minor)?;
-        let fee = (&gas_price) * CosmrsGas::from(gas_used);
-        Ok(GasInfo {
-            gas_wanted,
-            gas_used,
-            fee: fee.into(),
-        })
+    pub fn from_u64(gas_wanted: u64, gas_used: u64) -> GasInfo {
+        GasInfo {
+            gas_wanted: Gas::from_u64(gas_wanted),
+            gas_used: Gas::from_u64(gas_used),
+        }
     }
 }