update wording for password strength and allow

GitHub Actions: revert trigger changes
Update CHANGELOG for wallet release v1.0.6
2022-06-22 10:04:52 +01:00 · 2022-06-21 19:02:51 +01:00 · 2022-06-21 19:01:09 +01:00 · 2022-06-21 18:52:49 +01:00 · 2022-06-21 18:50:08 +01:00 · 2022-06-21 18:27:26 +02:00
585 changed files with 38378 additions and 11708 deletions
@@ -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@v2
+    - uses: actions/setup-node@v3
      with:
-        node-version: '16'
+        node-version: 16
    - name: Setup yarn
      run: npm install -g yarn
    - name: Build
@@ -41,6 +41,13 @@ 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:
@@ -0,0 +1,56 @@
+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
@@ -14,9 +14,9 @@ jobs:
    runs-on: custom-runner-linux
    steps:
      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
        with:
-          node-version: '16'
+          node-version: 16
      - name: Setup yarn
        run: npm install -g yarn
      - name: Run ESLint
@@ -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@v2
+    - uses: actions/setup-node@v3
      with:
-        node-version: '16'
+        node-version: 16
    - name: Setup yarn
      run: npm install -g yarn
      continue-on-error: true
@@ -50,6 +50,19 @@ 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:
@@ -75,9 +88,9 @@ jobs:
          command: clippy
          args: --workspace --all-targets -- -D warnings

-      - name: Reclaim some disk space (because Windows is being annoying)
+      - name: Reclaim some disk space
        uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' }}
+        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-latest' }}
        with:
          command: clean

@@ -0,0 +1,59 @@
+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
@@ -1,5 +1,6 @@
 name: Publish Nym Wallet (MacOS)
 on:
+  workflow_dispatch:
  release:
    types: [created]

@@ -19,16 +20,16 @@ jobs:
      - uses: actions/checkout@v2

      - name: Check the release tag starts with `nym-wallet-`
-        if: startsWith(github.ref, 'refs/tags/nym-wallet-') == false
+        if: startsWith(github.ref, 'refs/tags/nym-wallet-') == false && github.event_name != 'workflow_dispatch'
        uses: actions/github-script@v3
        with:
          script: |
            core.setFailed('Release tag did not start with nym-wallet-...')

      - name: Node v16
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
        with:
-          node-version: 16.x
+          node-version: 16
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
@@ -55,6 +56,12 @@ 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 }}
@@ -68,14 +75,22 @@ jobs:
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
        run: yarn && yarn build

-      - name: Upload to release based on tag name
-        uses: softprops/action-gh-release@v1
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
        with:
-          files: |
-            nym-wallet/target/release/bundle/dmg/*.dmg
-            nym-wallet/target/release/bundle/macos/*.app.tar.gz*
+          name: nym-wallet.app.tar.gz
+          path: nym-wallet/target/release/bundle/macos/nym-wallet.app.tar.gz
+          retention-days: 5

      - 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*
@@ -30,15 +30,21 @@ jobs:
            core.setFailed('Release tag did not start with nym-wallet-...')

      - name: Node v16
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
        with:
-          node-version: 16.x
+          node-version: 16
      - 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:
@@ -45,15 +45,21 @@ 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@v1
+        uses: actions/setup-node@v3
        with:
-          node-version: 16.x
+          node-version: 16

      - 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

@@ -0,0 +1,32 @@
+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}}
@@ -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@v2
+    - uses: actions/setup-node@v3
      with:
-        node-version: '16'
+        node-version: 16
    - name: Setup yarn
      run: npm install -g yarn
    - name: Build dependencies
@@ -34,9 +34,9 @@ jobs:
          toolchain: stable

      - name: Node v16
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
        with:
-          node-version: 16.x
+          node-version: 16

      - name: Install yarn for building application
        run: yarn install
@@ -3,7 +3,7 @@ require('dotenv').config();
 const Bot = require('keybase-bot');

 let context = {
-  kinds: ['nym-wallet', 'ts-packages', 'network-explorer', 'nightly'],
+  kinds: ['nym-wallet', 'ts-packages', 'network-explorer', 'nightly', 'nym-connect'],
 };

 /**
@@ -0,0 +1,29 @@
+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,
+};
@@ -0,0 +1,11 @@
+🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥🟥
+> :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 }}
+```
@@ -0,0 +1,11 @@
+🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩
+> :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 }}
+```
@@ -6,22 +6,25 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://

 ### Added

+- socks5 client/websocket client: add `--force-register-gateway` flag, useful when rerunning init ([#1353])
+- nym-connect: initial proof-of-concept of a UI around the socks5 client was added
 - all: added network compilation target to `--help` (or `--version`) commands ([#1256]).
 - explorer-api: learned how to sum the delegations by owner in a new endpoint.
 - gateway: Added gateway coconut verifications and validator-api communication for double spending protection ([#1261])
 - mixnet-contract: Added ClaimOperatorReward and ClaimDelegatorReward messages ([#1292])
 - mixnet-contract: Replace all naked `-` with `saturating_sub`.
- network-requester: send traffic statistics from all network requesters and receive it in a special network-requester that aggregates the data and exposes it via a rest API ([#1267], [#1278]).
+- mixnet-contract: Added staking_supply field to ContractStateParams.
+- mixnet-contract: Added a query to get MixnodeBond by identity key ([#1369]).
+- mixnet-contract: Added a query to get GatewayBond by identity key ([#1369]).
+- network-explorer-ui: Upgrade to React Router 6
+- rewarding: replace circulating supply with staking supply in reward calculations ([#1324])
 - validator-api: add `estimated_node_profit` and `estimated_operator_cost` to `reward-estimate` endpoint ([#1284])
- validator-api: add detailed mixnode bond endpoints, and explorer-api makes use of that data to append stake saturation.
+- validator-api: add 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])
- 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])
+- mixnode: Added basic mixnode hardware reporting to the HTTP API ([#1308]).

 ### Fixed

@@ -30,15 +33,21 @@ 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])
+- mixnode: the mixnode learned how to shutdown gracefully
 - native & socks5 clients: fail early when clients try to re-init with a different gateway, which is not supported yet ([#1322])
+- native & socks5 clients: rerun init will now reuse previous gateway configuration instead of failing ([#1353])
+- validator: fixed local docker-compose setup to work on Apple M1 ([#1329])
+- vesting-contract: replaced `checked_sub` with `saturating_sub` to fix the underflow in `get_vesting_tokens` ([#1275])

 ### 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
@@ -46,7 +55,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 [#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
@@ -54,8 +62,39 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 [#1292]: https://github.com/nymtech/nym/pull/1292
 [#1295]: https://github.com/nymtech/nym/pull/1295
 [#1302]: https://github.com/nymtech/nym/pull/1302
+[#1308]: https://github.com/nymtech/nym/pull/1308
 [#1318]: https://github.com/nymtech/nym/pull/1318
 [#1322]: https://github.com/nymtech/nym/pull/1322
+[#1324]: https://github.com/nymtech/nym/pull/1324
+[#1328]: https://github.com/nymtech/nym/pull/1328
+[#1329]: https://github.com/nymtech/nym/pull/1329
+[#1353]: https://github.com/nymtech/nym/pull/1353
+[#1369]: https://github.com/nymtech/nym/pull/1369
+[#1373]: https://github.com/nymtech/nym/pull/1373
+[#1376]: https://github.com/nymtech/nym/pull/1376
+
+## [nym-wallet-v1.0.6](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.6) (2022-06-21)
+
+- wallet: undelegating now uses either the mixnet or vesting contract, or both, depending on how delegations were made
+- wallet: redeeming and compounding now uses both the mixnet and vesting contract
+- wallet: the wallet backend learned how to archive wallet files
+- wallet: add ENABLE_QA_MODE environment variable to enable QA mode on built wallet
+
+## [nym-wallet-v1.0.5](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.5) (2022-06-14)
+
+- wallet: add simple CLI tool for decrypting and recovering the wallet file.
+- wallet: added support for multiple accounts ([#1265])
+- wallet: compound and claim reward endpoints for operators and delegators ([#1302])
+- wallet: require password to switch accounts
+- wallet: the wallet backend learned how to keep track of validator name, either hardcoded or by querying the status endpoint.
+- wallet: new delegation and rewards UI
+- wallet: show version in nav bar
+- wallet: contract admin route put back
+- wallet: staking_supply field to StateParams
+- wallet: show transaction hash for redeeming or compounding rewards
+
+[#1265]: https://github.com/nymtech/nym/pull/1265
+[#1302]: https://github.com/nymtech/nym/pull/1302

 ## [nym-wallet-v1.0.4](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.4) (2022-05-04)

@@ -14,6 +14,15 @@ 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"
@@ -38,6 +47,20 @@ 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"
@@ -198,12 +221,6 @@ 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"
@@ -218,9 +235,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"

 [[package]]
 name = "base64ct"
-version = "1.5.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dea908e7347a8c64e378c17e30ef880ad73e3b4498346b055c2c00ea342f3179"
+checksum = "8a32fd6af2b5827bce66c29053ba0e7c42b9dcab01835835058558c10851a46b"

 [[package]]
 name = "binascii"
@@ -250,7 +267,7 @@ dependencies = [
 "pbkdf2",
 "rand_core 0.6.3",
 "ripemd160",
- "sha2",
+ "sha2 0.9.9",
 "subtle 2.4.1",
 "zeroize",
 ]
@@ -410,7 +427,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
 dependencies = [
- "sha2",
+ "sha2 0.9.9",
 ]

 [[package]]
@@ -701,12 +718,6 @@ 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"
@@ -728,12 +739,19 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"

 [[package]]
 name = "cookie"
-version = "0.15.1"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f1c7727e460397e56abc4bddc1d49e07a1ad78fc98eb2e1c8f032a58a2f80d"
+checksum = "94d4706de1b0fa5b132270cddffa8585166037822e260a944fe161acd137ca05"
 dependencies = [
+ "aes-gcm",
+ "base64",
+ "hkdf 0.12.3",
+ "hmac 0.12.1",
 "percent-encoding",
- "time 0.2.27",
+ "rand 0.8.5",
+ "sha2 0.10.2",
+ "subtle 2.4.1",
+ "time 0.3.9",
 "version_check",
 ]

@@ -1122,6 +1140,16 @@ 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"
@@ -1332,12 +1360,6 @@ 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"
@@ -1354,7 +1376,7 @@ dependencies = [
 "rand_core 0.6.3",
 "serde",
 "serde_derive",
- "sha2",
+ "sha2 0.9.9",
 "thiserror",
 "zeroize",
 ]
@@ -1410,7 +1432,7 @@ dependencies = [
 "rand 0.7.3",
 "serde",
 "serde_bytes",
- "sha2",
+ "sha2 0.9.9",
 "zeroize",
 ]

@@ -1424,7 +1446,7 @@ dependencies = [
 "hex",
 "rand_core 0.6.3",
 "serde",
- "sha2",
+ "sha2 0.9.9",
 "thiserror",
 "zeroize",
 ]
@@ -1954,6 +1976,12 @@ 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"
@@ -2024,6 +2052,16 @@ 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"
@@ -2596,7 +2634,7 @@ dependencies = [
 "ecdsa",
 "elliptic-curve",
 "sec1",
- "sha2",
+ "sha2 0.9.9",
 "sha3",
 ]

@@ -2852,6 +2890,7 @@ dependencies = [
 "nymsphinx-types",
 "rand 0.8.5",
 "serde",
+ "task",
 "tokio",
 "tokio-util 0.7.3",
 "url",
@@ -3073,6 +3112,7 @@ dependencies = [
 "rand 0.7.3",
 "serde",
 "sqlx",
+ "statistics-common",
 "subtle-encoding",
 "thiserror",
 "tokio",
@@ -3096,6 +3136,7 @@ dependencies = [
 "colored",
 "config",
 "crypto",
+ "cupid",
 "dirs",
 "dotenv",
 "futures",
@@ -3114,6 +3155,7 @@ dependencies = [
 "rocket",
 "serde",
 "serial_test",
+ "sysinfo",
 "task",
 "tokio",
 "tokio-util 0.7.3",
@@ -3129,7 +3171,7 @@ dependencies = [
 name = "nym-network-requester"
 version = "1.0.1"
 dependencies = [
- "bincode",
+ "async-trait",
 "clap 2.34.0",
 "dirs",
 "futures",
@@ -3143,16 +3185,32 @@ dependencies = [
 "publicsuffix",
 "rand 0.7.3",
 "reqwest",
- "rocket",
 "serde",
 "socks5-requests",
 "sqlx",
+ "statistics-common",
 "thiserror",
 "tokio",
 "tokio-tungstenite",
 "websocket-requests",
 ]

+[[package]]
+name = "nym-network-statistics"
+version = "0.1.0"
+dependencies = [
+ "dirs",
+ "log",
+ "pretty_env_logger",
+ "rocket",
+ "serde",
+ "sqlx",
+ "statistics-common",
+ "thiserror",
+ "tokio",
+ "tokio-tungstenite",
+]
+
 [[package]]
 name = "nym-socks5-client"
 version = "1.0.1"
@@ -3189,6 +3247,32 @@ dependencies = [
 "version-checker",
 ]

+[[package]]
+name = "nym-types"
+version = "1.0.0"
+dependencies = [
+ "coconut-interface",
+ "config",
+ "cosmrs",
+ "cosmwasm-std",
+ "eyre",
+ "itertools",
+ "log",
+ "mixnet-contract-common",
+ "reqwest",
+ "schemars",
+ "serde",
+ "serde_json",
+ "strum",
+ "tempfile",
+ "thiserror",
+ "ts-rs",
+ "url",
+ "validator-client",
+ "vesting-contract",
+ "vesting-contract-common",
+]
+
 [[package]]
 name = "nym-validator-api"
 version = "1.0.1"
@@ -3236,6 +3320,7 @@ dependencies = [
 "tokio",
 "tokio-stream",
 "topology",
+ "ts-rs",
 "url",
 "validator-api-requests",
 "validator-client",
@@ -3243,6 +3328,24 @@ dependencies = [
 "version-checker",
 ]

+[[package]]
+name = "nym-wallet-types"
+version = "1.0.0"
+dependencies = [
+ "config",
+ "cosmrs",
+ "cosmwasm-std",
+ "mixnet-contract-common",
+ "nym-types",
+ "serde",
+ "serde_json",
+ "strum",
+ "ts-rs",
+ "validator-client",
+ "vesting-contract",
+ "vesting-contract-common",
+]
+
 [[package]]
 name = "nymcoconut"
 version = "0.5.0"
@@ -3260,7 +3363,7 @@ dependencies = [
 "rand 0.8.5",
 "serde",
 "serde_derive",
- "sha2",
+ "sha2 0.9.9",
 "thiserror",
 ]

@@ -3791,6 +3894,18 @@ 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"
@@ -3854,12 +3969,6 @@ 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"
@@ -4421,9 +4530,9 @@ dependencies = [

 [[package]]
 name = "rocket"
-version = "0.5.0-rc.1"
+version = "0.5.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a71c18c42a0eb15bf3816831caf0dad11e7966f2a41aaf486a701979c4dd1f2"
+checksum = "98ead083fce4a405feb349cf09abdf64471c6077f14e0ce59364aa90d4b99317"
 dependencies = [
 "async-stream",
 "async-trait",
@@ -4439,7 +4548,7 @@ dependencies = [
 "memchr",
 "multer",
 "num_cpus",
- "parking_lot 0.11.2",
+ "parking_lot 0.12.0",
 "pin-project-lite",
 "rand 0.8.5",
 "ref-cast",
@@ -4449,10 +4558,10 @@ dependencies = [
 "serde_json",
 "state",
 "tempfile",
- "time 0.2.27",
+ "time 0.3.9",
 "tokio",
 "tokio-stream",
- "tokio-util 0.6.9",
+ "tokio-util 0.7.3",
 "ubyte",
 "version_check",
 "yansi",
@@ -4460,9 +4569,9 @@ dependencies = [

 [[package]]
 name = "rocket_codegen"
-version = "0.5.0-rc.1"
+version = "0.5.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66f5fa462f7eb958bba8710c17c5d774bbbd59809fa76fb1957af7e545aea8bb"
+checksum = "d6aeb6bb9c61e9cd2c00d70ea267bf36f76a4cc615e5908b349c2f9d93999b47"
 dependencies = [
 "devise",
 "glob",
@@ -4491,19 +4600,18 @@ dependencies = [

 [[package]]
 name = "rocket_http"
-version = "0.5.0-rc.1"
+version = "0.5.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23c8b7d512d2fcac2316ebe590cde67573844b99e6cc9ee0f53375fa16e25ebd"
+checksum = "2ded65d127954de3c12471630bf4b81a2792f065984461e65b91d0fdaafc17a2"
 dependencies = [
 "cookie",
 "either",
+ "futures",
 "http",
 "hyper",
 "indexmap",
 "log",
 "memchr",
- "mime",
- "parking_lot 0.11.2",
 "pear",
 "percent-encoding",
 "pin-project-lite",
@@ -4512,16 +4620,16 @@ dependencies = [
 "smallvec 1.8.0",
 "stable-pattern",
 "state",
- "time 0.2.27",
+ "time 0.3.9",
 "tokio",
 "uncased",
 ]

 [[package]]
 name = "rocket_okapi"
-version = "0.8.0-rc.1"
+version = "0.8.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0025aa04994af8cd8e1fcdd5a73579a395c941ae090ecb0a39b41cca7e237a20"
+checksum = "489f4f5b120762f7974e65b919fc462d0660fd8b839026d8985b850fe5acccb0"
 dependencies = [
 "either",
 "log",
@@ -4535,9 +4643,9 @@ dependencies = [

 [[package]]
 name = "rocket_okapi_codegen"
-version = "0.8.0-rc.1"
+version = "0.8.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc114779fc27afb78179233e966f469e47fd7a98dc15181cff2574cdddb65612"
+checksum = "54f94d1ffe41472e08463d7a2674f1db04dc4df745285e8369b33d3cfd6b0308"
 dependencies = [
 "darling",
 "proc-macro2",
@@ -4548,9 +4656,9 @@ dependencies = [

 [[package]]
 name = "rocket_sync_db_pools"
-version = "0.1.0-rc.1"
+version = "0.1.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38cfdfebd552d075c368e641c88a5cd6ce1c58c5c710548aeb777abb48830f4b"
+checksum = "5fa48b6ab25013e9812f1b0c592741900b3a2a83c0936292e0565c0ac842f558"
 dependencies = [
 "r2d2",
 "rocket",
@@ -4561,9 +4669,9 @@ dependencies = [

 [[package]]
 name = "rocket_sync_db_pools_codegen"
-version = "0.1.0-rc.1"
+version = "0.1.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267808c094db5366e1d8925aaf9f2ce05ff9b3bd92cb18c7040a1fe219c2e25"
+checksum = "280ef2d232923e69cb93da156972eb5476a7cce5ba44843f6608f46a4abf7aab"
 dependencies = [
 "devise",
 "quote",
@@ -4660,9 +4768,9 @@ dependencies = [

 [[package]]
 name = "schemars"
-version = "0.8.8"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6b5a3c80cea1ab61f4260238409510e814e38b4b563c06044edf91e7dc070e3"
+checksum = "1847b767a3d62d95cbf3d8a9f0e421cf57a0d8aa4f411d4b16525afb0284d4ed"
 dependencies = [
 "dyn-clone",
 "indexmap",
@@ -4673,9 +4781,9 @@ dependencies = [

 [[package]]
 name = "schemars_derive"
-version = "0.8.8"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41ae4dce13e8614c46ac3c38ef1c0d668b101df6ac39817aebdaa26642ddae9b"
+checksum = "af4d7e1b012cb3d9129567661a63755ea4b8a7386d339dc945ae187e403c6743"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -4854,9 +4962,9 @@ dependencies = [

 [[package]]
 name = "serde_derive_internals"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dbab34ca63057a1f15280bdf3c39f2b1eb1b54c17e98360e511637aef7418c6"
+checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -4967,21 +5075,6 @@ 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"
@@ -4995,6 +5088,17 @@ 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"
@@ -5145,7 +5249,7 @@ dependencies = [
 "log",
 "rand 0.7.3",
 "rand_distr",
- "sha2",
+ "sha2 0.9.9",
 "subtle 2.4.1",
 ]

@@ -5228,7 +5332,7 @@ dependencies = [
 "paste",
 "percent-encoding",
 "rustls",
- "sha2",
+ "sha2 0.9.9",
 "smallvec 1.8.0",
 "sqlformat",
 "sqlx-rt",
@@ -5252,7 +5356,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "sha2",
+ "sha2 0.9.9",
 "sqlx-core",
 "sqlx-rt",
 "syn",
@@ -5279,20 +5383,11 @@ dependencies = [
 "memchr",
 ]

-[[package]]
-name = "standback"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff"
-dependencies = [
- "version_check",
-]
-
 [[package]]
 name = "state"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cf4f5369e6d3044b5e365c9690f451516ac8f0954084622b49ea3fde2f6de5"
+checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b"
 dependencies = [
 "loom",
 ]
@@ -5304,54 +5399,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"

 [[package]]
-name = "stdweb"
-version = "0.4.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
+name = "statistics-common"
+version = "1.0.1"
 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",
+ "async-trait",
+ "log",
+ "network-defaults",
+ "reqwest",
 "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",
+ "sqlx",
+ "thiserror",
+ "tokio",
 ]

-[[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"
@@ -5374,6 +5435,28 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"

+[[package]]
+name = "strum"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38"
+dependencies = [
+ "heck 0.3.3",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn",
+]
+
 [[package]]
 name = "subtle"
 version = "1.0.0"
@@ -5418,6 +5501,21 @@ 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"
@@ -5469,7 +5567,7 @@ dependencies = [
 "serde_bytes",
 "serde_json",
 "serde_repr",
- "sha2",
+ "sha2 0.9.9",
 "signature",
 "subtle 2.4.1",
 "subtle-encoding",
@@ -5607,21 +5705,6 @@ 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"
@@ -5632,17 +5715,7 @@ dependencies = [
 "libc",
 "num_threads",
 "serde",
- "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",
+ "time-macros",
 ]

 [[package]]
@@ -5651,19 +5724,6 @@ 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"
@@ -6000,6 +6060,21 @@ dependencies = [
 "ts-rs-macros",
 ]

+[[package]]
+name = "ts-rs-cli"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "mixnet-contract-common",
+ "nym-types",
+ "nym-wallet-types",
+ "ts-rs",
+ "validator-api-requests",
+ "validator-client",
+ "vesting-contract-common",
+ "walkdir",
+]
+
 [[package]]
 name = "ts-rs-macros"
 version = "6.1.2"
@@ -6134,6 +6209,16 @@ 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"
@@ -6201,7 +6286,7 @@ dependencies = [
 "reqwest",
 "serde",
 "serde_json",
- "sha2",
+ "sha2 0.9.9",
 "thiserror",
 "tokio",
 "ts-rs",
@@ -53,18 +53,22 @@ members = [
    "common/nymsphinx/params",
    "common/nymsphinx/types",
    "common/pemstore",
+    "common/statistics",
    "common/socks5/proxy-helpers",
    "common/socks5/requests",
    "common/task",
    "common/topology",
+    "common/types",
    "common/wasm-utils",
    "explorer-api",
    "gateway",
    "gateway/gateway-requests",
    "mixnode",
    "service-providers/network-requester",
+    "service-providers/network-statistics",
    "validator-api",
    "validator-api/validator-api-requests",
+    "tools/ts-rs-cli"
 ]

 default-members = [
@@ -77,4 +81,4 @@ default-members = [
    "explorer-api",
 ]

-exclude = ["explorer", "contracts", "tokenomics-py", "clients/webassembly"]
+exclude = ["explorer", "contracts", "tokenomics-py", "clients/webassembly", "nym-wallet"]
@@ -1,11 +1,13 @@
+test-all: test cargo-test-expensive
 test: build clippy-all cargo-test wasm fmt
 no-clippy: build cargo-test wasm fmt
 happy: fmt clippy-happy test
-clippy-all: clippy-all-main clippy-all-contracts clippy-all-wallet
-clippy-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-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-happy-main:
 	cargo clippy
@@ -16,6 +18,9 @@ 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

@@ -25,15 +30,33 @@ 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

@@ -43,6 +66,9 @@ 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

@@ -52,5 +78,12 @@ fmt-contracts:
 fmt-wallet:
 	cargo fmt --manifest-path nym-wallet/Cargo.toml --all

+fmt-connect:
+	cargo fmt --manifest-path nym-connect/Cargo.toml --all
+
 wasm:
 	RUSTFLAGS='-C link-arg=-s' cargo build --manifest-path contracts/Cargo.toml --release --target wasm32-unknown-unknown
+
+generate-typescript:
+	cd tools/ts-rs-cli && cargo run && cd ../..
+	yarn types:lint:fix
@@ -0,0 +1,8 @@
+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
@@ -0,0 +1,96 @@
+@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');
+}
@@ -0,0 +1,7 @@
+<svg viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M171.7,30.3001 C132.7,-8.7999 69.3001,-8.7999 30.3001,30.3001 C-8.7999,69.4001 -8.7999,132.7 30.3001,171.7 C69.4001,210.8 132.7,210.8 171.7,171.7 C210.8,132.7 210.8,69.3001 171.7,30.3001 Z M163.1,163.1 C128.8,197.4 73.1001,197.4 38.8001,163.1 C4.5001,128.8 4.5001,73.1001 38.8001,38.8001 C73.1001,4.5001 128.8,4.5001 163.1,38.8001 C197.5,73.2001 197.5,128.8 163.1,163.1 Z" id="Shape" fill="#fff"></path>
+    <path d="M163.1,38.9 C128.8,4.60005 73.1002,4.60005 38.8002,38.9 C4.50019,73.2 4.50019,128.9 38.8002,163.2 C73.1002,197.5 128.8,197.5 163.1,163.2 C197.5,128.8 197.5,73.2 163.1,38.9 Z" id="Shape" fill="#000"></path>
+    <g id="T" transform="translate(25, 25) scale(5,5)">
+        <path d="M18.4804688,24 C19.203125,24 19.7182617,23.8608398 20.0258789,23.5825195 C20.3334961,23.3041992 20.4873047,22.9453125 20.4873047,22.5058594 C20.4873047,22.0566406 20.3334961,21.6928711 20.0258789,21.4145508 C19.7182617,21.1362305 19.203125,20.9970703 18.4804688,20.9970703 L18.4804688,20.9970703 L16.4589844,20.9970703 L16.4589844,9.24902344 L19.7548828,9.24902344 L19.7548828,12.0908203 C19.7548828,12.8134766 19.894043,13.3286133 20.1723633,13.6362305 C20.4506836,13.9438477 20.8095703,14.0976562 21.2490234,14.0976562 C21.6982422,14.0976562 22.0620117,13.9438477 22.340332,13.6362305 C22.6186523,13.3286133 22.7578125,12.8134766 22.7578125,12.0908203 L22.7578125,12.0908203 L22.7578125,6.24609375 L7.20117188,6.23144531 L7.20117188,12.0908203 C7.20117188,12.8134766 7.34033203,13.3286133 7.61865234,13.6362305 C7.89697266,13.9438477 8.25585938,14.0976562 8.6953125,14.0976562 C9.14453125,14.0976562 9.50830078,13.9438477 9.78662109,13.6362305 C10.0649414,13.3286133 10.2041016,12.8134766 10.2041016,12.0908203 L10.2041016,12.0908203 L10.2041016,9.24902344 L13.4560547,9.24902344 L13.4560547,20.9970703 L11.4492188,20.9970703 C10.7265625,20.9970703 10.2114258,21.1362305 9.90380859,21.4145508 C9.59619141,21.6928711 9.44238281,22.0517578 9.44238281,22.4912109 C9.44238281,22.9404297 9.59619141,23.3041992 9.90380859,23.5825195 C10.2114258,23.8608398 10.7265625,24 11.4492188,24 L11.4492188,24 L18.4804688,24 Z" id="T" fill="#fff"></path>
+    </g>
+</svg>
@@ -1,4 +1,4 @@
-<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
    <path d="M170.7 29.3001C131.7 -9.7999 68.3001 -9.7999 29.3001 29.3001C-9.7999 68.4001 -9.7999 131.7 29.3001 170.7C68.4001 209.8 131.7 209.8 170.7 170.7C209.8 131.7 209.8 68.3001 170.7 29.3001ZM162.1 162.1C127.8 196.4 72.1001 196.4 37.8001 162.1C3.5001 127.8 3.5001 72.1001 37.8001 37.8001C72.1001 3.5001 127.8 3.5001 162.1 37.8001C196.5 72.2001 196.5 127.8 162.1 162.1Z" fill="white"/>
    <path d="M162.1 37.9C127.8 3.60005 72.1002 3.60005 37.8002 37.9C3.50019 72.2 3.50019 127.9 37.8002 162.2C72.1002 196.5 127.8 196.5 162.1 162.2C196.5 127.8 196.5 72.2 162.1 37.9ZM63.0002 170.7C56.8002 167.4 51.1002 163.2 46.1002 158.4V41.7C51.3002 36.7 57.2002 32.5 63.6002 29.1L137 140.9V29.3C143.2 32.6 148.9 36.8 153.9 41.6V158.3C148.7 163.3 142.8 167.5 136.4 170.9L63.0002 59.1V170.7Z" fill="#070B15"/>
    <path d="M154 158.3V41.7C148.9 36.9 143.2 32.7 137.1 29.4V140.9L63.5 29C57.1 32.4 51.2 36.6 46 41.6V158.3C51.1 163.1 56.8 167.3 62.9 170.6V59.1L136.5 171C142.9 167.6 148.8 163.3 154 158.3Z" fill="white"/>
@@ -0,0 +1,7 @@
+<svg viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M171.7,30.3001 C132.7,-8.7999 69.3001,-8.7999 30.3001,30.3001 C-8.7999,69.4001 -8.7999,132.7 30.3001,171.7 C69.4001,210.8 132.7,210.8 171.7,171.7 C210.8,132.7 210.8,69.3001 171.7,30.3001 Z M163.1,163.1 C128.8,197.4 73.1001,197.4 38.8001,163.1 C4.5001,128.8 4.5001,73.1001 38.8001,38.8001 C73.1001,4.5001 128.8,4.5001 163.1,38.8001 C197.5,73.2001 197.5,128.8 163.1,163.1 Z" id="Shape" fill="#141521"></path>
+    <path d="M163.1,38.9 C128.8,4.60005 73.1002,4.60005 38.8002,38.9 C4.50019,73.2 4.50019,128.9 38.8002,163.2 C73.1002,197.5 128.8,197.5 163.1,163.2 C197.5,128.8 197.5,73.2 163.1,38.9 Z" id="Shape" fill="#FFFFFF"></path>
+    <g id="T" transform="translate(25, 25) scale(5,5)">
+        <path d="M18.4804688,24 C19.203125,24 19.7182617,23.8608398 20.0258789,23.5825195 C20.3334961,23.3041992 20.4873047,22.9453125 20.4873047,22.5058594 C20.4873047,22.0566406 20.3334961,21.6928711 20.0258789,21.4145508 C19.7182617,21.1362305 19.203125,20.9970703 18.4804688,20.9970703 L18.4804688,20.9970703 L16.4589844,20.9970703 L16.4589844,9.24902344 L19.7548828,9.24902344 L19.7548828,12.0908203 C19.7548828,12.8134766 19.894043,13.3286133 20.1723633,13.6362305 C20.4506836,13.9438477 20.8095703,14.0976562 21.2490234,14.0976562 C21.6982422,14.0976562 22.0620117,13.9438477 22.340332,13.6362305 C22.6186523,13.3286133 22.7578125,12.8134766 22.7578125,12.0908203 L22.7578125,12.0908203 L22.7578125,6.24609375 L7.20117188,6.23144531 L7.20117188,12.0908203 C7.20117188,12.8134766 7.34033203,13.3286133 7.61865234,13.6362305 C7.89697266,13.9438477 8.25585938,14.0976562 8.6953125,14.0976562 C9.14453125,14.0976562 9.50830078,13.9438477 9.78662109,13.6362305 C10.0649414,13.3286133 10.2041016,12.8134766 10.2041016,12.0908203 L10.2041016,12.0908203 L10.2041016,9.24902344 L13.4560547,9.24902344 L13.4560547,20.9970703 L11.4492188,20.9970703 C10.7265625,20.9970703 10.2114258,21.1362305 9.90380859,21.4145508 C9.59619141,21.6928711 9.44238281,22.0517578 9.44238281,22.4912109 C9.44238281,22.9404297 9.59619141,23.3041992 9.90380859,23.5825195 C10.2114258,23.8608398 10.7265625,24 11.4492188,24 L11.4492188,24 L18.4804688,24 Z" id="T" fill="#000" fill-rule="nonzero"></path>
+    </g>
+</svg>
@@ -1,4 +1,4 @@
-<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
    <path d="M170.7 29.3001C131.7 -9.7999 68.3001 -9.7999 29.3001 29.3001C-9.7999 68.4001 -9.7999 131.7 29.3001 170.7C68.4001 209.8 131.7 209.8 170.7 170.7C209.8 131.7 209.8 68.3001 170.7 29.3001ZM162.1 162.1C127.8 196.4 72.1001 196.4 37.8001 162.1C3.5001 127.8 3.5001 72.1001 37.8001 37.8001C72.1001 3.5001 127.8 3.5001 162.1 37.8001C196.5 72.2001 196.5 127.8 162.1 162.1Z" fill="#141521"/>
    <path d="M162.1 37.9C127.8 3.60005 72.1002 3.60005 37.8002 37.9C3.50019 72.2 3.50019 127.9 37.8002 162.2C72.1002 196.5 127.8 196.5 162.1 162.2C196.5 127.8 196.5 72.2 162.1 37.9ZM63.0002 170.7C56.8002 167.4 51.1002 163.2 46.1002 158.4V41.7C51.3002 36.7 57.2002 32.5 63.6002 29.1L137 140.9V29.3C143.2 32.6 148.9 36.8 153.9 41.6V158.3C148.7 163.3 142.8 167.5 136.4 170.9L63.0002 59.1V170.7Z" fill="white"/>
    <path d="M154 158.3V41.7C148.9 36.9 143.2 32.7 137.1 29.4V140.9L63.5 29C57.1 32.4 51.2 36.6 46 41.6V158.3C51.1 163.1 56.8 167.3 62.9 170.6V59.1L136.5 171C142.9 167.6 148.8 163.3 154 158.3Z" fill="#141521"/>
@@ -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"]
@@ -114,12 +114,8 @@ impl<T: NymConfig> Config<T> {
        self.client.disabled_credentials_mode = disabled_credentials_mode;
    }

-    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_endpoint(&mut self, gateway_endpoint: GatewayEndpoint) {
+        self.client.gateway_endpoint = gateway_endpoint;
    }

    pub fn with_gateway_id<S: Into<String>>(&mut self, id: S) {
@@ -142,7 +138,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(2000000); // basically don't really send cover messages
+        self.debug.loop_cover_traffic_average_delay = Duration::from_millis(2_000_000); // basically don't really send cover messages
        self.debug.message_sending_average_delay = Duration::from_millis(4); // 250 "real" messages / s
    }

@@ -206,6 +202,10 @@ 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,17 +272,28 @@ impl<T: NymConfig> Default for Config<T> {
    }
 }

-#[derive(Debug, Default, Deserialize, PartialEq, Serialize)]
-struct GatewayEndpoint {
+#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)]
+pub 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.
-    gateway_id: String,
+    pub gateway_id: String,

    /// Address of the gateway owner to which the client should send messages.
-    gateway_owner: String,
+    pub gateway_owner: String,

    /// Address of the gateway listener to which all client requests should be sent.
-    gateway_listener: String,
+    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,
+        }
+    }
 }

 #[derive(Debug, Deserialize, PartialEq, Serialize)]
@@ -345,7 +356,7 @@ pub struct Client<T> {
    nym_root_directory: PathBuf,

    #[serde(skip)]
-    super_struct: PhantomData<*const T>,
+    super_struct: PhantomData<T>,
 }

 impl<T: NymConfig> Default for Client<T> {
@@ -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"]
@@ -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"] }
@@ -42,6 +42,11 @@ 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")
@@ -181,25 +186,68 @@ 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 = 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 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 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);
@@ -207,36 +255,26 @@ pub async fn execute(matches: ArgMatches<'static>) {
        config.get_base_mut().set_high_default_traffic_volume();
    }

-    // 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");
+    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."
+            );
+        };
    }

    let config_save_location = config.get_config_file_save_location();
@@ -10,4 +10,4 @@ edition = "2021"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

-nymsphinx = { path = "../../../common/nymsphinx" }
+nymsphinx = { path = "../../../common/nymsphinx" }
@@ -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"] }
@@ -20,6 +20,7 @@ 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,
@@ -35,7 +36,17 @@ use crate::socks::{
    server::SphinxSocksServer,
 };

-pub(crate) mod config;
+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 struct NymClient {
    /// Client configuration options, including, among other things, packet sending rates,
@@ -272,6 +283,20 @@ 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
@@ -46,6 +46,11 @@ 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")
@@ -88,7 +93,8 @@ pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
    app
 }

-async fn register_with_gateway(
+// TODO: make this private again after refactoring the config setup
+pub async fn register_with_gateway(
    gateway: &gateway::Node,
    our_identity: Arc<identity::KeyPair>,
 ) -> Arc<SharedKeys> {
@@ -110,7 +116,8 @@ async fn register_with_gateway(
        .expect("failed to register with the gateway!")
 }

-async fn gateway_details(
+// TODO: make this private again after refactoring the config setup
+pub async fn gateway_details(
    validator_servers: Vec<Url>,
    chosen_gateway_id: Option<&str>,
 ) -> gateway::Node {
@@ -119,6 +126,7 @@ 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()
@@ -144,7 +152,8 @@ async fn gateway_details(
    }
 }

-fn show_address(config: &Config) {
+// TODO: make this private again after refactoring the config setup
+pub fn show_address(config: &Config) {
    fn load_identity_keys(pathfinder: &ClientKeyPathfinder) -> identity::KeyPair {
        let identity_keypair: identity::KeyPair =
            pemstore::load_keypair(&pemstore::KeyPairPath::new(
@@ -180,26 +189,70 @@ 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 = 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 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 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);
@@ -207,34 +260,26 @@ pub async fn execute(matches: ArgMatches<'static>) {
        config.get_base_mut().set_high_default_traffic_volume();
    }

-    // 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");
+    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."
+            );
+        };
    }

    let config_save_location = config.get_config_file_save_location();
@@ -242,8 +287,14 @@ 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(),);
-    println!("Client configuration completed.\n\n\n");
+    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.");

    show_address(&config);
 }
@@ -5,7 +5,7 @@ use crate::client::config::Config;
 use clap::ArgMatches;
 use url::Url;

-pub(crate) mod init;
+pub mod init;
 pub(crate) mod run;
 pub(crate) mod upgrade;

@@ -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("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("validators")
+                .long("validators")
+                .help("Comma separated list of rest endpoints of the validators")
+                .takes_value(true),
+        )
        .arg(Arg::with_name("port")
            .short("p")
            .long("port")
@@ -2,4 +2,9 @@
 // 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;
@@ -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"]
@@ -58,3 +58,5 @@ nymd-client = [
    "itertools",
    "cosmwasm-std",
 ]
+generate-ts = []
+
@@ -318,6 +318,13 @@ 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,
@@ -4,11 +4,11 @@
 use crate::nymd::error::NymdError;
 use cosmrs::tendermint::abci;
 use itertools::Itertools;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};

 // it seems that currently validators just emit stringified events (which are also returned as part of deliverTx response)
 // as theirs logs
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct Log {
    #[serde(default)]
    // weird thing is that the first msg_index seems to always be undefined on the raw logs
@@ -18,16 +18,18 @@ use execute::execute;
 pub use fee::gas_price::GasPrice;
 use mixnet_contract_common::mixnode::DelegationEvent;
 use mixnet_contract_common::{
-    ContractStateParams, Delegation, ExecuteMsg, Gateway, GatewayBond, GatewayOwnershipResponse,
-    IdentityKey, Interval, LayerDistribution, MixNode, MixNodeBond, MixOwnershipResponse,
-    MixnetContractVersion, MixnodeRewardingStatusResponse, PagedDelegatorDelegationsResponse,
-    PagedGatewayResponse, PagedMixDelegationsResponse, PagedMixnodeResponse,
-    PagedRewardedSetResponse, QueryMsg, RewardedSetUpdateDetails,
+    ContractStateParams, Delegation, ExecuteMsg, Gateway, GatewayBond, GatewayBondResponse,
+    GatewayOwnershipResponse, IdentityKey, Interval, LayerDistribution, MixNode, MixNodeBond,
+    MixOwnershipResponse, MixnetContractVersion, MixnodeBondResponse,
+    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;
@@ -289,7 +291,17 @@ impl<C> NymdClient<C> {
    where
        C: CosmWasmClient + Sync,
    {
-        Ok(self.client.get_block(None).await?.block.header.time)
+        self.get_block_timestamp(None).await
+    }
+
+    pub async fn get_block_timestamp(
+        &self,
+        height: Option<u32>,
+    ) -> Result<TendermintTime, NymdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        Ok(self.client.get_block(height).await?.block.header.time)
    }

    pub async fn get_current_block_height(&self) -> Result<Height, NymdError>
@@ -370,6 +382,16 @@ 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,
@@ -416,6 +438,16 @@ 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,
@@ -585,6 +617,38 @@ 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>,
@@ -939,6 +1003,18 @@ 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,
@@ -183,6 +183,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
            .map(Into::into)
    }

+    /// Returns the total amount of delegated tokens that have vested
    async fn delegated_vesting(
        &self,
        vesting_account_address: &str,
@@ -18,12 +18,13 @@ fixed = { version = "1.1", features = ["serde"] }
 az = "1.1"
 log = "0.4.14"
 time = { version = "0.3.6", features = ["parsing", "formatting"] }
+ts-rs = "6.1.2"

 contracts-common = { path = "../contracts-common" }

 [dev-dependencies]
 time = { version = "0.3.5", features = ["serde", "macros"] }
-ts-rs = "6.1.2"

 [features]
 default = []
+generate-ts = []
@@ -8,11 +8,6 @@ use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
 use std::fmt::Display;

-#[cfg_attr(test, derive(ts_rs::TS))]
-#[cfg_attr(
-    test,
-    ts(export, export_to = "../../../nym-wallet/src/types/rust/gateway.ts")
-)]
 #[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema)]
 pub struct Gateway {
    pub host: String,
@@ -141,6 +136,12 @@ 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::*;
@@ -121,6 +121,14 @@ 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 {
@@ -4,7 +4,7 @@
 pub mod delegation;
 pub mod error;
 pub mod events;
-mod gateway;
+pub mod gateway;
 mod interval;
 pub mod mixnode;
 mod msg;
@@ -18,10 +18,13 @@ pub use delegation::{
    Delegation, PagedAllDelegationsResponse, PagedDelegatorDelegationsResponse,
    PagedMixDelegationsResponse,
 };
-pub use gateway::{Gateway, GatewayBond, GatewayOwnershipResponse, PagedGatewayResponse};
+pub use gateway::{
+    Gateway, GatewayBond, GatewayBondResponse, GatewayOwnershipResponse, PagedGatewayResponse,
+};
 pub use interval::Interval;
 pub use mixnode::{
-    Layer, MixNode, MixNodeBond, MixOwnershipResponse, PagedMixnodeResponse, RewardedSetNodeStatus,
+    Layer, MixNode, MixNodeBond, MixOwnershipResponse, MixnodeBondResponse, PagedMixnodeResponse,
+    RewardedSetNodeStatus,
 };
 pub use msg::*;
 pub use types::*;
@@ -14,13 +14,10 @@ use serde_repr::{Deserialize_repr, Serialize_repr};
 use std::cmp::Ordering;
 use std::fmt::Display;

-#[cfg_attr(test, derive(ts_rs::TS))]
+#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
-    test,
-    ts(
-        export,
-        export_to = "../../../nym-wallet/src/types/rust/rewardedsetnodestatus.ts"
-    )
+    feature = "generate-ts",
+    ts(export_to = "ts-packages/types/src/types/rust/RewardedSetNodeStatus.ts")
 )]
 #[derive(Clone, Copy, Debug, Deserialize, Serialize, JsonSchema, PartialEq)]
 pub enum RewardedSetNodeStatus {
@@ -109,11 +106,6 @@ impl PendingUndelegate {
    }
 }

-#[cfg_attr(test, derive(ts_rs::TS))]
-#[cfg_attr(
-    test,
-    ts(export, export_to = "../../../nym-wallet/src/types/rust/mixnode.ts")
-)]
 #[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema)]
 pub struct MixNode {
    pub host: String,
@@ -228,9 +220,9 @@ impl DelegatorRewardParams {

        // change all values into their fixed representations
        let delegation_amount = U128::from_num(delegation_amount.u128());
-        let circulating_supply = U128::from_num(self.reward_params.circulating_supply());
+        let staking_supply = U128::from_num(self.reward_params.staking_supply());

-        let scaled_delegation_amount = delegation_amount / circulating_supply;
+        let scaled_delegation_amount = delegation_amount / staking_supply;

        // Div by zero checked above
        let delegator_reward =
@@ -400,22 +392,21 @@ impl MixNodeBond {
        self.total_delegation.clone()
    }

-    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)
+    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)
    }

    // 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_circulating_supply(&self, circulating_supply: u128) -> U128 {
-        U128::from_num(self.pledge_amount().amount.u128()) / U128::from_num(circulating_supply)
+    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 total_bond_to_circulating_supply(&self, circulating_supply: u128) -> U128 {
+    pub fn total_bond_to_staking_supply(&self, staking_supply: u128) -> U128 {
        U128::from_num(self.pledge_amount().amount.u128() + self.total_delegation().amount.u128())
-            / U128::from_num(circulating_supply)
+            / U128::from_num(staking_supply)
    }

    pub fn lambda_ticked(&self, params: &RewardParams) -> U128 {
@@ -425,7 +416,7 @@ impl MixNodeBond {

    pub fn lambda(&self, params: &RewardParams) -> U128 {
        // Ratio of a bond to the token circulating supply
-        self.pledge_to_circulating_supply(params.circulating_supply())
+        self.pledge_to_staking_supply(params.staking_supply())
    }

    pub fn sigma_ticked(&self, params: &RewardParams) -> U128 {
@@ -435,11 +426,12 @@ impl MixNodeBond {

    pub fn sigma(&self, params: &RewardParams) -> U128 {
        // Ratio of a delegation to the the token circulating supply
-        self.total_bond_to_circulating_supply(params.circulating_supply())
+        self.total_bond_to_staking_supply(params.staking_supply())
    }

    pub fn estimate_reward(
        &self,
+        base_operator_cost: u64,
        params: &RewardParams,
    ) -> Result<RewardEstimate, MixnetContractError> {
        let total_node_reward = self
@@ -448,15 +440,15 @@ impl MixNodeBond {
            .checked_to_num::<u128>()
            .unwrap_or_default();
        let node_profit = self
-            .node_profit(params)
+            .node_profit(params, base_operator_cost)
            .checked_to_num::<u128>()
            .unwrap_or_default();
        let operator_cost = params
            .node
-            .operator_cost()
+            .operator_cost(base_operator_cost)
            .checked_to_num::<u128>()
            .unwrap_or_default();
-        let operator_reward = self.operator_reward(params);
+        let operator_reward = self.operator_reward(params, base_operator_cost);
        // Total reward has to be the sum of operator and delegator rewards
        let delegators_reward = node_profit.saturating_sub(operator_reward);

@@ -488,21 +480,25 @@ impl MixNodeBond {
        }
    }

-    pub fn node_profit(&self, params: &RewardParams) -> U128 {
+    pub fn node_profit(&self, params: &RewardParams, base_operator_cost: u64) -> U128 {
        self.reward(params)
            .reward()
-            .saturating_sub(params.node.operator_cost())
+            .saturating_sub(params.node.operator_cost(base_operator_cost))
    }

-    pub fn operator_reward(&self, params: &RewardParams) -> u128 {
+    pub fn operator_reward(&self, params: &RewardParams, base_operator_cost: u64) -> u128 {
        let reward = self.reward(params);
-        if reward.sigma == 0 {
+        if reward.sigma == 0u128 {
            return 0;
        }

-        let profit = reward.reward.saturating_sub(params.node.operator_cost());
+        let profit = reward
+            .reward
+            .saturating_sub(params.node.operator_cost(base_operator_cost));

-        let operator_base_reward = reward.reward.min(params.node.operator_cost());
+        let operator_base_reward = reward
+            .reward
+            .min(params.node.operator_cost(base_operator_cost));
        // Div by zero checked above
        let operator_reward = (self.profit_margin()
            + (ONE - self.profit_margin()) * reward.lambda / reward.sigma)
@@ -523,19 +519,23 @@ impl MixNodeBond {
    }

    pub fn sigma_ratio(&self, params: &RewardParams) -> U128 {
-        if self.total_bond_to_circulating_supply(params.circulating_supply()) < params.one_over_k()
-        {
-            self.total_bond_to_circulating_supply(params.circulating_supply())
+        if self.total_bond_to_staking_supply(params.staking_supply()) < params.one_over_k() {
+            self.total_bond_to_staking_supply(params.staking_supply())
        } else {
            params.one_over_k()
        }
    }

-    pub fn reward_delegation(&self, delegation_amount: Uint128, params: &RewardParams) -> u128 {
+    pub fn reward_delegation(
+        &self,
+        delegation_amount: Uint128,
+        params: &RewardParams,
+        base_operator_cost: u64,
+    ) -> u128 {
        let reward_params = DelegatorRewardParams::new(
            self.sigma(params),
            self.profit_margin(),
-            self.node_profit(params),
+            self.node_profit(params, base_operator_cost),
            params.to_owned(),
        );
        reward_params.determine_delegation_reward(delegation_amount)
@@ -645,6 +645,12 @@ 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::*;
@@ -115,6 +115,7 @@ pub enum ExecuteMsg {
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
+    GetCurrentOperatorCost {},
    GetRewardingValidatorAddress {},
    GetAllDelegationKeys {},
    DebugGetAllDelegationValues {},
@@ -133,6 +134,12 @@ pub enum QueryMsg {
    OwnsGateway {
        address: String,
    },
+    GetMixnodeBond {
+        identity: IdentityKey,
+    },
+    GetGatewayBond {
+        identity: IdentityKey,
+    },
    StateParams {},
    // gets all [paged] delegations associated with particular mixnode
    GetMixnodeDelegations {
@@ -159,6 +166,7 @@ pub enum QueryMsg {
    LayerDistribution {},
    GetRewardPool {},
    GetCirculatingSupply {},
+    GetStakingSupply {},
    GetIntervalRewardPercent {},
    GetSybilResistancePercent {},
    GetActiveSetWorkFactor {},
@@ -1,7 +1,6 @@
 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};

@@ -41,19 +40,23 @@ impl NodeEpochRewards {
        self.result.reward()
    }

-    pub fn operator_cost(&self) -> U128 {
-        self.params.operator_cost()
+    pub fn operator_cost(&self, base_operator_cost: u64) -> U128 {
+        self.params.operator_cost(base_operator_cost)
    }

-    pub fn node_profit(&self) -> U128 {
+    pub fn node_profit(&self, base_operator_cost: u64) -> 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())
+        reward.saturating_sub(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());
+    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));
        let div_by_zero_check = if let Some(value) = self.lambda().checked_div(self.sigma()) {
            value
        } else {
@@ -74,13 +77,14 @@ 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 circulating_supply = U128::from_num(epoch_reward_params.circulating_supply());
+        let staking_supply = U128::from_num(epoch_reward_params.staking_supply());

-        let scaled_delegation_amount = delegation_amount / circulating_supply;
+        let scaled_delegation_amount = delegation_amount / staking_supply;

        let check_div_by_zero =
            if let Some(value) = scaled_delegation_amount.checked_div(self.sigma()) {
@@ -89,7 +93,8 @@ impl NodeEpochRewards {
                return Err(MixnetContractError::DivisionByZero);
            };

-        let delegator_reward = (ONE - profit_margin) * check_div_by_zero * self.node_profit();
+        let delegator_reward =
+            (ONE - profit_margin) * check_div_by_zero * self.node_profit(base_operator_cost);

        let reward = delegator_reward.max(U128::ZERO);
        if let Some(int_reward) = reward.checked_cast() {
@@ -105,7 +110,8 @@ pub struct EpochRewardParams {
    epoch_reward_pool: Uint128,
    rewarded_set_size: Uint128,
    active_set_size: Uint128,
-    circulating_supply: Uint128,
+    #[serde(alias = "circulating_supply")]
+    staking_supply: Uint128,
    sybil_resistance_percent: u8,
    active_set_work_factor: u8,
 }
@@ -115,7 +121,7 @@ impl EpochRewardParams {
        epoch_reward_pool: u128,
        rewarded_set_size: u128,
        active_set_size: u128,
-        circulating_supply: u128,
+        staking_supply: u128,
        sybil_resistance_percent: u8,
        active_set_work_factor: u8,
    ) -> EpochRewardParams {
@@ -123,7 +129,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),
-            circulating_supply: Uint128::new(circulating_supply),
+            staking_supply: Uint128::new(staking_supply),
            sybil_resistance_percent,
            active_set_work_factor,
        }
@@ -136,7 +142,7 @@ impl EpochRewardParams {
    pub fn new_empty() -> Self {
        EpochRewardParams {
            epoch_reward_pool: Uint128::new(0),
-            circulating_supply: Uint128::new(0),
+            staking_supply: Uint128::new(0),
            sybil_resistance_percent: 0,
            rewarded_set_size: Uint128::new(0),
            active_set_size: Uint128::new(0),
@@ -152,13 +158,21 @@ impl EpochRewardParams {
        self.active_set_size.u128()
    }

-    pub fn circulating_supply(&self) -> u128 {
-        self.circulating_supply.u128()
+    pub fn staking_supply(&self) -> u128 {
+        self.staking_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)]
@@ -177,8 +191,8 @@ impl NodeRewardParams {
        }
    }

-    pub fn operator_cost(&self) -> U128 {
-        self.performance() * U128::from_num(DEFAULT_OPERATOR_INTERVAL_COST)
+    pub fn operator_cost(&self, base_operator_cost: u64) -> U128 {
+        self.performance() * U128::from_num(base_operator_cost)
    }

    pub fn uptime(&self) -> Uint128 {
@@ -252,8 +266,8 @@ impl RewardParams {
        self.epoch.rewarded_set_size.u128()
    }

-    pub fn circulating_supply(&self) -> u128 {
-        self.epoch.circulating_supply.u128()
+    pub fn staking_supply(&self) -> u128 {
+        self.epoch.staking_supply.u128()
    }

    pub fn reward_blockstamp(&self) -> u64 {
@@ -43,6 +43,7 @@ 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 {
@@ -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"] }
@@ -12,6 +12,7 @@ serde = { version = "1.0", features = ["derive"] }
 schemars = "0.8"
 cw-storage-plus = "0.13.4"
 config = { path = "../../config" }
-
-[dev-dependencies]
 ts-rs = "6.1.2"
+
+[features]
+generate-ts = []
@@ -14,10 +14,10 @@ pub fn one_ucoin() -> Coin {
    Coin::new(1, DENOM)
 }

-#[cfg_attr(test, derive(ts_rs::TS))]
+#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
-    test,
-    ts(export, export_to = "../../../nym-wallet/src/types/rust/period.ts")
+    feature = "generate-ts",
+    ts(export_to = "ts-packages/types/src/types/rust/Period.ts")
 )]
 #[derive(Debug, PartialEq, Serialize, Deserialize, Clone, JsonSchema)]
 pub enum Period {
@@ -1,4 +1,4 @@
-use cosmwasm_std::{Coin, Timestamp};
+use cosmwasm_std::{Coin, Timestamp, Uint128};
 use mixnet_contract_common::{Gateway, IdentityKey, MixNode};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -113,6 +113,9 @@ pub enum ExecuteMsg {
    UpdateStakingAddress {
        to_address: Option<String>,
    },
+    UpdateLockedPledgeCap {
+        amount: Uint128,
+    },
 }

 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
@@ -163,4 +166,5 @@ pub enum QueryMsg {
    GetCurrentVestingPeriod {
        address: String,
    },
+    GetLockedPledgeCap {},
 }
@@ -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"] }
@@ -21,4 +21,4 @@ validator-client = { path = "../client-libs/validator-client" }
 rand = "0.7.3"

 [features]
-coconut = ["cosmrs"]
+coconut = ["cosmrs"]
@@ -38,4 +38,4 @@ criterion = "0.3"

 [[bench]]
 name = "benchmarks"
-harness = false
+harness = false
@@ -458,6 +458,7 @@ 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);
@@ -487,6 +488,7 @@ 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);
@@ -557,6 +559,7 @@ 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);
@@ -581,6 +584,7 @@ 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);
@@ -623,6 +627,7 @@ mod tests {
    }

    #[test]
+    #[ignore] // expensive test
    fn ciphertext_integrity_check_passes_for_valid_data() {
        let params = setup();

@@ -640,6 +645,7 @@ mod tests {
    }

    #[test]
+    #[ignore] // expensive test
    fn ciphertext_integrity_check_passes_fails_for_malformed_data() {
        let params = setup();

@@ -668,6 +674,7 @@ mod tests {
    }

    #[test]
+    #[ignore] // expensive test
    fn ciphertext_integrity_check_passes_fails_for_wrong_epoch() {
        let params = setup();

@@ -651,6 +651,7 @@ 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,
@@ -761,6 +762,7 @@ mod tests {
    }

    #[test]
+    #[ignore] // expensive test
    fn updating_to_next_epoch() {
        let params = setup();

@@ -816,6 +818,7 @@ mod tests {
    }

    #[test]
+    #[ignore] // expensive test
    fn bte_node_roundtrip() {
        let params = setup();

@@ -839,6 +842,7 @@ mod tests {
    }

    #[test]
+    #[ignore] // expensive test
    fn decryption_key_node_roundtrip() {
        let params = setup();

@@ -761,6 +761,7 @@ 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);
@@ -351,6 +351,7 @@ mod tests {
    use rand_core::SeedableRng;

    #[test]
+    #[ignore] // expensive test
    fn recovering_partial_verification_keys() {
        // START OF SETUP
        let dummy_seed = [42u8; 32];
@@ -419,6 +420,7 @@ 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);
@@ -467,6 +469,7 @@ mod tests {
    }

    #[test]
+    #[ignore] // expensive test
    fn dealing_roundtrip() {
        let dummy_seed = [1u8; 32];
        let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
@@ -9,6 +9,7 @@ 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)
@@ -66,6 +67,7 @@ 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);
@@ -161,6 +163,7 @@ 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);
@@ -26,5 +26,6 @@ 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" }
@@ -24,6 +24,8 @@ pub enum RttError {
    ConnectionWriteTimeout(String),

    UnexpectedReplySequence,
+
+    ShutdownReceived,
 }

 impl Display for RttError {
@@ -69,6 +71,9 @@ impl Display for RttError {
                f,
                "The received reply packet had an unexpected sequence number"
            ),
+            RttError::ShutdownReceived => {
+                write!(f, "Shutdown signal received")
+            }
        }
    }
 }
@@ -11,6 +11,7 @@ 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};
@@ -18,13 +19,19 @@ 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>) -> Self {
+    pub(crate) fn new(
+        address: SocketAddr,
+        identity: Arc<identity::KeyPair>,
+        shutdown: ShutdownListener,
+    ) -> Self {
        PacketListener {
            address,
            connection_handler: Arc::new(ConnectionHandler { identity }),
+            shutdown,
        }
    }
 }
@@ -34,24 +41,37 @@ 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);

-        loop {
+        let mut shutdown_listener = self.shutdown.clone();
+
+        while !shutdown_listener.is_shutdown() {
            // 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();

-            match listener.accept().await {
-                Ok((socket, remote_addr)) => {
-                    debug!("New verloc connection from {}", remote_addr);
+            tokio::select! {
+                socket = listener.accept() => {
+                    match socket {
+                        Ok((socket, remote_addr)) => {
+                            debug!("New verloc connection from {}", remote_addr);

-                    tokio::spawn(connection_handler.handle_connection(socket, 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");
                }
-                Err(err) => warn!("Failed to accept incoming connection - {:?}", err),
            }
        }
    }
@@ -67,34 +87,46 @@ impl ConnectionHandler {
        packet.construct_reply(self.identity.private_key())
    }

-    pub(crate) async fn handle_connection(self: Arc<Self>, conn: TcpStream, remote: SocketAddr) {
+    pub(crate) async fn handle_connection(
+        self: Arc<Self>,
+        conn: TcpStream,
+        remote: SocketAddr,
+        mut shutdown_listener: ShutdownListener,
+    ) {
        debug!("Starting connection handler for {:?}", remote);

        let mut framed_conn = Framed::new(conn, EchoPacketCodec);
-        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;
-                }
-            };
+        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;
+                    // 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");
+                }
            }
        }
    }
@@ -2,7 +2,6 @@
 // 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;
@@ -13,11 +12,14 @@ 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;
@@ -137,9 +139,10 @@ impl ConfigBuilder {

    pub fn build(self) -> Config {
        // panics here are fine as those are only ever constructed at the initial setup
-        if self.0.validator_api_urls.is_empty() {
-            panic!("at least one validator endpoint must be provided")
-        }
+        assert!(
+            !self.0.validator_api_urls.is_empty(),
+            "at least one validator endpoint must be provided",
+        );
        self.0
    }
 }
@@ -165,6 +168,7 @@ pub struct VerlocMeasurer {
    config: Config,
    packet_sender: Arc<PacketSender>,
    packet_listener: Arc<PacketListener>,
+    shutdown_listener: ShutdownListener,

    currently_used_api: usize,

@@ -177,7 +181,11 @@ pub struct VerlocMeasurer {
 }

 impl VerlocMeasurer {
-    pub fn new(mut config: Config, identity: Arc<identity::KeyPair>) -> Self {
+    pub fn new(
+        mut config: Config,
+        identity: Arc<identity::KeyPair>,
+        shutdown_listener: ShutdownListener,
+    ) -> Self {
        config.validator_api_urls.shuffle(&mut thread_rng());

        VerlocMeasurer {
@@ -187,11 +195,14 @@ 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(),
@@ -222,7 +233,11 @@ impl VerlocMeasurer {
        tokio::spawn(packet_listener.run())
    }

-    async fn perform_measurement(&self, nodes_to_test: Vec<TestedNode>) {
+    async fn perform_measurement(&self, nodes_to_test: Vec<TestedNode>) -> MeasurementOutcome {
+        log::trace!("Performing measurements");
+
+        let mut shutdown_listener = self.shutdown_listener.clone();
+
        for chunk in nodes_to_test.chunks(self.config.tested_nodes_batch_size) {
            let mut chunk_results = Vec::with_capacity(chunk.len());

@@ -246,33 +261,44 @@ impl VerlocMeasurer {
                .collect::<FuturesUnordered<_>>();

            // exhaust the results
-            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
+            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;
                    }
-                    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();
-        loop {
-            info!(target: "verloc", "Starting verloc measurements");
+
+        while !self.shutdown_listener.is_shutdown() {
+            info!("Starting verloc measurements");
            // TODO: should we also measure gateways?

            let all_mixes = match self.validator_client.get_cached_mixnodes().await {
@@ -322,13 +348,32 @@ impl VerlocMeasurer {
            // on start of each run remove old results
            self.results.reset_results(tested_nodes.len()).await;

-            self.perform_measurement(tested_nodes).await;
+            if let MeasurementOutcome::Shutdown = self.perform_measurement(tested_nodes).await {
+                log::trace!("Shutting down after aborting measurements");
+                break;
+            }

            // write current time to "run finished" field
            self.results.finish_measurements().await;

-            info!(target: "verloc", "Finished performing verloc measurements. The next one will happen in {:?}", self.config.testing_interval);
-            sleep(self.config.testing_interval).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");
+                }
+            }
        }
+
+        log::trace!("Verloc: Exiting");
    }
 }
+
+enum MeasurementOutcome {
+    Done,
+    Shutdown,
+}
@@ -7,10 +7,11 @@ 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;
@@ -27,6 +28,16 @@ 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
@@ -34,6 +45,7 @@ pub(crate) struct PacketSender {
    packet_timeout: Duration,
    connection_timeout: Duration,
    delay_between_packets: Duration,
+    shutdown_listener: ShutdownListener,
 }

 impl PacketSender {
@@ -43,6 +55,7 @@ impl PacketSender {
        packet_timeout: Duration,
        connection_timeout: Duration,
        delay_between_packets: Duration,
+        shutdown_listener: ShutdownListener,
    ) -> Self {
        PacketSender {
            identity,
@@ -50,6 +63,7 @@ impl PacketSender {
            packet_timeout,
            connection_timeout,
            delay_between_packets,
+            shutdown_listener,
        }
    }

@@ -69,6 +83,8 @@ 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),
@@ -98,35 +114,40 @@ 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
-            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(_)) => {}
+            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);
+                },
            }

            // there's absolutely no need to put a codec on ReplyPackets as we know exactly
@@ -147,21 +168,28 @@ impl PacketSender {
                ReplyPacket::try_from_bytes(&buf, &tested_node.identity)
            };

-            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(),
-                        ));
+            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(),
+                            ));
+                        }
                    }
-                };
+                },
+                _ = 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...
@@ -64,6 +64,10 @@ 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,6 +105,7 @@ pub struct NetworkDetails {
    mixnet_contract_address: String,
    vesting_contract_address: String,
    bandwidth_claim_contract_address: String,
+    statistics_service_url: String,
    validators: Vec<ValidatorDetails>,
 }

@@ -112,6 +117,7 @@ impl From<&DefaultNetworkDetails<'_>> for NetworkDetails {
            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(),
        }
    }
@@ -54,6 +54,7 @@ pub struct DefaultNetworkDetails<'a> {
    coconut_bandwidth_contract_address: &'a str,
    multisig_contract_address: &'a str,
    rewarding_validator_address: &'a str,
+    statistics_service_url: &'a str,
    validators: Vec<ValidatorDetails>,
 }

@@ -67,6 +68,7 @@ static MAINNET_DEFAULTS: Lazy<DefaultNetworkDetails<'static>> =
        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(),
    });

@@ -80,6 +82,7 @@ static SANDBOX_DEFAULTS: Lazy<DefaultNetworkDetails<'static>> =
        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(),
    });

@@ -92,6 +95,7 @@ static QA_DEFAULTS: Lazy<DefaultNetworkDetails<'static>> = Lazy::new(|| DefaultN
    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(),
 });

@@ -132,6 +136,13 @@ 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()
@@ -199,7 +210,8 @@ 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 = 55_556; // 40$/1hr at 1 Nym == 1$
+// pub const DEFAULT_OPERATOR_INTERVAL_COST: u64 = 9259; // 40$/1hr/6 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;
@@ -22,6 +22,7 @@ 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/",
@@ -22,6 +22,7 @@ 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",
@@ -20,6 +20,7 @@ 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",
@@ -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"
@@ -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" }
@@ -8,4 +8,4 @@ edition = "2021"

 [dependencies]
 crypto = { path = "../../crypto", features = ["hashing", "symmetric"] }
-nymsphinx-types = { path = "../types" }
+nymsphinx-types = { path = "../types" }
@@ -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"
@@ -32,6 +32,26 @@ impl Message {
    const REQUEST_FLAG: u8 = 0;
    const RESPONSE_FLAG: u8 = 1;

+    pub fn conn_id(&self) -> u64 {
+        match self {
+            Message::Request(req) => match req {
+                Request::Connect(c) => c.conn_id,
+                Request::Send(conn_id, _, _) => *conn_id,
+            },
+            Message::Response(resp) => resp.connection_id,
+        }
+    }
+
+    pub fn size(&self) -> usize {
+        match self {
+            Message::Request(req) => match req {
+                Request::Connect(_) => 0,
+                Request::Send(_, data, _) => data.len(),
+            },
+            Message::Response(resp) => resp.data.len(),
+        }
+    }
+
    pub fn try_from_bytes(b: &[u8]) -> Result<Message, MessageError> {
        if b.is_empty() {
            return Err(MessageError::NoData);
@@ -0,0 +1,21 @@
+# Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+# SPDX-License-Identifier: Apache-2.0
+
+[package]
+name = "statistics-common"
+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"] }
+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" }
@@ -0,0 +1,56 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::error::StatsError;
+use crate::StatsMessage;
+
+pub const DEFAULT_STATISTICS_SERVICE_ADDRESS: &str = "127.0.0.1";
+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://{}:{}{}/{}",
+            DEFAULT_STATISTICS_SERVICE_ADDRESS,
+            DEFAULT_STATISTICS_SERVICE_PORT,
+            STATISTICS_SERVICE_VERSION,
+            STATISTICS_SERVICE_API_STATISTICS
+        ))
+        .unwrap(),
+    );
+    let data = format!(
+        "{} {} {:?}\n\
+        Content-Type: application/json\n\
+        Content-Length: {}\n\n\
+        {}\n",
+        req.method().as_str(),
+        req.url().as_str(),
+        req.version(),
+        json_msg.len(),
+        json_msg
+    );
+
+    Ok(data.into_bytes())
+}
@@ -0,0 +1,57 @@
+// 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();
+        }
+    }
+}
@@ -0,0 +1,13 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub enum StatsError {
+    #[error("Serde JSON error: {0}")]
+    SerdeJsonError(#[from] serde_json::Error),
+
+    #[error("Reqwest error: {0}")]
+    ReqwestError(#[from] reqwest::Error),
+}
@@ -0,0 +1,61 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+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 interval_seconds: u32,
+    pub timestamp: String,
+}
+
+impl StatsMessage {
+    pub fn to_json(&self) -> Result<String, StatsError> {
+        Ok(serde_json::to_string(self)?)
+    }
+
+    pub fn from_json(s: &str) -> Result<Self, StatsError> {
+        Ok(serde_json::from_str(s)?)
+    }
+}
+
+#[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,
+    pub request_bytes: u32,
+    pub response_bytes: u32,
+}
+
+impl StatsServiceData {
+    pub fn new(requested_service: String, request_bytes: u32, response_bytes: u32) -> Self {
+        StatsServiceData {
+            requested_service,
+            request_bytes,
+            response_bytes,
+        }
+    }
+}
@@ -0,0 +1,40 @@
+[package]
+name = "nym-types"
+version = "1.0.0"
+description = "Nym common types"
+authors = ["Nym Technologies SA"]
+edition = "2021"
+rust-version = "1.58"
+
+[dependencies]
+eyre = "0.6.5"
+log = "0.4"
+itertools = "0.10"
+reqwest = "0.11.9"
+schemars = "0.8"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+strum = { version = "0.23", features = ["derive"] }
+thiserror = "1.0"
+url = "2.2"
+ts-rs = "6.1.2"
+
+cosmwasm-std = "1.0.0-beta8"
+cosmrs = "0.7.0"
+
+validator-client = { path = "../../common/client-libs/validator-client", features = [
+    "nymd-client",
+] }
+mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract" }
+vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract" }
+config = { path = "../../common/config" }
+coconut-interface = { path = "../../common/coconut-interface" }
+# Used for Type conversion, can be extracted but its a lot of work
+vesting-contract = { path = "../../contracts/vesting" }
+
+[dev-dependencies]
+tempfile = "3.3.0"
+
+[features]
+default = []
+generate-ts = []
@@ -0,0 +1,58 @@
+use crate::currency::{CurrencyDenom, MajorCurrencyAmount};
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
+#[cfg_attr(
+    feature = "generate-ts",
+    ts(export_to = "ts-packages/types/src/types/rust/Account.ts")
+)]
+#[derive(Serialize, Deserialize, JsonSchema)]
+pub struct Account {
+    pub contract_address: String,
+    pub client_address: String,
+    pub denom: CurrencyDenom,
+}
+
+impl Account {
+    pub fn new(contract_address: String, client_address: String, denom: CurrencyDenom) -> Self {
+        Account {
+            contract_address,
+            client_address,
+            denom,
+        }
+    }
+}
+
+#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
+#[cfg_attr(
+    feature = "generate-ts",
+    ts(export_to = "ts-packages/types/src/types/rust/AccountWithMnemonic.ts")
+)]
+#[derive(Serialize, Deserialize)]
+pub struct AccountWithMnemonic {
+    pub account: Account,
+    pub mnemonic: String,
+}
+
+#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
+#[cfg_attr(
+    feature = "generate-ts",
+    ts(export_to = "ts-packages/types/src/types/rust/AccountEntry.ts")
+)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct AccountEntry {
+    pub id: String,
+    pub address: String,
+}
+
+#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
+#[cfg_attr(
+    feature = "generate-ts",
+    ts(export_to = "ts-packages/types/src/types/rust/Balance.ts")
+)]
+#[derive(Serialize, Deserialize)]
+pub struct Balance {
+    pub amount: MajorCurrencyAmount,
+    pub printable_balance: String,
+}
--- a/Show More
+++ b/Show More