Add gateway id to stats data

* github: clippy review annotations for the workspace too

* client-libs: remove unused imports

* client-libs: tweak use dep

* client-libs: try to regroup cfg conditional use items

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

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

.github/workflows/build.yml

@@ -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:
@@ -51,7 +58,7 @@ jobs:
         name: Clippy checks
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-features
+          args: --workspace --all-features
 
       - name: Run clippy
         uses: actions-rs/cargo@v1

.github/workflows/connect.yml

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

.github/workflows/contracts-build.yml

@@ -0,0 +1,38 @@
+name: Build release of Nym smart contracts
+on:
+  workflow_dispatch:
+
+defaults:
+  run:
+    working-directory: contracts
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install Rust stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: wasm32-unknown-unknown
+          override: true
+          components: rustfmt, clippy
+
+      - name: Build release contracts
+        run: RUSTFLAGS='-C link-arg=-s' cargo build --release --target wasm32-unknown-unknown
+
+      - name: Upload Mixnet Contract Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: mixnet_contract.wasm
+          path: contracts/target/wasm32-unknown-unknown/release/mixnet_contract.wasm
+          retention-days: 5
+
+      - name: Upload Vesting Contract Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: vesting_contract.wasm
+          path: contracts/target/wasm32-unknown-unknown/release/vesting_contract.wasm
+          retention-days: 5

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

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

.github/workflows/network-explorer.yml

@@ -17,9 +17,9 @@ jobs:
     - name: Install rsync
       run: sudo apt-get install rsync
     - uses: rlespinasse/github-slug-action@v3.x
-    - uses: actions/setup-node@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

.github/workflows/nightly_build.yml

@@ -2,7 +2,7 @@ name: Nightly builds
 
 on:
   schedule:
-    - cron: '14 4 * * *'
+    - cron: '14 1 * * *'
 jobs:
   matrix_prep:
     runs-on: ubuntu-latest
@@ -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
 

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

@@ -0,0 +1,96 @@
+name: Publish Nym Connect (MacOS)
+on:
+  workflow_dispatch:
+  release:
+    types: [created]
+
+defaults:
+  run:
+    working-directory: nym-connect
+
+jobs:
+  publish-tauri:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [macos-latest]
+
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Check the release tag starts with `nym-connect-`
+        if: startsWith(github.ref, 'refs/tags/nym-connect-') == false && github.event_name != 'workflow_dispatch'
+        uses: actions/github-script@v3
+        with:
+          script: |
+            core.setFailed('Release tag did not start with nym-connect-...')
+
+      - name: Node v16
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+      - name: Install Rust stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - name: Install the Apple developer certificate for code signing
+        env:
+          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+        run: |
+          # create variables
+          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+
+          # import certificate and provisioning profile from secrets
+          echo -n "$APPLE_CERTIFICATE" | base64 --decode --output $CERTIFICATE_PATH
+
+          # create temporary keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+
+          # import certificate to keychain
+          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 }}
+          ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_IDENTITY_ID }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+        run: yarn && yarn build
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: nym-connect_1.0.0_x64.dmg
+          path: nym-connect/target/release/bundle/dmg/nym-connect_1.0.0_x64.dmg
+          retention-days: 30
+
+      - 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-connect/target/release/bundle/dmg/*.dmg
+            nym-connect/target/release/bundle/macos/*.app.tar.gz*

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

@@ -0,0 +1,68 @@
+name: Publish Nym Connect (Ubuntu)
+on:
+  workflow_dispatch:
+  release:
+    types: [created]
+
+defaults:
+  run:
+    working-directory: nym-connect
+
+jobs:
+  publish-tauri:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [ubuntu-latest]
+
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Tauri dependencies
+        run: >
+          sudo apt-get update &&
+          sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
+      - name: Check the release tag starts with `nym-connect-`
+        if: startsWith(github.ref, 'refs/tags/nym-connect-') == false && github.event_name != 'workflow_dispatch'
+        uses: actions/github-script@v3
+        with:
+          script: |
+            core.setFailed('Release tag did not start with nym-connect-...')
+
+      - name: Node v16
+        uses: actions/setup-node@v3
+        with:
+          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:
+          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: nym-connect.AppImage.tar.gz
+          path: nym-connect/target/release/bundle/appimage/nym-connect_1.0.0_amd64.AppImage
+          retention-days: 30
+
+      - name: Upload to release based on tag name
+        uses: softprops/action-gh-release@v1
+        if: github.event_name == 'release'
+        with:
+          files: |
+            nym-connect/target/release/bundle/appimage/*.AppImage
+            nym-connect/target/release/bundle/appimage/*.AppImage.tar.gz*

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

@@ -0,0 +1,90 @@
+name: Publish Nym Connect (Windows 10)
+on:
+  workflow_dispatch:
+  release:
+    types: [created]
+
+defaults:
+  run:
+    working-directory: nym-connect
+
+jobs:
+  publish-tauri:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [windows10]
+
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - name: Clean up first
+        continue-on-error: true
+        working-directory: .
+        run: |
+          cd ..
+          del /s /q /A:H nym
+          rmdir /s /q nym
+
+      - uses: actions/checkout@v3
+
+      - name: Check the release tag starts with `nym-connect-`
+        if: startsWith(github.ref, 'refs/tags/nym-connect-') == false && github.event_name != 'workflow_dispatch'
+        uses: actions/github-script@v3
+        with:
+          script: |
+            core.setFailed('Release tag did not start with nym-connect-...')
+
+      - name: Import signing certificate
+        env:
+          WINDOWS_CERTIFICATE: ${{ secrets.WINDOWS_CERTIFICATE }}
+          WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
+        run: |
+          New-Item -ItemType directory -Path certificate
+          Set-Content -Path certificate/tempCert.txt -Value $env:WINDOWS_CERTIFICATE
+          certutil -decode certificate/tempCert.txt certificate/certificate.pfx
+          Remove-Item -path certificate -include tempCert.txt
+          Import-PfxCertificate -FilePath certificate/certificate.pfx -CertStoreLocation Cert:\CurrentUser\My -Password (ConvertTo-SecureString -String $env:WINDOWS_CERTIFICATE_PASSWORD -Force -AsPlainText)
+
+      - name: Node v16
+        uses: actions/setup-node@v3
+        with:
+          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
+
+      - name: Build and sign it
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ENABLE_CODE_SIGNING: ${{ secrets.WINDOWS_CERTIFICATE }}
+          WINDOWS_CERTIFICATE: ${{ secrets.WINDOWS_CERTIFICATE }}
+          WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
+          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+        run: yarn build
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: nym-connect_1.0.0_x64_en-US.msi
+          path: nym-connect/target/release/bundle/msi/nym-connect_1.0.0_x64_en-US.msi
+          retention-days: 30
+
+      - name: Upload to release based on tag name
+        uses: softprops/action-gh-release@v1
+        if: github.event_name == 'release'
+        with:
+          files: |
+            nym-connect/target/release/bundle/msi/*.msi
+            nym-connect/target/release/bundle/msi/*.msi.zip*

.github/workflows/nym-connect.yml

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

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

@@ -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 }}
@@ -66,17 +73,24 @@ jobs:
           APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-          ADMIN_ADDRESS: ${{ secrets.WALLET_ADMIN_ADDRESS }}
         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*

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

@@ -30,21 +30,26 @@ 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:
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-          ADMIN_ADDRESS: ${{ secrets.WALLET_ADMIN_ADDRESS }}
       - name: Upload to release based on tag name
         uses: softprops/action-gh-release@v1
         with:

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

@@ -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
 
@@ -65,7 +71,6 @@ jobs:
           WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-          ADMIN_ADDRESS: ${{ secrets.WALLET_ADMIN_ADDRESS }}
         run: yarn build
 
       - name: Upload to release based on tag name

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

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

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

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

.github/workflows/nym_wallet.yml

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

CHANGELOG.md

@@ -2,25 +2,78 @@
 
 Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+
 ## [Unreleased]
 
 ### Added
 
-- nym-connect: initial proof-of-concept of a UI around the socks5 client was 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.
+- explorer-api: add apy values to `mix_nodes` 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`.
-- mixnet-contrat: Added staking_supply field to ContractStateParams.
 - 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])
+- validator-api: add `uptime`, `estimated_operator_apy`, `estimated_delegators_apy` to `/mixnodes/detailed` endpoint ([#1393])
 - network-statistics: a new mixnet service that aggregates and exposes anonymized data about mixnet services ([#1328])
+- wallet: when simulating gas costs, an automatic adjustment is being used ([#1388]).
+- mixnode: Added basic mixnode hardware reporting to the HTTP API ([#1308]).
+- validator-api: endpoint, in coconut mode, for returning the validator-api cosmos address ([#1404]).
+
+### Fixed
+
+- mixnode, gateway: attempting to determine reconnection backoff to persistently failing mixnode could result in a crash ([#1260])
+- mixnode: the mixnode learned how to shutdown gracefully
+- native & socks5 clients: fail early when clients try to re-init with a different gateway, which is not supported yet ([#1322])
+- native & socks5 clients: rerun init will now reuse previous gateway configuration instead of failing ([#1353])
+- native & socks5 clients: deduplicate big chunks of init logic
+- validator: fixed local docker-compose setup to work on Apple M1 ([#1329])
+
+### Changed
+
+- nym-connect: reuse config id instead of creating a new id on each connection.
+- validator-client: created internal `Coin` type that replaces coins from `cosmrs` and `cosmwasm` for API entrypoints [[#1295]]
+- all: updated all `cosmwasm`-related dependencies to `1.0.0` and `cw-storage-plus` to `0.13.4` [[#1318]]
+- all: updated `rocket` to `0.5.0-rc.2`.
+- network-requester: allow to voluntarily store and send statistical data about the number of bytes the proxied server serves ([#1328])
+- gateway: allow to voluntarily send statistical data about the number of active inboxes served by a gateway ([#1376])
+
+[#1249]: https://github.com/nymtech/nym/pull/1249
+[#1256]: https://github.com/nymtech/nym/pull/1256
+[#1260]: https://github.com/nymtech/nym/pull/1260
+[#1261]: https://github.com/nymtech/nym/pull/1261
+[#1267]: https://github.com/nymtech/nym/pull/1267
+[#1278]: https://github.com/nymtech/nym/pull/1278
+[#1295]: https://github.com/nymtech/nym/pull/1295
+[#1302]: https://github.com/nymtech/nym/pull/1302
+[#1308]: https://github.com/nymtech/nym/pull/1308
+[#1318]: https://github.com/nymtech/nym/pull/1318
+[#1322]: https://github.com/nymtech/nym/pull/1322
+[#1324]: https://github.com/nymtech/nym/pull/1324
+[#1328]: https://github.com/nymtech/nym/pull/1328
+[#1329]: https://github.com/nymtech/nym/pull/1329
+[#1353]: https://github.com/nymtech/nym/pull/1353
+[#1376]: https://github.com/nymtech/nym/pull/1376
+[#1388]: https://github.com/nymtech/nym/pull/1388
+[#1393]: https://github.com/nymtech/nym/pull/1393
+[#1404]: https://github.com/nymtech/nym/pull/1404
+
+## [nym-contracts-v1.0.1](https://github.com/nymtech/nym/tree/nym-contracts-v1.0.1) (2022-06-22)
+
+### Added
+
+- mixnet-contract: Added ClaimOperatorReward and ClaimDelegatorReward messages ([#1292])
+- mixnet-contract: Replace all naked `-` with `saturating_sub`.
+- mixnet-contract: Added staking_supply field to ContractStateParams.
+- mixnet-contract: Added a query to get MixnodeBond by identity key ([#1369]).
+- mixnet-contract: Added a query to get GatewayBond by identity key ([#1369]).
+- vesting-contract: Added ClaimOperatorReward and ClaimDelegatorReward messages ([#1292])
+- vesting-contract: Added limit to the amount of tokens one can pledge ([#1331])
 
 ### Fixed
 
@@ -29,37 +82,26 @@ 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])
-- 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.
+- mixnet-contract: Using correct staking supply when distributing rewards. ([#1373])
 - vesting-contract: replaced `checked_sub` with `saturating_sub` to fix the underflow in `get_vesting_tokens` ([#1275])
-- native & socks5 clients: fail early when clients try to re-init with a different gateway, which is not supported yet ([#1322])
-- validator: fixed local docker-compose setup to work on Apple M1 ([#1329])
 
-### Changed
 
-- validator-client: created internal `Coin` type that replaces coins from `cosmrs` and `cosmwasm` for API entrypoints [[#1295]]
-- all: updated all `cosmwasm`-related dependencies to `1.0.0` and `cw-storage-plus` to `0.13.4` [[#1318]]
-- network-requester: allow to voluntarily store and send statistical data about the number of bytes the proxied server serves ([#1328])
-
-[#1249]: https://github.com/nymtech/nym/pull/1249
-[#1256]: https://github.com/nymtech/nym/pull/1256
+[#1255]: https://github.com/nymtech/nym/pull/1255
 [#1257]: https://github.com/nymtech/nym/pull/1257
 [#1258]: https://github.com/nymtech/nym/pull/1258
-[#1260]: https://github.com/nymtech/nym/pull/1260
-[#1261]: https://github.com/nymtech/nym/pull/1261
-[#1265]: https://github.com/nymtech/nym/pull/1265
-[#1267]: https://github.com/nymtech/nym/pull/1267
 [#1275]: https://github.com/nymtech/nym/pull/1275
-[#1278]: https://github.com/nymtech/nym/pull/1278
 [#1284]: https://github.com/nymtech/nym/pull/1284
 [#1292]: https://github.com/nymtech/nym/pull/1292
-[#1295]: https://github.com/nymtech/nym/pull/1295
-[#1302]: https://github.com/nymtech/nym/pull/1302
-[#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
+[#1331]: https://github.com/nymtech/nym/pull/1331
+[#1369]: https://github.com/nymtech/nym/pull/1369
+[#1373]: https://github.com/nymtech/nym/pull/1373
+
+## [nym-wallet-v1.0.6](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.6) (2022-06-21)
+
+- wallet: undelegating now uses either the mixnet or vesting contract, or both, depending on how delegations were made
+- wallet: redeeming and compounding now uses both the mixnet and vesting contract
+- wallet: the wallet backend learned how to archive wallet files
+- wallet: add ENABLE_QA_MODE environment variable to enable QA mode on built wallet
 
 ## [nym-wallet-v1.0.5](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.5) (2022-06-14)
 
@@ -74,6 +116,9 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - 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)
 
 ### Changed

Cargo.lock

@@ -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"
@@ -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",
 ]
 
@@ -906,6 +924,7 @@ dependencies = [
  "rand 0.7.3",
  "thiserror",
  "url",
+ "validator-api-requests",
  "validator-client",
 ]
 
@@ -1122,6 +1141,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 +1361,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 +1377,7 @@ dependencies = [
  "rand_core 0.6.3",
  "serde",
  "serde_derive",
- "sha2",
+ "sha2 0.9.9",
  "thiserror",
  "zeroize",
 ]
@@ -1410,7 +1433,7 @@ dependencies = [
  "rand 0.7.3",
  "serde",
  "serde_bytes",
- "sha2",
+ "sha2 0.9.9",
  "zeroize",
 ]
 
@@ -1424,7 +1447,7 @@ dependencies = [
  "hex",
  "rand_core 0.6.3",
  "serde",
- "sha2",
+ "sha2 0.9.9",
  "thiserror",
  "zeroize",
 ]
@@ -1641,9 +1664,9 @@ dependencies = [
 
 [[package]]
 name = "fixed"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86d3f4dd10ddfcb0bd2b2efe9f18aff37ed48265fda3e20e5d53f046aba9d50a"
+checksum = "36a65312835c1097a0c926ff3702df965285fadc33d948b87397ff8961bad881"
 dependencies = [
  "az",
  "bytemuck",
@@ -1954,6 +1977,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 +2053,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 +2635,7 @@ dependencies = [
  "ecdsa",
  "elliptic-curve",
  "sec1",
- "sha2",
+ "sha2 0.9.9",
  "sha3",
 ]
 
@@ -3074,6 +3113,7 @@ dependencies = [
  "rand 0.7.3",
  "serde",
  "sqlx",
+ "statistics-common",
  "subtle-encoding",
  "thiserror",
  "tokio",
@@ -3081,6 +3121,7 @@ dependencies = [
  "tokio-tungstenite",
  "tokio-util 0.7.3",
  "url",
+ "validator-api-requests",
  "validator-client",
  "vergen",
  "version-checker",
@@ -3097,6 +3138,7 @@ dependencies = [
  "colored",
  "config",
  "crypto",
+ "cupid",
  "dirs",
  "dotenv",
  "futures",
@@ -3115,6 +3157,7 @@ dependencies = [
  "rocket",
  "serde",
  "serial_test",
+ "sysinfo",
  "task",
  "tokio",
  "tokio-util 0.7.3",
@@ -3130,6 +3173,7 @@ dependencies = [
 name = "nym-network-requester"
 version = "1.0.1"
 dependencies = [
+ "async-trait",
  "clap 2.34.0",
  "dirs",
  "futures",
@@ -3146,7 +3190,7 @@ dependencies = [
  "serde",
  "socks5-requests",
  "sqlx",
- "statistics",
+ "statistics-common",
  "thiserror",
  "tokio",
  "tokio-tungstenite",
@@ -3163,7 +3207,7 @@ dependencies = [
  "rocket",
  "serde",
  "sqlx",
- "statistics",
+ "statistics-common",
  "thiserror",
  "tokio",
  "tokio-tungstenite",
@@ -3321,7 +3365,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_derive",
- "sha2",
+ "sha2 0.9.9",
  "thiserror",
 ]
 
@@ -3852,6 +3896,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"
@@ -3915,12 +3971,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"
@@ -4482,9 +4532,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",
@@ -4500,7 +4550,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",
@@ -4510,10 +4560,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",
@@ -4521,9 +4571,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",
@@ -4552,19 +4602,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",
@@ -4573,16 +4622,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",
@@ -4596,9 +4645,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",
@@ -4609,9 +4658,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",
@@ -4622,9 +4671,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",
@@ -4721,9 +4770,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",
@@ -4734,9 +4783,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",
@@ -4915,9 +4964,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",
@@ -5028,21 +5077,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"
@@ -5056,6 +5090,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"
@@ -5206,7 +5251,7 @@ dependencies = [
  "log",
  "rand 0.7.3",
  "rand_distr",
- "sha2",
+ "sha2 0.9.9",
  "subtle 2.4.1",
 ]
 
@@ -5289,7 +5334,7 @@ dependencies = [
  "paste",
  "percent-encoding",
  "rustls",
- "sha2",
+ "sha2 0.9.9",
  "smallvec 1.8.0",
  "sqlformat",
  "sqlx-rt",
@@ -5313,7 +5358,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "sha2",
+ "sha2 0.9.9",
  "sqlx-core",
  "sqlx-rt",
  "syn",
@@ -5340,20 +5385,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",
 ]
@@ -5365,64 +5401,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
-name = "statistics"
+name = "statistics-common"
 version = "1.0.1"
 dependencies = [
+ "async-trait",
+ "log",
+ "network-defaults",
  "reqwest",
  "serde",
  "serde_json",
+ "sqlx",
  "thiserror",
+ "tokio",
 ]
 
-[[package]]
-name = "stdweb"
-version = "0.4.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
-dependencies = [
- "discard",
- "rustc_version 0.2.3",
- "stdweb-derive",
- "stdweb-internal-macros",
- "stdweb-internal-runtime",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "stdweb-derive"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde",
- "serde_derive",
- "syn",
-]
-
-[[package]]
-name = "stdweb-internal-macros"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
-dependencies = [
- "base-x",
- "proc-macro2",
- "quote",
- "serde",
- "serde_derive",
- "serde_json",
- "sha1",
- "syn",
-]
-
-[[package]]
-name = "stdweb-internal-runtime"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
-
 [[package]]
 name = "stringprep"
 version = "0.1.2"
@@ -5511,6 +5503,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"
@@ -5562,7 +5569,7 @@ dependencies = [
  "serde_bytes",
  "serde_json",
  "serde_repr",
- "sha2",
+ "sha2 0.9.9",
  "signature",
  "subtle 2.4.1",
  "subtle-encoding",
@@ -5700,21 +5707,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"
@@ -5725,17 +5717,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]]
@@ -5744,19 +5726,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"
@@ -6242,6 +6211,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"
@@ -6277,6 +6256,10 @@ checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 name = "validator-api-requests"
 version = "0.1.0"
 dependencies = [
+ "bs58",
+ "coconut-interface",
+ "cosmrs",
+ "getset",
  "mixnet-contract-common",
  "schemars",
  "serde",
@@ -6309,7 +6292,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
- "sha2",
+ "sha2 0.9.9",
  "thiserror",
  "tokio",
  "ts-rs",
@@ -6369,7 +6352,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "vesting-contract"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "config",
  "cosmwasm-std",

Makefile

@@ -1,9 +1,11 @@
+test-all: test cargo-test-expensive
 test: build clippy-all cargo-test wasm fmt
 no-clippy: build cargo-test wasm fmt
 happy: fmt clippy-happy test
 clippy-all: clippy-all-main clippy-all-contracts clippy-all-wallet clippy-all-connect
 clippy-happy: clippy-happy-main clippy-happy-contracts clippy-happy-wallet clippy-happy-connect
 cargo-test: test-main test-contracts test-wallet test-connect
+cargo-test-expensive: test-main-expensive test-contracts-expensive test-wallet-expensive test-connect-expensive
 build: build-contracts build-wallet build-main build-connect
 fmt: fmt-main fmt-contracts fmt-wallet fmt-connect
 
@@ -34,15 +36,27 @@ clippy-all-connect:
 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
 

clients/client-core/Cargo.toml

@@ -32,4 +32,4 @@ validator-client = { path = "../../common/client-libs/validator-client" }
 tempfile = "3.1.0"
 
 [features]
-coconut = ["gateway-client/coconut", "gateway-requests/coconut"]
+coconut = ["gateway-client/coconut", "gateway-requests/coconut"]

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

@@ -114,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)]

clients/client-core/src/init.rs

@@ -0,0 +1,137 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+//! Collection of initialization steps used by client implementations
+
+use std::{sync::Arc, time::Duration};
+
+use config::NymConfig;
+use crypto::asymmetric::{encryption, identity};
+use gateway_client::GatewayClient;
+use gateway_requests::registration::handshake::SharedKeys;
+use nymsphinx::addressing::clients::Recipient;
+use nymsphinx::addressing::nodes::NodeIdentity;
+use rand::rngs::OsRng;
+use rand::seq::SliceRandom;
+use rand::thread_rng;
+use topology::{filter::VersionFilterable, gateway};
+use url::Url;
+
+use crate::{
+    client::key_manager::KeyManager,
+    config::{persistence::key_pathfinder::ClientKeyPathfinder, Config},
+};
+
+pub async fn query_gateway_details(
+    validator_servers: Vec<Url>,
+    chosen_gateway_id: Option<&str>,
+) -> gateway::Node {
+    let validator_api = validator_servers
+        .choose(&mut thread_rng())
+        .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()
+        .filter_map(|gateway| gateway.try_into().ok())
+        .collect::<Vec<gateway::Node>>();
+
+    let filtered_gateways = valid_gateways.filter_by_version(env!("CARGO_PKG_VERSION"));
+
+    // if we have chosen particular gateway - use it, otherwise choose a random one.
+    // (remember that in active topology all gateways have at least 100 reputation so should
+    // be working correctly)
+    if let Some(gateway_id) = chosen_gateway_id {
+        filtered_gateways
+            .iter()
+            .find(|gateway| gateway.identity_key.to_base58_string() == gateway_id)
+            .expect(&*format!("no gateway with id {} exists!", gateway_id))
+            .clone()
+    } else {
+        filtered_gateways
+            .choose(&mut rand::thread_rng())
+            .expect("there are no gateways on the network!")
+            .clone()
+    }
+}
+
+pub async fn register_with_gateway_and_store_keys<T>(
+    gateway_details: gateway::Node,
+    config: &Config<T>,
+) where
+    T: NymConfig,
+{
+    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);
+    key_manager
+        .store_keys(&pathfinder)
+        .expect("Failed to generated keys");
+}
+
+async fn register_with_gateway(
+    gateway: &gateway::Node,
+    our_identity: Arc<identity::KeyPair>,
+) -> Arc<SharedKeys> {
+    let timeout = Duration::from_millis(1500);
+    let mut gateway_client = GatewayClient::new_init(
+        gateway.clients_address(),
+        gateway.identity_key,
+        gateway.owner.clone(),
+        our_identity.clone(),
+        timeout,
+    );
+    gateway_client
+        .establish_connection()
+        .await
+        .expect("failed to establish connection with the gateway!");
+    gateway_client
+        .perform_initial_authentication()
+        .await
+        .expect("failed to register with the gateway!")
+}
+
+pub fn show_address<T>(config: &Config<T>)
+where
+    T: config::NymConfig,
+{
+    fn load_identity_keys(pathfinder: &ClientKeyPathfinder) -> identity::KeyPair {
+        let identity_keypair: identity::KeyPair =
+            pemstore::load_keypair(&pemstore::KeyPairPath::new(
+                pathfinder.private_identity_key().to_owned(),
+                pathfinder.public_identity_key().to_owned(),
+            ))
+            .expect("Failed to read stored identity key files");
+        identity_keypair
+    }
+
+    fn load_sphinx_keys(pathfinder: &ClientKeyPathfinder) -> encryption::KeyPair {
+        let sphinx_keypair: encryption::KeyPair =
+            pemstore::load_keypair(&pemstore::KeyPairPath::new(
+                pathfinder.private_encryption_key().to_owned(),
+                pathfinder.public_encryption_key().to_owned(),
+            ))
+            .expect("Failed to read stored sphinx key files");
+        sphinx_keypair
+    }
+
+    let pathfinder = ClientKeyPathfinder::new_from_config(config);
+    let identity_keypair = load_identity_keys(&pathfinder);
+    let sphinx_keypair = load_sphinx_keys(&pathfinder);
+
+    let client_recipient = Recipient::new(
+        *identity_keypair.public_key(),
+        *sphinx_keypair.public_key(),
+        // TODO: below only works under assumption that gateway address == gateway id
+        // (which currently is true)
+        NodeIdentity::from_base58_string(config.get_gateway_id()).unwrap(),
+    );
+
+    println!("\nThe address of this client is: {}", client_recipient);
+}

clients/client-core/src/lib.rs

@@ -1,2 +1,3 @@
 pub mod client;
 pub mod config;
+pub mod init;

clients/credential/Cargo.toml

@@ -26,4 +26,4 @@ pemstore = { path = "../../common/pemstore" }
 validator-client = { path = "../../common/client-libs/validator-client", features = ["nymd-client"] }
 
 [features]
-coconut = ["credentials/coconut"]
+coconut = ["credentials/coconut"]

clients/credential/src/client.rs

@@ -1,14 +1,13 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use bip39::Mnemonic;
-use std::str::FromStr;
-use url::Url;
-
 use crate::error::Result;
 use crate::{MNEMONIC, NYMD_URL};
-
-use network_defaults::{DEFAULT_NETWORK, DENOM, VOUCHER_INFO};
+use bip39::Mnemonic;
+use network_defaults::{DEFAULT_NETWORK, MIX_DENOM, VOUCHER_INFO};
+use std::str::FromStr;
+use url::Url;
+use validator_client::nymd;
 use validator_client::nymd::traits::CoconutBandwidthSigningClient;
 use validator_client::nymd::{Coin, Fee, NymdClient, SigningNymdClient};
 
@@ -20,9 +19,10 @@ impl Client {
     pub fn new() -> Self {
         let nymd_url = Url::from_str(NYMD_URL).unwrap();
         let mnemonic = Mnemonic::from_str(MNEMONIC).unwrap();
+        let config = nymd::Config::try_from_nym_network_details(&DEFAULT_NETWORK.details())
+            .expect("failed to construct valid validator client config with the provided network");
         let nymd_client =
-            NymdClient::connect_with_mnemonic(DEFAULT_NETWORK, nymd_url.as_ref(), mnemonic, None)
-                .unwrap();
+            NymdClient::connect_with_mnemonic(config, nymd_url.as_ref(), mnemonic, None).unwrap();
 
         Client { nymd_client }
     }
@@ -34,7 +34,7 @@ impl Client {
         encryption_key: String,
         fee: Option<Fee>,
     ) -> Result<String> {
-        let amount = Coin::new(amount as u128, DENOM.to_string());
+        let amount = Coin::new(amount as u128, MIX_DENOM.base.to_string());
         Ok(self
             .nymd_client
             .deposit(

clients/native/Cargo.toml

@@ -55,4 +55,4 @@ eth = []
 serde_json = "1.0" # for the "textsend" example
 
 [build-dependencies]
-vergen = { version = "5", default-features = false, features = ["build", "git", "rustc", "cargo"] }
+vergen = { version = "5", default-features = false, features = ["build", "git", "rustc", "cargo"] }

clients/native/src/commands/init.rs

@@ -2,22 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use clap::{App, Arg, ArgMatches};
-use client_core::client::key_manager::KeyManager;
-use client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
+use client_core::config::GatewayEndpoint;
 use config::NymConfig;
-use crypto::asymmetric::{encryption, identity};
-use gateway_client::GatewayClient;
-use gateway_requests::registration::handshake::SharedKeys;
-use nymsphinx::addressing::clients::Recipient;
-use nymsphinx::addressing::nodes::NodeIdentity;
-use rand::rngs::OsRng;
-use rand::seq::SliceRandom;
-use rand::thread_rng;
-use std::convert::TryInto;
-use std::sync::Arc;
-use std::time::Duration;
-use topology::{filter::VersionFilterable, gateway};
-use url::Url;
 
 use crate::client::config::Config;
 use crate::commands::override_config;
@@ -42,6 +28,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,161 +79,47 @@ pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
     app
 }
 
-async fn register_with_gateway(
-    gateway: &gateway::Node,
-    our_identity: Arc<identity::KeyPair>,
-) -> Arc<SharedKeys> {
-    let timeout = Duration::from_millis(1500);
-    let mut gateway_client = GatewayClient::new_init(
-        gateway.clients_address(),
-        gateway.identity_key,
-        gateway.owner.clone(),
-        our_identity.clone(),
-        timeout,
-    );
-    gateway_client
-        .establish_connection()
-        .await
-        .expect("failed to establish connection with the gateway!");
-    gateway_client
-        .perform_initial_authentication()
-        .await
-        .expect("failed to register with the gateway!")
-}
-
-async fn gateway_details(
-    validator_servers: Vec<Url>,
-    chosen_gateway_id: Option<&str>,
-) -> gateway::Node {
-    let validator_api = validator_servers
-        .choose(&mut thread_rng())
-        .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()
-        .filter_map(|gateway| gateway.try_into().ok())
-        .collect::<Vec<gateway::Node>>();
-
-    let filtered_gateways = valid_gateways.filter_by_version(env!("CARGO_PKG_VERSION"));
-
-    // if we have chosen particular gateway - use it, otherwise choose a random one.
-    // (remember that in active topology all gateways have at least 100 reputation so should
-    // be working correctly)
-    if let Some(gateway_id) = chosen_gateway_id {
-        filtered_gateways
-            .iter()
-            .find(|gateway| gateway.identity_key.to_base58_string() == gateway_id)
-            .expect(&*format!("no gateway with id {} exists!", gateway_id))
-            .clone()
-    } else {
-        filtered_gateways
-            .choose(&mut rand::thread_rng())
-            .expect("there are no gateways on the network!")
-            .clone()
-    }
-}
-
-fn show_address(config: &Config) {
-    fn load_identity_keys(pathfinder: &ClientKeyPathfinder) -> identity::KeyPair {
-        let identity_keypair: identity::KeyPair =
-            pemstore::load_keypair(&pemstore::KeyPairPath::new(
-                pathfinder.private_identity_key().to_owned(),
-                pathfinder.public_identity_key().to_owned(),
-            ))
-            .expect("Failed to read stored identity key files");
-        identity_keypair
-    }
-
-    fn load_sphinx_keys(pathfinder: &ClientKeyPathfinder) -> encryption::KeyPair {
-        let sphinx_keypair: encryption::KeyPair =
-            pemstore::load_keypair(&pemstore::KeyPairPath::new(
-                pathfinder.private_encryption_key().to_owned(),
-                pathfinder.public_encryption_key().to_owned(),
-            ))
-            .expect("Failed to read stored sphinx key files");
-        sphinx_keypair
-    }
-
-    let pathfinder = ClientKeyPathfinder::new_from_config(config.get_base());
-    let identity_keypair = load_identity_keys(&pathfinder);
-    let sphinx_keypair = load_sphinx_keys(&pathfinder);
-
-    let client_recipient = Recipient::new(
-        *identity_keypair.public_key(),
-        *sphinx_keypair.public_key(),
-        // TODO: below only works under assumption that gateway address == gateway id
-        // (which currently is true)
-        NodeIdentity::from_base58_string(config.get_base().get_gateway_id()).unwrap(),
-    );
-
-    println!("\nThe address of this client is: {}", client_recipient);
-}
-
 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 user_wants_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 register_gateway = !already_init || user_wants_force_register;
+
+    // Attempt to use a user-provided gateway, if possible
+    let user_chosen_gateway_id = matches.value_of("gateway");
 
     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);
     if matches.is_present("fastmode") {
         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");
-    }
+    let gateway = setup_gateway(id, register_gateway, user_chosen_gateway_id, &config).await;
+    config.get_base_mut().with_gateway_endpoint(gateway);
 
     let config_save_location = config.get_config_file_save_location();
     config
         .save_to_file(None)
         .expect("Failed to save the config file");
+
     println!("Saved configuration file to {:?}", config_save_location);
     println!("Using gateway: {}", config.get_base().get_gateway_id());
     log::debug!("Gateway id: {}", config.get_base().get_gateway_id());
@@ -253,5 +130,58 @@ pub async fn execute(matches: ArgMatches<'static>) {
     );
     println!("Client configuration completed.");
 
-    show_address(&config);
+    client_core::init::show_address(config.get_base());
+}
+
+async fn setup_gateway(
+    id: &str,
+    register: bool,
+    user_chosen_gateway_id: Option<&str>,
+    config: &Config,
+) -> GatewayEndpoint {
+    if register {
+        // Get the gateway details by querying the validator-api. Either pick one at random or use
+        // the chosen one if it's among the available ones.
+        println!("Configuring gateway");
+        let gateway = client_core::init::query_gateway_details(
+            config.get_base().get_validator_api_endpoints(),
+            user_chosen_gateway_id,
+        )
+        .await;
+        log::debug!("Querying gateway gives: {}", gateway);
+
+        // Registering with gateway by setting up and writing shared keys to disk
+        log::trace!("Registering gateway");
+        client_core::init::register_with_gateway_and_store_keys(gateway.clone(), config.get_base())
+            .await;
+        println!("Saved all generated keys");
+
+        gateway.into()
+    } else if user_chosen_gateway_id.is_some() {
+        // Just set the config, don't register or create any keys
+        // This assumes that the user knows what they are doing, and that the existing keys are
+        // valid for the gateway being used
+        println!("Using gateway provided by user, keeping existing keys");
+        let gateway = client_core::init::query_gateway_details(
+            config.get_base().get_validator_api_endpoints(),
+            user_chosen_gateway_id,
+        )
+        .await;
+        log::debug!("Querying gateway gives: {}", gateway);
+        gateway.into()
+    } else {
+        println!("Not registering gateway, will reuse existing config and keys");
+        match Config::load_from_file(Some(id)) {
+            Ok(existing_config) => existing_config.get_base().get_gateway_endpoint().clone(),
+            Err(err) => {
+                panic!(
+                    "Unable to configure gateway: {err}. \n
+                    Seems like the client was already initialized but it was not possible to read \
+                    the existing configuration file. \n
+                    CAUTION: Consider backing up your gateway keys and try force gateway registration, or \
+                    removing the existing configuration and starting over."
+                )
+            }
+        }
+    }
 }

clients/native/websocket-requests/Cargo.toml

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

clients/socks5/Cargo.toml

@@ -47,4 +47,4 @@ coconut = ["coconut-interface", "credentials", "gateway-requests/coconut", "gate
 eth = []
 
 [build-dependencies]
-vergen = { version = "5", default-features = false, features = ["build", "git", "rustc", "cargo"] }
+vergen = { version = "5", default-features = false, features = ["build", "git", "rustc", "cargo"] }

clients/socks5/src/commands/init.rs

@@ -2,20 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use clap::{App, Arg, ArgMatches};
-use client_core::client::key_manager::KeyManager;
-use client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
+use client_core::config::GatewayEndpoint;
 use config::NymConfig;
-use crypto::asymmetric::{encryption, identity};
-use gateway_client::GatewayClient;
-use gateway_requests::registration::handshake::SharedKeys;
-use nymsphinx::addressing::clients::Recipient;
-use nymsphinx::addressing::nodes::NodeIdentity;
-use rand::{prelude::SliceRandom, rngs::OsRng, thread_rng};
-use std::convert::TryInto;
-use std::sync::Arc;
-use std::time::Duration;
-use topology::{filter::VersionFilterable, gateway};
-use url::Url;
 
 use crate::client::config::Config;
 use crate::commands::override_config;
@@ -46,6 +34,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,165 +81,110 @@ pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
     app
 }
 
-// TODO: make this private again after refactoring the config setup
-pub async fn register_with_gateway(
-    gateway: &gateway::Node,
-    our_identity: Arc<identity::KeyPair>,
-) -> Arc<SharedKeys> {
-    let timeout = Duration::from_millis(1500);
-    let mut gateway_client = GatewayClient::new_init(
-        gateway.clients_address(),
-        gateway.identity_key,
-        gateway.owner.clone(),
-        our_identity.clone(),
-        timeout,
-    );
-    gateway_client
-        .establish_connection()
-        .await
-        .expect("failed to establish connection with the gateway!");
-    gateway_client
-        .perform_initial_authentication()
-        .await
-        .expect("failed to register with the gateway!")
-}
-
-// 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 {
-    let validator_api = validator_servers
-        .choose(&mut thread_rng())
-        .expect("The list of validator apis is empty");
-    let validator_client = validator_client::ApiClient::new(validator_api.clone());
-
-    let gateways = validator_client.get_cached_gateways().await.unwrap();
-    let valid_gateways = gateways
-        .into_iter()
-        .filter_map(|gateway| gateway.try_into().ok())
-        .collect::<Vec<gateway::Node>>();
-
-    let filtered_gateways = valid_gateways.filter_by_version(env!("CARGO_PKG_VERSION"));
-
-    // if we have chosen particular gateway - use it, otherwise choose a random one.
-    // (remember that in active topology all gateways have at least 100 reputation so should
-    // be working correctly)
-    if let Some(gateway_id) = chosen_gateway_id {
-        filtered_gateways
-            .iter()
-            .find(|gateway| gateway.identity_key.to_base58_string() == gateway_id)
-            .expect(&*format!("no gateway with id {} exists!", gateway_id))
-            .clone()
-    } else {
-        filtered_gateways
-            .choose(&mut rand::thread_rng())
-            .expect("there are no gateways on the network!")
-            .clone()
-    }
-}
-
-// 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(
-                pathfinder.private_identity_key().to_owned(),
-                pathfinder.public_identity_key().to_owned(),
-            ))
-            .expect("Failed to read stored identity key files");
-        identity_keypair
-    }
-
-    fn load_sphinx_keys(pathfinder: &ClientKeyPathfinder) -> encryption::KeyPair {
-        let sphinx_keypair: encryption::KeyPair =
-            pemstore::load_keypair(&pemstore::KeyPairPath::new(
-                pathfinder.private_encryption_key().to_owned(),
-                pathfinder.public_encryption_key().to_owned(),
-            ))
-            .expect("Failed to read stored sphinx key files");
-        sphinx_keypair
-    }
-
-    let pathfinder = ClientKeyPathfinder::new_from_config(config.get_base());
-    let identity_keypair = load_identity_keys(&pathfinder);
-    let sphinx_keypair = load_sphinx_keys(&pathfinder);
-
-    let client_recipient = Recipient::new(
-        *identity_keypair.public_key(),
-        *sphinx_keypair.public_key(),
-        // TODO: below only works under assumption that gateway address == gateway id
-        // (which currently is true)
-        NodeIdentity::from_base58_string(config.get_base().get_gateway_id()).unwrap(),
-    );
-
-    println!("\nThe address of this client is: {}", client_recipient);
-}
-
 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 user_wants_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 register_gateway = !already_init || user_wants_force_register;
+
+    // Attempt to use a user-provided gateway, if possible
+    let user_chosen_gateway_id = matches.value_of("gateway");
 
     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);
     if matches.is_present("fastmode") {
         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");
-    }
+    let gateway = setup_gateway(id, register_gateway, user_chosen_gateway_id, &config).await;
+    config.get_base_mut().with_gateway_endpoint(gateway);
 
     let config_save_location = config.get_config_file_save_location();
     config
         .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");
 
-    show_address(&config);
+    println!("Saved configuration file to {:?}", config_save_location);
+    println!("Using gateway: {}", config.get_base().get_gateway_id());
+    log::debug!("Gateway id: {}", config.get_base().get_gateway_id());
+    log::debug!("Gateway owner: {}", config.get_base().get_gateway_owner());
+    log::debug!(
+        "Gateway listener: {}",
+        config.get_base().get_gateway_listener()
+    );
+    println!("Client configuration completed.");
+
+    client_core::init::show_address(config.get_base());
+}
+
+async fn setup_gateway(
+    id: &str,
+    register: bool,
+    user_chosen_gateway_id: Option<&str>,
+    config: &Config,
+) -> GatewayEndpoint {
+    if register {
+        // Get the gateway details by querying the validator-api. Either pick one at random or use
+        // the chosen one if it's among the available ones.
+        println!("Configuring gateway");
+        let gateway = client_core::init::query_gateway_details(
+            config.get_base().get_validator_api_endpoints(),
+            user_chosen_gateway_id,
+        )
+        .await;
+        log::debug!("Querying gateway gives: {}", gateway);
+
+        // Registering with gateway by setting up and writing shared keys to disk
+        log::trace!("Registering gateway");
+        client_core::init::register_with_gateway_and_store_keys(gateway.clone(), config.get_base())
+            .await;
+        println!("Saved all generated keys");
+
+        gateway.into()
+    } else if user_chosen_gateway_id.is_some() {
+        // Just set the config, don't register or create any keys
+        // This assumes that the user knows what they are doing, and that the existing keys are
+        // valid for the gateway being used
+        println!("Using gateway provided by user, keeping existing keys");
+        let gateway = client_core::init::query_gateway_details(
+            config.get_base().get_validator_api_endpoints(),
+            user_chosen_gateway_id,
+        )
+        .await;
+        log::debug!("Querying gateway gives: {}", gateway);
+        gateway.into()
+    } else {
+        println!("Not registering gateway, will reuse existing config and keys");
+        match Config::load_from_file(Some(id)) {
+            Ok(existing_config) => existing_config.get_base().get_gateway_endpoint().clone(),
+            Err(err) => {
+                panic!(
+                    "Unable to configure gateway: {err}. \n
+                    Seems like the client was already initialized but it was not possible to read \
+                    the existing configuration file. \n
+                    CAUTION: Consider backing up your gateway keys and try force gateway registration, or \
+                    removing the existing configuration and starting over."
+                )
+            }
+        }
+    }
 }

clients/socks5/src/commands/run.rs

@@ -34,16 +34,16 @@ pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
             .help("Address of the socks5 provider to send messages to.")
             .takes_value(true)
         )
-        .arg(Arg::with_name("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")

clients/webassembly/js-example/package-lock.json

@@ -24,7 +24,8 @@
     },
     "../pkg": {
       "name": "@nymproject/nym-client-wasm",
-      "version": "0.0.1"
+      "version": "1.0.1",
+      "license": "Apache-2.0"
     },
     "node_modules/@discoveryjs/json-ext": {
       "version": "0.5.7",

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

@@ -74,4 +74,4 @@ features = ["js"]
 [features]
 coconut = ["gateway-requests/coconut", "coconut-interface", "validator-client", "credentials/coconut"]
 wasm = ["web3/wasm", "web3/http", "web3/signing"]
-default = ["web3/default"]
+default = ["web3/default"]

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

@@ -1,47 +1,49 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::error::GatewayClientError;
+use std::str::FromStr;
+
 #[cfg(target_arch = "wasm32")]
-use crate::wasm_storage::{Storage, StorageError};
-#[cfg(feature = "coconut")]
-use coconut_interface::Base58;
-#[cfg(feature = "coconut")]
-#[cfg(not(target_arch = "wasm32"))]
-use credential_storage::error::StorageError;
+use crate::wasm_storage::Storage;
 #[cfg(not(target_arch = "wasm32"))]
 use credential_storage::storage::Storage;
+
+#[cfg(all(target_arch = "wasm32", feature = "coconut"))]
+use crate::wasm_storage::StorageError;
+
+#[cfg(all(not(target_arch = "wasm32"), feature = "coconut"))]
+use credential_storage::error::StorageError;
+
 #[cfg(feature = "coconut")]
-use credentials::coconut::{
-    bandwidth::prepare_for_spending, utils::obtain_aggregate_verification_key,
-};
-#[cfg(not(feature = "coconut"))]
-use credentials::token::bandwidth::TokenCredential;
-#[cfg(not(feature = "coconut"))]
-use crypto::asymmetric::identity;
-#[cfg(not(feature = "coconut"))]
-use network_defaults::{
-    eth_contract::ETH_ERC20_JSON_ABI, eth_contract::ETH_JSON_ABI, BANDWIDTH_VALUE,
-    ETH_BURN_FUNCTION_NAME, ETH_CONTRACT_ADDRESS, ETH_ERC20_APPROVE_FUNCTION_NAME,
-    ETH_ERC20_CONTRACT_ADDRESS, ETH_MIN_BLOCK_DEPTH, TOKENS_TO_BURN, UTOKENS_TO_BURN,
-};
-#[cfg(not(feature = "coconut"))]
-use pemstore::traits::PemStorableKeyPair;
-#[cfg(not(feature = "coconut"))]
-use rand::rngs::OsRng;
-#[cfg(not(feature = "coconut"))]
-use secp256k1::SecretKey;
-use std::str::FromStr;
-#[cfg(not(feature = "coconut"))]
-use web3::{
-    contract::{Contract, Options},
-    ethabi::Token,
-    signing::{Key, SecretKeyRef},
-    transports::Http,
-    types::{Address, U256, U64},
-    Web3,
+use {
+    coconut_interface::Base58,
+    credentials::coconut::{
+        bandwidth::prepare_for_spending, utils::obtain_aggregate_verification_key,
+    },
 };
 
-use crate::error::GatewayClientError;
+#[cfg(not(feature = "coconut"))]
+use {
+    credentials::token::bandwidth::TokenCredential,
+    crypto::asymmetric::identity,
+    network_defaults::{
+        eth_contract::ETH_ERC20_JSON_ABI, eth_contract::ETH_JSON_ABI, BANDWIDTH_VALUE,
+        ETH_BURN_FUNCTION_NAME, ETH_CONTRACT_ADDRESS, ETH_ERC20_APPROVE_FUNCTION_NAME,
+        ETH_ERC20_CONTRACT_ADDRESS, ETH_MIN_BLOCK_DEPTH, TOKENS_TO_BURN, UTOKENS_TO_BURN,
+    },
+    pemstore::traits::PemStorableKeyPair,
+    rand::rngs::OsRng,
+    secp256k1::SecretKey,
+    web3::{
+        contract::{Contract, Options},
+        ethabi::Token,
+        signing::{Key, SecretKeyRef},
+        transports::Http,
+        types::{Address, U256, U64},
+        Web3,
+    },
+};
 
 #[cfg(not(feature = "coconut"))]
 pub fn eth_contract(web3: Web3<Http>) -> Contract<Http> {

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

@@ -27,7 +27,7 @@ futures = "0.3"
 
 coconut-interface = { path = "../../coconut-interface" }
 network-defaults = { path = "../../network-defaults" }
-validator-api-requests = { path = "../../../validator-api/validator-api-requests" }
+validator-api-requests = { path = "../../../validator-api/validator-api-requests", features = ["coconut"] }
 
 # required for nymd-client
 # at some point it might be possible to make it wasm-compatible

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

@@ -2,27 +2,24 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{validator_api, ValidatorClientError};
-use coconut_interface::{
+use mixnet_contract_common::{GatewayBond, IdentityKeyRef, MixNodeBond};
+use url::Url;
+use validator_api_requests::coconut::{
     BlindSignRequestBody, BlindedSignatureResponse, ExecuteReleaseFundsRequestBody,
     ProposeReleaseFundsRequestBody, ProposeReleaseFundsResponse, VerificationKeyResponse,
     VerifyCredentialBody, VerifyCredentialResponse,
 };
-use mixnet_contract_common::{GatewayBond, IdentityKeyRef, MixNodeBond};
-use url::Url;
-
 use validator_api_requests::models::{
     CoreNodeStatusResponse, MixnodeStatusResponse, RewardEstimationResponse,
     StakeSaturationResponse,
 };
+
 #[cfg(feature = "nymd-client")]
 use validator_api_requests::models::{MixNodeBondAnnotated, UptimeResponse};
 
-#[cfg(feature = "nymd-client")]
-use network_defaults::DEFAULT_NETWORK;
-
 #[cfg(feature = "nymd-client")]
 use crate::nymd::{
-    error::NymdError, CosmWasmClient, NymdClient, QueryNymdClient, SigningNymdClient,
+    self, error::NymdError, CosmWasmClient, NymdClient, QueryNymdClient, SigningNymdClient,
 };
 
 #[cfg(feature = "nymd-client")]
@@ -32,18 +29,18 @@ use mixnet_contract_common::{
     RewardedSetUpdateDetails,
 };
 #[cfg(feature = "nymd-client")]
+use network_defaults::{all::Network, NymNetworkDetails};
+#[cfg(feature = "nymd-client")]
 use std::collections::{HashMap, HashSet};
 
 #[cfg(feature = "nymd-client")]
 #[must_use]
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Config {
-    network: network_defaults::all::Network,
     api_url: Url,
     nymd_url: Url,
-    mixnet_contract_address: cosmrs::AccountId,
-    vesting_contract_address: cosmrs::AccountId,
-    bandwidth_claim_contract_address: cosmrs::AccountId,
+
+    nymd_config: nymd::Config,
 
     mixnode_page_limit: Option<u32>,
     gateway_page_limit: Option<u32>,
@@ -53,42 +50,44 @@ pub struct Config {
 
 #[cfg(feature = "nymd-client")]
 impl Config {
-    pub fn new(network: network_defaults::all::Network, nymd_url: Url, api_url: Url) -> Self {
-        Config {
-            network,
-            nymd_url,
-            mixnet_contract_address: DEFAULT_NETWORK
-                .mixnet_contract_address()
+    pub fn try_from_nym_network_details(
+        details: &NymNetworkDetails,
+    ) -> Result<Self, ValidatorClientError> {
+        let mut api_url = details
+            .endpoints
+            .iter()
+            .filter_map(|d| d.api_url.as_ref())
+            .map(|url| Url::parse(url))
+            .collect::<Result<Vec<_>, _>>()?;
+
+        if api_url.is_empty() {
+            return Err(ValidatorClientError::NoAPIUrlAvailable);
+        }
+
+        Ok(Config {
+            api_url: api_url.pop().unwrap(),
+            nymd_url: details.endpoints[0]
+                .nymd_url
                 .parse()
-                .expect("Error parsing mixnet contract address"),
-            vesting_contract_address: DEFAULT_NETWORK
-                .vesting_contract_address()
-                .parse()
-                .expect("Error parsing vesting contract address"),
-            bandwidth_claim_contract_address: DEFAULT_NETWORK
-                .bandwidth_claim_contract_address()
-                .parse()
-                .expect("Error parsing bandwidth claim contract address"),
-            api_url,
+                .map_err(ValidatorClientError::MalformedUrlProvided)?,
+            nymd_config: nymd::Config::try_from_nym_network_details(details)?,
             mixnode_page_limit: None,
             gateway_page_limit: None,
             mixnode_delegations_page_limit: None,
             rewarded_set_page_limit: None,
-        }
+        })
     }
 
-    pub fn with_mixnode_contract_address(mut self, address: cosmrs::AccountId) -> Self {
-        self.mixnet_contract_address = address;
+    // TODO: this method shouldn't really exist as all information should be included immediately
+    // via `from_nym_network_details`, but it's here for, you guessed it, legacy compatibility
+    pub fn with_urls(mut self, nymd_url: Url, api_url: Url) -> Self {
+        self.nymd_url = nymd_url;
+        self.api_url = api_url;
         self
     }
 
-    pub fn with_vesting_contract_address(mut self, address: cosmrs::AccountId) -> Self {
-        self.vesting_contract_address = address;
-        self
-    }
-
-    pub fn with_bandwidth_claim_contract_address(mut self, address: cosmrs::AccountId) -> Self {
-        self.bandwidth_claim_contract_address = address;
+    pub fn with_nymd_url(mut self, nymd_url: Url) -> Self {
+        self.nymd_url = nymd_url;
         self
     }
 
@@ -115,10 +114,11 @@ impl Config {
 
 #[cfg(feature = "nymd-client")]
 pub struct Client<C> {
-    pub network: network_defaults::all::Network,
-    mixnet_contract_address: cosmrs::AccountId,
-    vesting_contract_address: cosmrs::AccountId,
-    bandwidth_claim_contract_address: cosmrs::AccountId,
+    // compatibility : (
+    pub network: Network,
+
+    // TODO: we really shouldn't be storing a mnemonic here, but removing it would be
+    // non-trivial amount of work and it's out of scope of the current branch
     mnemonic: Option<bip39::Mnemonic>,
 
     mixnode_page_limit: Option<u32>,
@@ -135,29 +135,26 @@ pub struct Client<C> {
 impl Client<SigningNymdClient> {
     pub fn new_signing(
         config: Config,
+        // we need to provide network argument due to compatibility with other components (wallet...)
+        // that rely on its existence...
+        network: Network,
         mnemonic: bip39::Mnemonic,
     ) -> Result<Client<SigningNymdClient>, ValidatorClientError> {
         let validator_api_client = validator_api::Client::new(config.api_url.clone());
         let nymd_client = NymdClient::connect_with_mnemonic(
-            config.network,
+            config.nymd_config.clone(),
             config.nymd_url.as_str(),
             mnemonic.clone(),
             None,
-        )?
-        .with_mixnet_contract_address(config.mixnet_contract_address.clone())
-        .with_vesting_contract_address(config.vesting_contract_address.clone())
-        .with_bandwidth_claim_contract_address(config.bandwidth_claim_contract_address.clone());
+        )?;
 
         Ok(Client {
-            network: config.network,
-            mixnet_contract_address: config.mixnet_contract_address,
-            vesting_contract_address: config.vesting_contract_address,
-            bandwidth_claim_contract_address: config.bandwidth_claim_contract_address,
+            network,
             mnemonic: Some(mnemonic),
             mixnode_page_limit: config.mixnode_page_limit,
             gateway_page_limit: config.gateway_page_limit,
             mixnode_delegations_page_limit: config.mixnode_delegations_page_limit,
-            rewarded_set_page_limit: None,
+            rewarded_set_page_limit: config.rewarded_set_page_limit,
             validator_api: validator_api_client,
             nymd: nymd_client,
         })
@@ -165,14 +162,11 @@ impl Client<SigningNymdClient> {
 
     pub fn change_nymd(&mut self, new_endpoint: Url) -> Result<(), ValidatorClientError> {
         self.nymd = NymdClient::connect_with_mnemonic(
-            self.network,
+            self.nymd.current_config().clone(),
             new_endpoint.as_ref(),
             self.mnemonic.clone().unwrap(),
             None,
-        )?
-        .with_mixnet_contract_address(self.mixnet_contract_address.clone())
-        .with_vesting_contract_address(self.vesting_contract_address.clone())
-        .with_bandwidth_claim_contract_address(self.bandwidth_claim_contract_address.clone());
+        )?;
         Ok(())
     }
 
@@ -183,17 +177,18 @@ impl Client<SigningNymdClient> {
 
 #[cfg(feature = "nymd-client")]
 impl Client<QueryNymdClient> {
-    pub fn new_query(config: Config) -> Result<Client<QueryNymdClient>, ValidatorClientError> {
+    pub fn new_query(
+        config: Config,
+        // we need to provide network argument due to compatibility with other components (wallet...)
+        // that rely on its existence...
+        network: Network,
+    ) -> Result<Client<QueryNymdClient>, ValidatorClientError> {
         let validator_api_client = validator_api::Client::new(config.api_url.clone());
-        let nymd_client = NymdClient::connect(config.nymd_url.as_str())?
-            .with_mixnet_contract_address(config.mixnet_contract_address.clone())
-            .with_vesting_contract_address(config.vesting_contract_address.clone());
+        let nymd_client =
+            NymdClient::connect(config.nymd_config.clone(), config.nymd_url.as_str())?;
 
         Ok(Client {
-            network: config.network,
-            mixnet_contract_address: config.mixnet_contract_address,
-            vesting_contract_address: config.vesting_contract_address,
-            bandwidth_claim_contract_address: config.bandwidth_claim_contract_address,
+            network,
             mnemonic: None,
             mixnode_page_limit: config.mixnode_page_limit,
             gateway_page_limit: config.gateway_page_limit,
@@ -205,10 +200,7 @@ impl Client<QueryNymdClient> {
     }
 
     pub fn change_nymd(&mut self, new_endpoint: Url) -> Result<(), ValidatorClientError> {
-        self.nymd = NymdClient::connect(new_endpoint.as_ref())?
-            .with_mixnet_contract_address(self.mixnet_contract_address.clone())
-            .with_vesting_contract_address(self.vesting_contract_address.clone())
-            .with_bandwidth_claim_contract_address(self.bandwidth_claim_contract_address.clone());
+        self.nymd = NymdClient::connect(self.nymd.current_config().clone(), new_endpoint.as_ref())?;
         Ok(())
     }
 }
@@ -222,11 +214,12 @@ impl<C> Client<C> {
     // use case: somebody initialised client without a contract in order to upload and initialise one
     // and now they want to actually use it without making new client
     pub fn set_mixnet_contract_address(&mut self, mixnet_contract_address: cosmrs::AccountId) {
-        self.mixnet_contract_address = mixnet_contract_address
+        self.nymd
+            .set_mixnet_contract_address(mixnet_contract_address)
     }
 
     pub fn get_mixnet_contract_address(&self) -> cosmrs::AccountId {
-        self.mixnet_contract_address.clone()
+        self.nymd.mixnet_contract_address().clone()
     }
 
     pub async fn get_cached_mixnodes(&self) -> Result<Vec<MixNodeBond>, ValidatorClientError> {
@@ -318,6 +311,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,

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

@@ -1,5 +1,5 @@
 use crate::nymd::error::NymdError;
-use crate::nymd::{NymdClient, QueryNymdClient};
+use crate::nymd::{Config as ClientConfig, NymdClient, QueryNymdClient};
 use crate::ApiClient;
 use network_defaults::all::Network;
 
@@ -54,10 +54,20 @@ fn setup_connection_tests<H: BuildHasher + 'static>(
             .get(&network)
             .expect("No configured contract address")
             .clone();
-        NymdClient::<QueryNymdClient>::connect(url.as_str())
-            .map(|client| client.with_mixnet_contract_address(address))
-            .map(move |client| ClientForConnectionTest::Nymd(network, url, Box::new(client)))
-            .ok()
+        let config = ClientConfig::try_from_nym_network_details(&network.details())
+            .expect("failed to create valid nymd client config");
+
+        if let Ok(mut client) = NymdClient::<QueryNymdClient>::connect(config, url.as_str()) {
+            // possibly redundant, but lets just leave it here
+            client.set_mixnet_contract_address(address);
+            Some(ClientForConnectionTest::Nymd(
+                network,
+                url,
+                Box::new(client),
+            ))
+        } else {
+            None
+        }
     });
 
     let api_connection_test_clients = api_urls.map(|(network, url)| {
@@ -76,7 +86,7 @@ fn extract_and_collect_results_into_map(
         .filter(|c| &c.url_type() == url_type)
         .map(|c| {
             let (network, url, result) = c.result();
-            (*network, (url.clone(), *result))
+            (network.clone(), (url.clone(), *result))
         })
         .into_group_map()
 }

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

@@ -18,4 +18,7 @@ pub enum ValidatorClientError {
     #[cfg(feature = "nymd-client")]
     #[error("There was an issue with the Nymd client - {0}")]
     NymdError(#[from] crate::nymd::error::NymdError),
+
+    #[error("No validator API url has been provided")]
+    NoAPIUrlAvailable,
 }

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

@@ -8,7 +8,7 @@ use crate::nymd::cosmwasm_client::types::*;
 use crate::nymd::error::NymdError;
 use crate::nymd::fee::{Fee, DEFAULT_SIMULATED_GAS_MULTIPLIER};
 use crate::nymd::wallet::DirectSecp256k1HdWallet;
-use crate::nymd::{Coin, GasPrice, TxResponse};
+use crate::nymd::{Coin, GasAdjustable, GasPrice, TxResponse};
 use async_trait::async_trait;
 use cosmrs::bank::MsgSend;
 use cosmrs::distribution::MsgWithdrawDelegatorReward;
@@ -490,28 +490,35 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         fee: Fee,
         memo: &String,
     ) -> Result<tx::Fee, NymdError> {
+        let auto_fee = |multiplier: Option<f32>| async move {
+            debug!("Trying to simulate gas costs...");
+            // from what I've seen in manual testing, gas estimation does not exist if transaction
+            // fails to get executed (for example if you send 'BondMixnode" with invalid signature)
+            let gas_estimation = self
+                .simulate(signer_address, messages.to_vec(), memo.clone())
+                .await?
+                .gas_info
+                .ok_or(NymdError::GasEstimationFailure)?
+                .gas_used;
+
+            let multiplier = multiplier.unwrap_or(DEFAULT_SIMULATED_GAS_MULTIPLIER);
+            let gas = gas_estimation.adjust_gas(multiplier);
+
+            debug!("Gas estimation: {}", gas_estimation);
+            debug!("Multiplying the estimation by {}", multiplier);
+            debug!("Final gas limit used: {}", gas);
+
+            let fee = self.gas_price() * gas;
+            Ok::<tx::Fee, NymdError>(tx::Fee::from_amount_and_gas(fee, gas))
+        };
         let fee = match fee {
             Fee::Manual(fee) => fee,
-            Fee::Auto(multiplier) => {
-                debug!("Trying to simulate gas costs...");
-                // from what I've seen in manual testing, gas estimation does not exist if transaction
-                // fails to get executed (for example if you send 'BondMixnode" with invalid signature)
-                let gas_estimation = self
-                    .simulate(signer_address, messages.to_vec(), memo.clone())
-                    .await?
-                    .gas_info
-                    .ok_or(NymdError::GasEstimationFailure)?
-                    .gas_used;
-
-                let multiplier = multiplier.unwrap_or(DEFAULT_SIMULATED_GAS_MULTIPLIER);
-                let gas = ((gas_estimation.value() as f32 * multiplier) as u64).into();
-
-                debug!("Gas estimation: {}", gas_estimation);
-                debug!("Multiplying the estimation by {}", multiplier);
-                debug!("Final gas limit used: {}", gas);
-
-                let fee = self.gas_price() * gas;
-                tx::Fee::from_amount_and_gas(fee, gas)
+            Fee::Auto(multiplier) => auto_fee(multiplier).await?,
+            Fee::PayerGranterAuto(multiplier, payer, granter) => {
+                let mut fee = auto_fee(multiplier).await?;
+                fee.payer = payer;
+                fee.granter = granter;
+                fee
             }
         };
         debug!("Fee used for the transaction: {:?}", fee);

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

@@ -130,6 +130,9 @@ pub enum NymdError {
 
     #[error("Coconut interface error: {0}")]
     CoconutInterfaceError(#[from] coconut_interface::error::CoconutInterfaceError),
+
+    #[error("Account had an unexpected bech32 prefix. Expected: {expected}, got: {got}")]
+    UnexpectedBech32Prefix { got: String, expected: String },
 }
 
 impl NymdError {

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

@@ -1,17 +1,21 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use cosmrs::tx;
+use crate::nymd::Gas;
+use cosmrs::{tx, AccountId};
 use serde::{Deserialize, Serialize};
 
 pub mod gas_price;
 
-pub const DEFAULT_SIMULATED_GAS_MULTIPLIER: f32 = 1.3;
+pub type GasAdjustment = f32;
+
+pub const DEFAULT_SIMULATED_GAS_MULTIPLIER: GasAdjustment = 1.3;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum Fee {
     Manual(#[serde(with = "sealed::TxFee")] tx::Fee),
-    Auto(Option<f32>),
+    Auto(Option<GasAdjustment>),
+    PayerGranterAuto(Option<GasAdjustment>, Option<AccountId>, Option<AccountId>),
 }
 
 impl From<tx::Fee> for Fee {
@@ -20,8 +24,8 @@ impl From<tx::Fee> for Fee {
     }
 }
 
-impl From<f32> for Fee {
-    fn from(multiplier: f32) -> Self {
+impl From<GasAdjustment> for Fee {
+    fn from(multiplier: GasAdjustment) -> Self {
         Fee::Auto(Some(multiplier))
     }
 }
@@ -32,6 +36,21 @@ impl Default for Fee {
     }
 }
 
+pub trait GasAdjustable {
+    fn adjust_gas(&self, adjustment: GasAdjustment) -> Self;
+}
+
+impl GasAdjustable for Gas {
+    fn adjust_gas(&self, adjustment: GasAdjustment) -> Self {
+        if adjustment == 1.0 {
+            *self
+        } else {
+            let adjusted = (self.value() as f32 * adjustment).ceil();
+            (adjusted as u64).into()
+        }
+    }
+}
+
 // a workaround to provide serde implementation for tx::Fee. We don't want to ever expose any of those
 // types to the public and ideally they will get replaced by proper implementation inside comrs
 mod sealed {

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

@@ -15,19 +15,19 @@ use cosmrs::rpc::HttpClientUrl;
 use cosmrs::tx::Msg;
 use cosmwasm_std::Uint128;
 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;
@@ -48,6 +48,8 @@ pub use cosmrs::tx::{self, Gas};
 pub use cosmrs::Coin as CosmosCoin;
 pub use cosmrs::{bip32, AccountId, Decimal, Denom};
 pub use cosmwasm_std::Coin as CosmWasmCoin;
+pub use fee::{gas_price::GasPrice, GasAdjustable, GasAdjustment};
+use network_defaults::{ChainDetails, NymNetworkDetails};
 pub use signing_client::Client as SigningNymdClient;
 pub use traits::{VestingQueryClient, VestingSigningClient};
 
@@ -58,67 +60,92 @@ pub mod fee;
 pub mod traits;
 pub mod wallet;
 
+#[derive(Debug, Clone)]
+pub struct Config {
+    pub(crate) chain_details: ChainDetails,
+
+    // I'd love to have used `NymContracts` struct directly here instead,
+    // however, I'd really prefer to use something more strongly typed (i.e. AccountId vs String)
+    pub(crate) mixnet_contract_address: Option<AccountId>,
+    pub(crate) vesting_contract_address: Option<AccountId>,
+    pub(crate) bandwidth_claim_contract_address: Option<AccountId>,
+    pub(crate) coconut_bandwidth_contract_address: Option<AccountId>,
+    pub(crate) multisig_contract_address: Option<AccountId>,
+    // TODO: add this in later commits
+    // pub(crate) gas_price: GasPrice,
+}
+
+impl Config {
+    fn parse_optional_account(
+        raw: Option<&String>,
+        expected_prefix: &str,
+    ) -> Result<Option<AccountId>, NymdError> {
+        if let Some(address) = raw {
+            let parsed: AccountId = address
+                .parse()
+                .map_err(|_| NymdError::MalformedAccountAddress(address.clone()))?;
+            if parsed.prefix() != expected_prefix {
+                Err(NymdError::UnexpectedBech32Prefix {
+                    got: parsed.prefix().into(),
+                    expected: expected_prefix.into(),
+                })
+            } else {
+                Ok(Some(parsed))
+            }
+        } else {
+            Ok(None)
+        }
+    }
+
+    pub fn try_from_nym_network_details(details: &NymNetworkDetails) -> Result<Self, NymdError> {
+        let prefix = &details.chain_details.bech32_account_prefix;
+        Ok(Config {
+            chain_details: details.chain_details.clone(),
+            mixnet_contract_address: Self::parse_optional_account(
+                details.contracts.mixnet_contract_address.as_ref(),
+                prefix,
+            )?,
+            vesting_contract_address: Self::parse_optional_account(
+                details.contracts.vesting_contract_address.as_ref(),
+                prefix,
+            )?,
+            bandwidth_claim_contract_address: Self::parse_optional_account(
+                details.contracts.bandwidth_claim_contract_address.as_ref(),
+                prefix,
+            )?,
+            coconut_bandwidth_contract_address: Self::parse_optional_account(
+                details
+                    .contracts
+                    .coconut_bandwidth_contract_address
+                    .as_ref(),
+                prefix,
+            )?,
+            multisig_contract_address: Self::parse_optional_account(
+                details.contracts.multisig_contract_address.as_ref(),
+                prefix,
+            )?,
+        })
+    }
+}
+
 #[derive(Debug)]
 pub struct NymdClient<C> {
     client: C,
-    mixnet_contract_address: AccountId,
-    vesting_contract_address: AccountId,
-    bandwidth_claim_contract_address: AccountId,
-    coconut_bandwidth_contract_address: AccountId,
-    multisig_contract_address: AccountId,
+    config: Config,
     client_address: Option<Vec<AccountId>>,
     simulated_gas_multiplier: f32,
 }
 
-impl<C> NymdClient<C> {
-    pub fn with_mixnet_contract_address(mut self, address: AccountId) -> Self {
-        self.mixnet_contract_address = address;
-        self
-    }
-    pub fn with_vesting_contract_address(mut self, address: AccountId) -> Self {
-        self.vesting_contract_address = address;
-        self
-    }
-    pub fn with_bandwidth_claim_contract_address(mut self, address: AccountId) -> Self {
-        self.bandwidth_claim_contract_address = address;
-        self
-    }
-    pub fn with_coconut_bandwidth_contract_address(mut self, address: AccountId) -> Self {
-        self.coconut_bandwidth_contract_address = address;
-        self
-    }
-    pub fn with_multisig_contract_address(mut self, address: AccountId) -> Self {
-        self.multisig_contract_address = address;
-        self
-    }
-}
-
 impl NymdClient<QueryNymdClient> {
-    pub fn connect<U>(endpoint: U) -> Result<NymdClient<QueryNymdClient>, NymdError>
+    pub fn connect<U>(config: Config, endpoint: U) -> Result<NymdClient<QueryNymdClient>, NymdError>
     where
         U: TryInto<HttpClientUrl, Error = TendermintRpcError>,
     {
         Ok(NymdClient {
             client: QueryNymdClient::new(endpoint)?,
+            config,
             client_address: None,
             simulated_gas_multiplier: DEFAULT_SIMULATED_GAS_MULTIPLIER,
-            mixnet_contract_address: DEFAULT_NETWORK
-                .mixnet_contract_address()
-                .parse()
-                .expect("Error parsing mixnet contract address"),
-            vesting_contract_address: DEFAULT_NETWORK
-                .vesting_contract_address()
-                .parse()
-                .expect("Error parsing vesting contract address"),
-            bandwidth_claim_contract_address: DEFAULT_NETWORK
-                .bandwidth_claim_contract_address()
-                .parse()
-                .expect("Error parsing bandwidth claim contract address"),
-            coconut_bandwidth_contract_address: DEFAULT_NETWORK
-                .coconut_bandwidth_contract_address()
-                .parse()
-                .unwrap(),
-            multisig_contract_address: DEFAULT_NETWORK.multisig_contract_address().parse().unwrap(),
         })
     }
 }
@@ -126,6 +153,7 @@ impl NymdClient<QueryNymdClient> {
 impl NymdClient<SigningNymdClient> {
     // maybe the wallet could be made into a generic, but for now, let's just have this one implementation
     pub fn connect_with_signer<U: Clone>(
+        config: Config,
         network: config::defaults::all::Network,
         endpoint: U,
         signer: DirectSecp256k1HdWallet,
@@ -134,40 +162,24 @@ impl NymdClient<SigningNymdClient> {
     where
         U: TryInto<HttpClientUrl, Error = TendermintRpcError>,
     {
-        let denom = network.denom();
+        let denom = network.base_mix_denom();
         let client_address = signer
             .try_derive_accounts()?
             .into_iter()
             .map(|account| account.address)
             .collect();
-        let gas_price = gas_price.unwrap_or(GasPrice::new_with_default_price(denom)?);
+        let gas_price = gas_price.unwrap_or(GasPrice::new_with_default_price(&denom)?);
 
         Ok(NymdClient {
             client: SigningNymdClient::connect_with_signer(endpoint, signer, gas_price)?,
+            config,
             client_address: Some(client_address),
             simulated_gas_multiplier: DEFAULT_SIMULATED_GAS_MULTIPLIER,
-            mixnet_contract_address: DEFAULT_NETWORK
-                .mixnet_contract_address()
-                .parse()
-                .expect("Error parsing mixnet contract address"),
-            vesting_contract_address: DEFAULT_NETWORK
-                .vesting_contract_address()
-                .parse()
-                .expect("Error parsing vesting contract address"),
-            bandwidth_claim_contract_address: DEFAULT_NETWORK
-                .bandwidth_claim_contract_address()
-                .parse()
-                .expect("Error parsing bandwidth claim contract address"),
-            coconut_bandwidth_contract_address: DEFAULT_NETWORK
-                .coconut_bandwidth_contract_address()
-                .parse()
-                .unwrap(),
-            multisig_contract_address: DEFAULT_NETWORK.multisig_contract_address().parse().unwrap(),
         })
     }
 
     pub fn connect_with_mnemonic<U: Clone>(
-        network: config::defaults::all::Network,
+        config: Config,
         endpoint: U,
         mnemonic: bip39::Mnemonic,
         gas_price: Option<GasPrice>,
@@ -175,8 +187,8 @@ impl NymdClient<SigningNymdClient> {
     where
         U: TryInto<HttpClientUrl, Error = TendermintRpcError>,
     {
-        let prefix = network.bech32_prefix();
-        let denom = network.denom();
+        let prefix = &config.chain_details.bech32_account_prefix;
+        let denom = &config.chain_details.mix_denom.base;
         let wallet = DirectSecp256k1HdWallet::from_mnemonic(prefix, mnemonic)?;
         let client_address = wallet
             .try_derive_accounts()?
@@ -187,48 +199,82 @@ impl NymdClient<SigningNymdClient> {
 
         Ok(NymdClient {
             client: SigningNymdClient::connect_with_signer(endpoint, wallet, gas_price)?,
+            config,
             client_address: Some(client_address),
             simulated_gas_multiplier: DEFAULT_SIMULATED_GAS_MULTIPLIER,
-            mixnet_contract_address: network
-                .mixnet_contract_address()
-                .parse()
-                .expect("Error parsing mixnet contract address"),
-            vesting_contract_address: network
-                .vesting_contract_address()
-                .parse()
-                .expect("Error parsing vesting contract address"),
-            bandwidth_claim_contract_address: network
-                .bandwidth_claim_contract_address()
-                .parse()
-                .expect("Error parsing bandwidth claim contract address"),
-            coconut_bandwidth_contract_address: network
-                .coconut_bandwidth_contract_address()
-                .parse()
-                .unwrap(),
-            multisig_contract_address: network.multisig_contract_address().parse().unwrap(),
         })
     }
 }
 
 impl<C> NymdClient<C> {
+    pub fn current_config(&self) -> &Config {
+        &self.config
+    }
+
+    pub fn set_mixnet_contract_address(&mut self, address: AccountId) {
+        self.config.mixnet_contract_address = Some(address);
+    }
+
+    pub fn set_vesting_contract_address(&mut self, address: AccountId) {
+        self.config.vesting_contract_address = Some(address);
+    }
+
+    pub fn set_bandwidth_claim_contract_address(&mut self, address: AccountId) {
+        self.config.bandwidth_claim_contract_address = Some(address);
+    }
+
+    pub fn set_coconut_bandwidth_contract_address(&mut self, address: AccountId) {
+        self.config.coconut_bandwidth_contract_address = Some(address);
+    }
+
+    pub fn set_multisig_contract_address(&mut self, address: AccountId) {
+        self.config.multisig_contract_address = Some(address);
+    }
+
+    // TODO: this should get changed into Result<&AccountId, NymdError> (or Option<&AccountId> in future commits
+    // note: what unwrap is doing here is just moving a failure that would have normally
+    // occurred in `connect` when attempting to parse an empty address,
+    // so it's not introducing new source of failure (just moves it)
     pub fn mixnet_contract_address(&self) -> &AccountId {
-        &self.mixnet_contract_address
+        self.config.mixnet_contract_address.as_ref().unwrap()
     }
 
+    // TODO: this should get changed into Result<&AccountId, NymdError> (or Option<&AccountId> in future commits
+    // note: what unwrap is doing here is just moving a failure that would have normally
+    // occurred in `connect` when attempting to parse an empty address,
+    // so it's not introducing new source of failure (just moves it)
     pub fn vesting_contract_address(&self) -> &AccountId {
-        &self.vesting_contract_address
+        self.config.vesting_contract_address.as_ref().unwrap()
     }
 
+    // TODO: this should get changed into Result<&AccountId, NymdError> (or Option<&AccountId> in future commits
+    // note: what unwrap is doing here is just moving a failure that would have normally
+    // occurred in `connect` when attempting to parse an empty address,
+    // so it's not introducing new source of failure (just moves it)
     pub fn bandwidth_claim_contract_address(&self) -> &AccountId {
-        &self.bandwidth_claim_contract_address
+        self.config
+            .bandwidth_claim_contract_address
+            .as_ref()
+            .unwrap()
     }
 
+    // TODO: this should get changed into Result<&AccountId, NymdError> (or Option<&AccountId> in future commits
+    // note: what unwrap is doing here is just moving a failure that would have normally
+    // occurred in `connect` when attempting to parse an empty address,
+    // so it's not introducing new source of failure (just moves it)
     pub fn coconut_bandwidth_contract_address(&self) -> &AccountId {
-        &self.coconut_bandwidth_contract_address
+        self.config
+            .coconut_bandwidth_contract_address
+            .as_ref()
+            .unwrap()
     }
 
+    // TODO: this should get changed into Result<&AccountId, NymdError> (or Option<&AccountId> in future commits
+    // note: what unwrap is doing here is just moving a failure that would have normally
+    // occurred in `connect` when attempting to parse an empty address,
+    // so it's not introducing new source of failure (just moves it)
     pub fn multisig_contract_address(&self) -> &AccountId {
-        &self.multisig_contract_address
+        self.config.multisig_contract_address.as_ref().unwrap()
     }
 
     pub fn set_simulated_gas_multiplier(&mut self, multiplier: f32) {
@@ -268,6 +314,10 @@ impl<C> NymdClient<C> {
         self.client.gas_price()
     }
 
+    pub fn gas_adjustment(&self) -> GasAdjustment {
+        self.simulated_gas_multiplier
+    }
+
     pub async fn account_sequence(&self) -> Result<SequenceResponse, NymdError>
     where
         C: SigningCosmWasmClient + Sync,
@@ -380,6 +430,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,
@@ -426,6 +486,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,
@@ -595,6 +665,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>,
@@ -949,6 +1051,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,

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

@@ -49,7 +49,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> MultisigSigningClient for NymdClien
     ) -> Result<ExecuteResult, NymdError> {
         let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
         let release_funds_req = CoconutBandwidthExecuteMsg::ReleaseFunds {
-            funds: Coin::new(voucher_value, DEFAULT_NETWORK.denom()),
+            funds: Coin::new(voucher_value, DEFAULT_NETWORK.mix_denom().base),
         };
         let release_funds_msg = CosmosMsg::Wasm(WasmMsg::Execute {
             contract_addr: self.coconut_bandwidth_contract_address().to_string(),

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

@@ -214,7 +214,7 @@ mod tests {
         ];
 
         for prefix in prefixes {
-            let addrs = match prefix {
+            let addrs = match prefix.as_ref() {
                 "nymt" => vec![
                     "nymt1jw6mp7d5xqc7w6xm79lha27glmd0vdt339me94",
                     "nymt1h5hgn94nsq4kh99rjj794hr5h5q6yfm23rjshv",
@@ -229,7 +229,7 @@ mod tests {
             };
             for (idx, mnemonic) in mnemonics.iter().enumerate() {
                 let wallet =
-                    DirectSecp256k1HdWallet::from_mnemonic(prefix, mnemonic.parse().unwrap())
+                    DirectSecp256k1HdWallet::from_mnemonic(&prefix, mnemonic.parse().unwrap())
                         .unwrap();
                 assert_eq!(
                     wallet.try_derive_accounts().unwrap()[0].address,

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

@@ -3,15 +3,15 @@
 
 use crate::validator_api::error::ValidatorAPIError;
 use crate::validator_api::routes::{CORE_STATUS_COUNT, SINCE_ARG};
-use coconut_interface::{
-    BlindSignRequestBody, BlindedSignatureResponse, ExecuteReleaseFundsRequestBody,
-    ProposeReleaseFundsRequestBody, ProposeReleaseFundsResponse, VerificationKeyResponse,
-    VerifyCredentialBody, VerifyCredentialResponse,
-};
 use mixnet_contract_common::{GatewayBond, IdentityKeyRef, MixNodeBond};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use url::Url;
+use validator_api_requests::coconut::{
+    BlindSignRequestBody, BlindedSignatureResponse, CosmosAddressResponse,
+    ExecuteReleaseFundsRequestBody, ProposeReleaseFundsRequestBody, ProposeReleaseFundsResponse,
+    VerificationKeyResponse, VerifyCredentialBody, VerifyCredentialResponse,
+};
 use validator_api_requests::models::{
     CoreNodeStatusResponse, InclusionProbabilityResponse, MixNodeBondAnnotated,
     MixnodeStatusResponse, RewardEstimationResponse, StakeSaturationResponse, UptimeResponse,
@@ -376,6 +376,19 @@ impl Client {
         .await
     }
 
+    pub async fn get_cosmos_address(&self) -> Result<CosmosAddressResponse, ValidatorAPIError> {
+        self.query_validator_api(
+            &[
+                routes::API_VERSION,
+                routes::COCONUT_ROUTES,
+                routes::BANDWIDTH,
+                routes::COCONUT_COSMOS_ADDRESS,
+            ],
+            NO_PARAMS,
+        )
+        .await
+    }
+
     pub async fn verify_bandwidth_credential(
         &self,
         request_body: &VerifyCredentialBody,

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

@@ -17,6 +17,7 @@ pub const BANDWIDTH: &str = "bandwidth";
 pub const COCONUT_BLIND_SIGN: &str = "blind-sign";
 pub const COCONUT_PARTIAL_BANDWIDTH_CREDENTIAL: &str = "partial-bandwidth-credential";
 pub const COCONUT_VERIFICATION_KEY: &str = "verification-key";
+pub const COCONUT_COSMOS_ADDRESS: &str = "cosmos-address";
 pub const COCONUT_VERIFY_BANDWIDTH_CREDENTIAL: &str = "verify-bandwidth-credential";
 pub const COCONUT_PROPOSE_RELEASE_FUNDS: &str = "propose-release-funds";
 pub const COCONUT_EXECUTE_RELEASE_FUNDS: &str = "execute-release-funds";

common/coconut-interface/src/lib.rs

@@ -127,171 +127,6 @@ impl Bytable for Credential {
 
 impl Base58 for Credential {}
 
-#[derive(Serialize, Deserialize, Getters, CopyGetters)]
-pub struct VerifyCredentialBody {
-    #[getset(get = "pub")]
-    credential: Credential,
-    #[getset(get = "pub")]
-    proposal_id: u64,
-}
-
-impl VerifyCredentialBody {
-    pub fn new(credential: Credential, proposal_id: u64) -> VerifyCredentialBody {
-        VerifyCredentialBody {
-            credential,
-            proposal_id,
-        }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct VerifyCredentialResponse {
-    pub verification_result: bool,
-}
-
-impl VerifyCredentialResponse {
-    pub fn new(verification_result: bool) -> Self {
-        VerifyCredentialResponse {
-            verification_result,
-        }
-    }
-}
-
-//  All strings are base58 encoded representations of structs
-#[derive(Clone, Serialize, Deserialize, Debug, Getters, CopyGetters)]
-pub struct BlindSignRequestBody {
-    #[getset(get = "pub")]
-    blind_sign_request: BlindSignRequest,
-    #[getset(get = "pub")]
-    tx_hash: String,
-    #[getset(get = "pub")]
-    signature: String,
-    public_attributes: Vec<String>,
-    #[getset(get = "pub")]
-    public_attributes_plain: Vec<String>,
-    #[getset(get = "pub")]
-    total_params: u32,
-}
-
-impl BlindSignRequestBody {
-    pub fn new(
-        blind_sign_request: &BlindSignRequest,
-        tx_hash: String,
-        signature: String,
-        public_attributes: &[Attribute],
-        public_attributes_plain: Vec<String>,
-        total_params: u32,
-    ) -> BlindSignRequestBody {
-        BlindSignRequestBody {
-            blind_sign_request: blind_sign_request.clone(),
-            tx_hash,
-            signature,
-            public_attributes: public_attributes
-                .iter()
-                .map(|attr| attr.to_bs58())
-                .collect(),
-            public_attributes_plain,
-            total_params,
-        }
-    }
-
-    pub fn public_attributes(&self) -> Vec<Attribute> {
-        self.public_attributes
-            .iter()
-            .map(|x| Attribute::try_from_bs58(x).unwrap())
-            .collect()
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct BlindedSignatureResponse {
-    pub remote_key: [u8; 32],
-    pub encrypted_signature: Vec<u8>,
-}
-
-impl BlindedSignatureResponse {
-    pub fn new(encrypted_signature: Vec<u8>, remote_key: [u8; 32]) -> BlindedSignatureResponse {
-        BlindedSignatureResponse {
-            encrypted_signature,
-            remote_key,
-        }
-    }
-
-    pub fn to_base58_string(&self) -> String {
-        bs58::encode(&self.to_bytes()).into_string()
-    }
-
-    pub fn from_base58_string<I: AsRef<[u8]>>(val: I) -> Result<Self, CoconutInterfaceError> {
-        let bytes = bs58::decode(val).into_vec()?;
-        Self::from_bytes(&bytes)
-    }
-
-    pub fn to_bytes(&self) -> Vec<u8> {
-        let mut bytes = self.remote_key.to_vec();
-        bytes.extend_from_slice(&self.encrypted_signature);
-        bytes
-    }
-
-    pub fn from_bytes(bytes: &[u8]) -> Result<Self, CoconutInterfaceError> {
-        if bytes.len() < 32 {
-            return Err(CoconutInterfaceError::InvalidByteLength(bytes.len(), 32));
-        }
-        let mut remote_key = [0u8; 32];
-        remote_key.copy_from_slice(&bytes[..32]);
-        let encrypted_signature = bytes[32..].to_vec();
-        Ok(BlindedSignatureResponse {
-            remote_key,
-            encrypted_signature,
-        })
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct VerificationKeyResponse {
-    pub key: VerificationKey,
-}
-
-impl VerificationKeyResponse {
-    pub fn new(key: VerificationKey) -> VerificationKeyResponse {
-        VerificationKeyResponse { key }
-    }
-}
-
-#[derive(Serialize, Deserialize, Getters, CopyGetters)]
-pub struct ProposeReleaseFundsRequestBody {
-    #[getset(get = "pub")]
-    credential: Credential,
-}
-
-impl ProposeReleaseFundsRequestBody {
-    pub fn new(credential: Credential) -> Self {
-        ProposeReleaseFundsRequestBody { credential }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ProposeReleaseFundsResponse {
-    pub proposal_id: u64,
-}
-
-impl ProposeReleaseFundsResponse {
-    pub fn new(proposal_id: u64) -> Self {
-        ProposeReleaseFundsResponse { proposal_id }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize, Getters, CopyGetters)]
-pub struct ExecuteReleaseFundsRequestBody {
-    #[getset(get = "pub")]
-    proposal_id: u64,
-}
-
-impl ExecuteReleaseFundsRequestBody {
-    pub fn new(proposal_id: u64) -> Self {
-        ExecuteReleaseFundsRequestBody { proposal_id }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

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

@@ -136,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::*;

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

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

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

@@ -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::*;

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

@@ -431,6 +431,7 @@ impl MixNodeBond {
 
     pub fn estimate_reward(
         &self,
+        base_operator_cost: u64,
         params: &RewardParams,
     ) -> Result<RewardEstimate, MixnetContractError> {
         let total_node_reward = self
@@ -439,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);
 
@@ -479,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)
@@ -521,11 +526,16 @@ impl MixNodeBond {
         }
     }
 
-    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)
@@ -635,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::*;

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

@@ -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 {},

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

@@ -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,6 +77,7 @@ 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
@@ -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() {
@@ -160,6 +165,14 @@ impl EpochRewardParams {
     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)]
@@ -178,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 {

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

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

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

@@ -1,6 +1,6 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
-use config::defaults::DENOM;
+use config::defaults::MIX_DENOM;
 use cosmwasm_std::{Coin, Timestamp};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -11,7 +11,7 @@ pub mod events;
 pub mod messages;
 
 pub fn one_ucoin() -> Coin {
-    Coin::new(1, DENOM)
+    Coin::new(1, MIX_DENOM.base)
 }
 
 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]

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

@@ -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 {},
 }

common/credential-storage/Cargo.toml

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

common/credentials/Cargo.toml

@@ -15,10 +15,11 @@ url = "2.2"
 coconut-interface = { path = "../coconut-interface" }
 crypto = { path = "../crypto", features = ["rand", "asymmetric", "symmetric", "hashing"] }
 network-defaults = { path = "../network-defaults" }
+validator-api-requests = { path = "../../validator-api/validator-api-requests" }
 validator-client = { path = "../client-libs/validator-client" }
 
 [dev-dependencies]
 rand = "0.7.3"
 
 [features]
-coconut = ["cosmrs"]
+coconut = ["cosmrs"]

common/credentials/src/coconut/utils.rs

@@ -3,13 +3,13 @@
 
 use coconut_interface::{
     aggregate_signature_shares, aggregate_verification_keys, prove_bandwidth_credential, Attribute,
-    BlindSignRequestBody, BlindedSignature, Credential, Parameters, Signature, SignatureShare,
-    VerificationKey,
+    BlindedSignature, Credential, Parameters, Signature, SignatureShare, VerificationKey,
 };
 use crypto::asymmetric::encryption::PublicKey;
 use crypto::shared_key::recompute_shared_key;
 use crypto::symmetric::stream_cipher;
 use url::Url;
+use validator_api_requests::coconut::BlindSignRequestBody;
 
 use crate::coconut::bandwidth::{BandwidthVoucher, PRIVATE_ATTRIBUTES, PUBLIC_ATTRIBUTES};
 use crate::coconut::params::{

common/crypto/dkg/Cargo.toml

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

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

@@ -458,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();
 

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

@@ -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();
 

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

@@ -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);

common/crypto/dkg/src/dealing.rs

@@ -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);

common/crypto/dkg/tests/integration.rs

@@ -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);

common/network-defaults/src/all.rs

@@ -1,13 +1,12 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::{
+    DefaultNetworkDetails, DenomDetailsOwned, NymNetworkDetails, ValidatorDetails,
+    MAINNET_DEFAULTS, QA_DEFAULTS, SANDBOX_DEFAULTS,
+};
 use serde::{Deserialize, Serialize};
 use std::{collections::HashMap, fmt, str::FromStr};
-
-use crate::{
-    DefaultNetworkDetails, ValidatorDetails, MAINNET_DEFAULTS, QA_DEFAULTS, SANDBOX_DEFAULTS,
-};
-
 use thiserror::Error;
 
 #[derive(Error, Debug)]
@@ -16,56 +15,95 @@ pub enum NetworkDefaultsError {
     MalformedNetworkProvided(String),
 }
 
-#[derive(Copy, Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
+// the reason for allowing it is that this is just a temporary solution
+#[allow(clippy::large_enum_variant)]
+#[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
 pub enum Network {
     QA,
     SANDBOX,
     MAINNET,
+    CUSTOM { details: NymNetworkDetails },
 }
 
 impl Network {
-    fn details(&self) -> &DefaultNetworkDetails<'_> {
+    pub fn new_custom(details: NymNetworkDetails) -> Self {
+        Network::CUSTOM { details }
+    }
+
+    pub fn details(&self) -> NymNetworkDetails {
         match self {
-            Self::QA => &QA_DEFAULTS,
-            Self::SANDBOX => &SANDBOX_DEFAULTS,
-            Self::MAINNET => &MAINNET_DEFAULTS,
+            Self::QA => (&*QA_DEFAULTS).into(),
+            Self::SANDBOX => (&*SANDBOX_DEFAULTS).into(),
+            Self::MAINNET => (&*MAINNET_DEFAULTS).into(),
+            // I dislike the clone here, but for compatibility reasons we cannot define other networks with `NymNetworkDetails` directly yet
+            Self::CUSTOM { details } => details.clone(),
         }
     }
 
-    pub fn bech32_prefix(&self) -> &str {
-        self.details().bech32_prefix
+    pub fn bech32_prefix(&self) -> String {
+        self.details().chain_details.bech32_account_prefix
     }
 
-    pub fn denom(&self) -> &str {
-        self.details().denom
+    pub fn mix_denom(&self) -> DenomDetailsOwned {
+        self.details().chain_details.mix_denom
     }
 
-    pub fn mixnet_contract_address(&self) -> &str {
-        self.details().mixnet_contract_address
+    pub fn stake_denom(&self) -> DenomDetailsOwned {
+        self.details().chain_details.stake_denom
     }
 
-    pub fn vesting_contract_address(&self) -> &str {
-        self.details().vesting_contract_address
+    pub fn base_mix_denom(&self) -> String {
+        self.details().chain_details.mix_denom.base
     }
 
-    pub fn bandwidth_claim_contract_address(&self) -> &str {
-        self.details().bandwidth_claim_contract_address
+    pub fn base_stake_denom(&self) -> String {
+        self.details().chain_details.stake_denom.base
     }
 
-    pub fn coconut_bandwidth_contract_address(&self) -> &str {
-        self.details().coconut_bandwidth_contract_address
+    pub fn mixnet_contract_address(&self) -> Option<String> {
+        self.details().contracts.mixnet_contract_address
     }
 
-    pub fn multisig_contract_address(&self) -> &str {
-        self.details().multisig_contract_address
+    pub fn vesting_contract_address(&self) -> Option<String> {
+        self.details().contracts.vesting_contract_address
     }
 
+    pub fn bandwidth_claim_contract_address(&self) -> Option<String> {
+        self.details().contracts.bandwidth_claim_contract_address
+    }
+
+    pub fn coconut_bandwidth_contract_address(&self) -> Option<String> {
+        self.details().contracts.coconut_bandwidth_contract_address
+    }
+
+    pub fn multisig_contract_address(&self) -> Option<String> {
+        self.details().contracts.multisig_contract_address
+    }
+
+    pub fn validators(&self) -> Vec<ValidatorDetails> {
+        self.details().endpoints
+    }
+
+    // only used in mixnet contract tests, but I don't want to be messing with that code now
     pub fn rewarding_validator_address(&self) -> &str {
-        self.details().rewarding_validator_address
+        match self {
+            Network::QA => crate::qa::REWARDING_VALIDATOR_ADDRESS,
+            Network::SANDBOX => crate::sandbox::REWARDING_VALIDATOR_ADDRESS,
+            Network::MAINNET => crate::mainnet::REWARDING_VALIDATOR_ADDRESS,
+            Network::CUSTOM { .. } => {
+                panic!("rewarding validator address is unavailable for a custom network")
+            }
+        }
     }
 
-    pub fn validators(&self) -> impl Iterator<Item = &ValidatorDetails> {
-        self.details().validators.iter()
+    // this should be handled differently, but I don't want to break compatibility
+    pub fn statistics_service_url(&self) -> &str {
+        match self {
+            Network::MAINNET => crate::mainnet::STATISTICS_SERVICE_DOMAIN_ADDRESS,
+            _ => {
+                panic!("statistics service url is only available for mainnet!")
+            }
+        }
     }
 }
 
@@ -90,6 +128,7 @@ impl fmt::Display for Network {
             Network::QA => f.write_str("QA"),
             Network::SANDBOX => f.write_str("Sandbox"),
             Network::MAINNET => f.write_str("Mainnet"),
+            Network::CUSTOM { .. } => f.write_str("Custom"),
         }
     }
 }
@@ -97,26 +136,61 @@ impl fmt::Display for Network {
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
 pub struct NetworkDetails {
     bech32_prefix: String,
-    denom: String,
+    mix_denom: DenomDetailsOwned,
+    stake_denom: DenomDetailsOwned,
     mixnet_contract_address: String,
     vesting_contract_address: String,
     bandwidth_claim_contract_address: String,
+    statistics_service_url: String,
     validators: Vec<ValidatorDetails>,
 }
 
-impl From<&DefaultNetworkDetails<'_>> for NetworkDetails {
-    fn from(details: &DefaultNetworkDetails<'_>) -> Self {
+impl From<&DefaultNetworkDetails> for NetworkDetails {
+    fn from(details: &DefaultNetworkDetails) -> Self {
         NetworkDetails {
             bech32_prefix: details.bech32_prefix.into(),
-            denom: details.denom.into(),
+            mix_denom: details.mix_denom.into(),
+            stake_denom: details.stake_denom.into(),
             mixnet_contract_address: details.mixnet_contract_address.into(),
             vesting_contract_address: details.vesting_contract_address.into(),
             bandwidth_claim_contract_address: details.bandwidth_claim_contract_address.into(),
+            statistics_service_url: details.statistics_service_url.into(),
             validators: details.validators.clone(),
         }
     }
 }
 
+// this also has to exist for compatibility reasons since I don't want to be touching the wallet now
+impl From<NymNetworkDetails> for NetworkDetails {
+    fn from(details: NymNetworkDetails) -> Self {
+        NetworkDetails {
+            bech32_prefix: details.chain_details.bech32_account_prefix,
+            mix_denom: details.chain_details.mix_denom,
+            stake_denom: details.chain_details.stake_denom,
+            mixnet_contract_address: details
+                .contracts
+                .mixnet_contract_address
+                .unwrap_or_default(),
+            vesting_contract_address: details
+                .contracts
+                .vesting_contract_address
+                .unwrap_or_default(),
+            bandwidth_claim_contract_address: details
+                .contracts
+                .bandwidth_claim_contract_address
+                .unwrap_or_default(),
+            statistics_service_url: "".to_string(),
+            validators: details.endpoints,
+        }
+    }
+}
+
+impl NetworkDetails {
+    pub fn base_mix_denom(&self) -> &str {
+        &self.mix_denom.base
+    }
+}
+
 #[derive(Clone, Debug, Default, Deserialize, Serialize, PartialEq, Eq)]
 pub struct SupportedNetworks {
     networks: HashMap<Network, NetworkDetails>,
@@ -127,7 +201,10 @@ impl SupportedNetworks {
         SupportedNetworks {
             networks: support
                 .into_iter()
-                .map(|n| (n, n.details().into()))
+                .map(|n| {
+                    let details = n.details().into();
+                    (n, details)
+                })
                 .collect(),
         }
     }
@@ -138,10 +215,10 @@ impl SupportedNetworks {
             .map(|network_details| network_details.bech32_prefix.as_str())
     }
 
-    pub fn denom(&self, network: Network) -> Option<&str> {
+    pub fn base_mix_denom(&self, network: Network) -> Option<&str> {
         self.networks
             .get(&network)
-            .map(|network_details| network_details.denom.as_str())
+            .map(|network_details| network_details.base_mix_denom())
     }
 
     pub fn mixnet_contract_address(&self, network: Network) -> Option<&str> {

common/network-defaults/src/lib.rs

@@ -17,105 +17,306 @@ pub mod sandbox;
 cfg_if::cfg_if! {
     if #[cfg(network = "mainnet")] {
         pub const DEFAULT_NETWORK: all::Network = all::Network::MAINNET;
-        pub const DENOM: &str = mainnet::DENOM;
-        pub const STAKE_DENOM: &str = mainnet::STAKE_DENOM;
+        pub const MIX_DENOM: DenomDetails = mainnet::MIX_DENOM;
+        pub const STAKE_DENOM: DenomDetails = mainnet::STAKE_DENOM;
 
         pub const ETH_CONTRACT_ADDRESS: [u8; 20] = mainnet::_ETH_CONTRACT_ADDRESS;
         pub const ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] = mainnet::_ETH_ERC20_CONTRACT_ADDRESS;
 
     } else if #[cfg(network = "qa")] {
         pub const DEFAULT_NETWORK: all::Network = all::Network::QA;
-        pub const DENOM: &str = qa::DENOM;
-        pub const STAKE_DENOM: &str = qa::STAKE_DENOM;
+        pub const MIX_DENOM: DenomDetails = qa::MIX_DENOM;
+        pub const STAKE_DENOM: DenomDetails = qa::STAKE_DENOM;
 
         pub const ETH_CONTRACT_ADDRESS: [u8; 20] = qa::_ETH_CONTRACT_ADDRESS;
         pub const ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] = qa::_ETH_ERC20_CONTRACT_ADDRESS;
 
     } else if #[cfg(network = "sandbox")] {
         pub const DEFAULT_NETWORK: all::Network = all::Network::SANDBOX;
-        pub const DENOM: &str = sandbox::DENOM;
-        pub const STAKE_DENOM: &str = sandbox::STAKE_DENOM;
+        pub const MIX_DENOM: DenomDetails = sandbox::MIX_DENOM;
+        pub const STAKE_DENOM: DenomDetails = sandbox::STAKE_DENOM;
 
         pub const ETH_CONTRACT_ADDRESS: [u8; 20] = sandbox::_ETH_CONTRACT_ADDRESS;
         pub const ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] = sandbox::_ETH_ERC20_CONTRACT_ADDRESS;
     }
 }
 
+#[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
+pub struct ChainDetails {
+    pub bech32_account_prefix: String,
+    pub mix_denom: DenomDetailsOwned,
+    pub stake_denom: DenomDetailsOwned,
+}
+
+// by default we assume the same defaults as mainnet, i.e. same prefixes and denoms
+impl Default for ChainDetails {
+    fn default() -> Self {
+        ChainDetails {
+            bech32_account_prefix: mainnet::BECH32_PREFIX.into(),
+            mix_denom: mainnet::MIX_DENOM.into(),
+            stake_denom: mainnet::STAKE_DENOM.into(),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Eq, Hash, PartialEq, Serialize)]
+pub struct NymContracts {
+    pub mixnet_contract_address: Option<String>,
+    pub vesting_contract_address: Option<String>,
+    pub bandwidth_claim_contract_address: Option<String>,
+    pub coconut_bandwidth_contract_address: Option<String>,
+    pub multisig_contract_address: Option<String>,
+}
+
+// I wanted to use the simpler `NetworkDetails` name, but there's a clash
+// with `NetworkDetails` defined in all.rs...
+#[derive(Clone, Debug, Default, Deserialize, Eq, Hash, PartialEq, Serialize)]
+pub struct NymNetworkDetails {
+    pub chain_details: ChainDetails,
+    pub endpoints: Vec<ValidatorDetails>,
+    pub contracts: NymContracts,
+}
+
+impl NymNetworkDetails {
+    pub fn new() -> Self {
+        NymNetworkDetails::default()
+    }
+
+    pub fn new_qa() -> Self {
+        (&*QA_DEFAULTS).into()
+    }
+
+    pub fn new_sandbox() -> Self {
+        (&*SANDBOX_DEFAULTS).into()
+    }
+
+    pub fn new_mainnet() -> Self {
+        (&*MAINNET_DEFAULTS).into()
+    }
+
+    pub fn current_default() -> Self {
+        // backwards compatibility reasons
+        DEFAULT_NETWORK.details()
+    }
+
+    pub fn with_bech32_account_prefix<S: Into<String>>(mut self, prefix: S) -> Self {
+        self.chain_details.bech32_account_prefix = prefix.into();
+        self
+    }
+
+    pub fn with_mix_denom(mut self, mix_denom: DenomDetailsOwned) -> Self {
+        self.chain_details.mix_denom = mix_denom;
+        self
+    }
+
+    pub fn with_stake_denom(mut self, stake_denom: DenomDetailsOwned) -> Self {
+        self.chain_details.stake_denom = stake_denom;
+        self
+    }
+
+    pub fn with_base_mix_denom<S: Into<String>>(mut self, base_mix_denom: S) -> Self {
+        self.chain_details.mix_denom = DenomDetailsOwned::base_only(base_mix_denom.into());
+        self
+    }
+
+    pub fn with_base_stake_denom<S: Into<String>>(mut self, base_stake_denom: S) -> Self {
+        self.chain_details.stake_denom = DenomDetailsOwned::base_only(base_stake_denom.into());
+        self
+    }
+
+    pub fn with_validator_endpoint(mut self, endpoint: ValidatorDetails) -> Self {
+        self.endpoints.push(endpoint);
+        self
+    }
+
+    pub fn with_mixnet_contract<S: Into<String>>(mut self, contract: Option<S>) -> Self {
+        self.contracts.mixnet_contract_address = contract.map(Into::into);
+        self
+    }
+
+    pub fn with_vesting_contract<S: Into<String>>(mut self, contract: Option<S>) -> Self {
+        self.contracts.vesting_contract_address = contract.map(Into::into);
+        self
+    }
+
+    pub fn with_bandwidth_claim_contract<S: Into<String>>(mut self, contract: Option<S>) -> Self {
+        self.contracts.bandwidth_claim_contract_address = contract.map(Into::into);
+        self
+    }
+
+    pub fn with_coconut_bandwidth_contract<S: Into<String>>(mut self, contract: Option<S>) -> Self {
+        self.contracts.coconut_bandwidth_contract_address = contract.map(Into::into);
+        self
+    }
+
+    pub fn with_multisig_contract<S: Into<String>>(mut self, contract: Option<S>) -> Self {
+        self.contracts.multisig_contract_address = contract.map(Into::into);
+        self
+    }
+}
+
+// This conversion only exists for convenience reasons until
+// we can completely phase out `DefaultNetworkDetails`
+impl<'a> From<&'a DefaultNetworkDetails> for NymNetworkDetails {
+    fn from(details: &'a DefaultNetworkDetails) -> Self {
+        fn parse_optional_str(raw: &str) -> Option<String> {
+            if raw.is_empty() {
+                None
+            } else {
+                Some(raw.into())
+            }
+        }
+
+        NymNetworkDetails {
+            chain_details: ChainDetails {
+                bech32_account_prefix: details.bech32_prefix.into(),
+                mix_denom: details.mix_denom.into(),
+                stake_denom: details.stake_denom.into(),
+            },
+            endpoints: details.validators.clone(),
+            contracts: NymContracts {
+                mixnet_contract_address: parse_optional_str(details.mixnet_contract_address),
+                vesting_contract_address: parse_optional_str(details.vesting_contract_address),
+                bandwidth_claim_contract_address: parse_optional_str(
+                    details.bandwidth_claim_contract_address,
+                ),
+                coconut_bandwidth_contract_address: parse_optional_str(
+                    details.coconut_bandwidth_contract_address,
+                ),
+                multisig_contract_address: parse_optional_str(details.multisig_contract_address),
+            },
+        }
+    }
+}
+
 // Since these are lazily constructed, we can afford to switch some of them to stronger types in the
 // future. If we do this, and also get rid of the references we could potentially unify with
 // `NetworkDetails`.
-#[derive(Debug)]
-pub struct DefaultNetworkDetails<'a> {
-    bech32_prefix: &'a str,
-    denom: &'a str,
-    mixnet_contract_address: &'a str,
-    vesting_contract_address: &'a str,
-    bandwidth_claim_contract_address: &'a str,
-    coconut_bandwidth_contract_address: &'a str,
-    multisig_contract_address: &'a str,
-    rewarding_validator_address: &'a str,
+pub struct DefaultNetworkDetails {
+    bech32_prefix: &'static str,
+    mix_denom: DenomDetails,
+    stake_denom: DenomDetails,
+    mixnet_contract_address: &'static str,
+    vesting_contract_address: &'static str,
+    bandwidth_claim_contract_address: &'static str,
+    coconut_bandwidth_contract_address: &'static str,
+    multisig_contract_address: &'static str,
+    #[allow(dead_code)]
+    rewarding_validator_address: &'static str,
+    statistics_service_url: &'static str,
     validators: Vec<ValidatorDetails>,
 }
 
-static MAINNET_DEFAULTS: Lazy<DefaultNetworkDetails<'static>> =
-    Lazy::new(|| DefaultNetworkDetails {
-        bech32_prefix: mainnet::BECH32_PREFIX,
-        denom: mainnet::DENOM,
-        mixnet_contract_address: mainnet::MIXNET_CONTRACT_ADDRESS,
-        vesting_contract_address: mainnet::VESTING_CONTRACT_ADDRESS,
-        bandwidth_claim_contract_address: mainnet::BANDWIDTH_CLAIM_CONTRACT_ADDRESS,
-        coconut_bandwidth_contract_address: mainnet::COCONUT_BANDWIDTH_CONTRACT_ADDRESS,
-        multisig_contract_address: mainnet::MULTISIG_CONTRACT_ADDRESS,
-        rewarding_validator_address: mainnet::REWARDING_VALIDATOR_ADDRESS,
-        validators: mainnet::validators(),
-    });
+static MAINNET_DEFAULTS: Lazy<DefaultNetworkDetails> = Lazy::new(|| DefaultNetworkDetails {
+    bech32_prefix: mainnet::BECH32_PREFIX,
+    mix_denom: mainnet::MIX_DENOM,
+    stake_denom: mainnet::STAKE_DENOM,
+    mixnet_contract_address: mainnet::MIXNET_CONTRACT_ADDRESS,
+    vesting_contract_address: mainnet::VESTING_CONTRACT_ADDRESS,
+    bandwidth_claim_contract_address: mainnet::BANDWIDTH_CLAIM_CONTRACT_ADDRESS,
+    coconut_bandwidth_contract_address: mainnet::COCONUT_BANDWIDTH_CONTRACT_ADDRESS,
+    multisig_contract_address: mainnet::MULTISIG_CONTRACT_ADDRESS,
+    rewarding_validator_address: mainnet::REWARDING_VALIDATOR_ADDRESS,
+    statistics_service_url: mainnet::STATISTICS_SERVICE_DOMAIN_ADDRESS,
+    validators: mainnet::validators(),
+});
 
-static SANDBOX_DEFAULTS: Lazy<DefaultNetworkDetails<'static>> =
-    Lazy::new(|| DefaultNetworkDetails {
-        bech32_prefix: sandbox::BECH32_PREFIX,
-        denom: sandbox::DENOM,
-        mixnet_contract_address: sandbox::MIXNET_CONTRACT_ADDRESS,
-        vesting_contract_address: sandbox::VESTING_CONTRACT_ADDRESS,
-        bandwidth_claim_contract_address: sandbox::BANDWIDTH_CLAIM_CONTRACT_ADDRESS,
-        coconut_bandwidth_contract_address: sandbox::COCONUT_BANDWIDTH_CONTRACT_ADDRESS,
-        multisig_contract_address: sandbox::MULTISIG_CONTRACT_ADDRESS,
-        rewarding_validator_address: sandbox::REWARDING_VALIDATOR_ADDRESS,
-        validators: sandbox::validators(),
-    });
+static SANDBOX_DEFAULTS: Lazy<DefaultNetworkDetails> = Lazy::new(|| DefaultNetworkDetails {
+    bech32_prefix: sandbox::BECH32_PREFIX,
+    mix_denom: sandbox::MIX_DENOM,
+    stake_denom: sandbox::STAKE_DENOM,
+    mixnet_contract_address: sandbox::MIXNET_CONTRACT_ADDRESS,
+    vesting_contract_address: sandbox::VESTING_CONTRACT_ADDRESS,
+    bandwidth_claim_contract_address: sandbox::BANDWIDTH_CLAIM_CONTRACT_ADDRESS,
+    coconut_bandwidth_contract_address: sandbox::COCONUT_BANDWIDTH_CONTRACT_ADDRESS,
+    multisig_contract_address: sandbox::MULTISIG_CONTRACT_ADDRESS,
+    rewarding_validator_address: sandbox::REWARDING_VALIDATOR_ADDRESS,
+    statistics_service_url: sandbox::STATISTICS_SERVICE_DOMAIN_ADDRESS,
+    validators: sandbox::validators(),
+});
 
-static QA_DEFAULTS: Lazy<DefaultNetworkDetails<'static>> = Lazy::new(|| DefaultNetworkDetails {
+static QA_DEFAULTS: Lazy<DefaultNetworkDetails> = Lazy::new(|| DefaultNetworkDetails {
     bech32_prefix: qa::BECH32_PREFIX,
-    denom: qa::DENOM,
+    mix_denom: qa::MIX_DENOM,
+    stake_denom: qa::STAKE_DENOM,
     mixnet_contract_address: qa::MIXNET_CONTRACT_ADDRESS,
     vesting_contract_address: qa::VESTING_CONTRACT_ADDRESS,
     bandwidth_claim_contract_address: qa::BANDWIDTH_CLAIM_CONTRACT_ADDRESS,
     coconut_bandwidth_contract_address: qa::COCONUT_BANDWIDTH_CONTRACT_ADDRESS,
     multisig_contract_address: qa::MULTISIG_CONTRACT_ADDRESS,
     rewarding_validator_address: qa::REWARDING_VALIDATOR_ADDRESS,
+    statistics_service_url: qa::STATISTICS_SERVICE_DOMAIN_ADDRESS,
     validators: qa::validators(),
 });
 
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
+#[derive(Debug, Copy, Serialize, Deserialize, Clone, PartialEq, Eq)]
+pub struct DenomDetails {
+    pub base: &'static str,
+    pub display: &'static str,
+    // i.e. display_amount * 10^display_exponent = base_amount
+    pub display_exponent: u32,
+}
+
+impl DenomDetails {
+    pub const fn new(base: &'static str, display: &'static str, display_exponent: u32) -> Self {
+        DenomDetails {
+            base,
+            display,
+            display_exponent,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
+pub struct DenomDetailsOwned {
+    pub base: String,
+    pub display: String,
+    // i.e. display_amount * 10^display_exponent = base_amount
+    pub display_exponent: u32,
+}
+
+impl From<DenomDetails> for DenomDetailsOwned {
+    fn from(details: DenomDetails) -> Self {
+        DenomDetailsOwned {
+            base: details.base.to_owned(),
+            display: details.display.to_owned(),
+            display_exponent: details.display_exponent,
+        }
+    }
+}
+
+impl DenomDetailsOwned {
+    pub fn base_only(base: String) -> Self {
+        DenomDetailsOwned {
+            base: base.clone(),
+            display: base,
+            display_exponent: 0,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
 pub struct ValidatorDetails {
     // it is assumed those values are always valid since they're being provided in our defaults file
     pub nymd_url: String,
     // Right now api_url is optional as we are not running the api reliably on all validators
     // however, later on it should be a mandatory field
     pub api_url: Option<String>,
+    // TODO: I'd argue this one should also have a field like `gas_price` since its a validator-specific setting
 }
 
 impl ValidatorDetails {
-    pub fn new(nymd_url: &str, api_url: Option<&str>) -> Self {
+    pub fn new<S: Into<String>>(nymd_url: S, api_url: Option<S>) -> Self {
         ValidatorDetails {
-            nymd_url: nymd_url.to_string(),
-            api_url: api_url.map(ToString::to_string),
+            nymd_url: nymd_url.into(),
+            api_url: api_url.map(Into::into),
         }
     }
 
-    pub fn new_with_name(nymd_url: &str, api_url: Option<&str>) -> Self {
+    pub fn new_nymd_only<S: Into<String>>(nymd_url: S) -> Self {
         ValidatorDetails {
-            nymd_url: nymd_url.to_string(),
-            api_url: api_url.map(ToString::to_string),
+            nymd_url: nymd_url.into(),
+            api_url: None,
         }
     }
 
@@ -132,9 +333,17 @@ 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()
+        .iter()
         .map(ValidatorDetails::nymd_url)
         .collect()
 }
@@ -142,6 +351,7 @@ pub fn default_nymd_endpoints() -> Vec<Url> {
 pub fn default_api_endpoints() -> Vec<Url> {
     DEFAULT_NETWORK
         .validators()
+        .iter()
         .filter_map(ValidatorDetails::api_url)
         .collect()
 }
@@ -199,7 +409,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;

common/network-defaults/src/mainnet.rs

@@ -1,11 +1,12 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::ValidatorDetails;
+use crate::{DenomDetails, ValidatorDetails};
 
 pub(crate) const BECH32_PREFIX: &str = "n";
-pub const DENOM: &str = "unym";
-pub const STAKE_DENOM: &str = "unyx";
+
+pub const MIX_DENOM: DenomDetails = DenomDetails::new("unym", "nym", 6);
+pub const STAKE_DENOM: DenomDetails = DenomDetails::new("unyx", "nyx", 6);
 
 pub(crate) const MIXNET_CONTRACT_ADDRESS: &str =
     "n14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sjyvg3g";
@@ -22,6 +23,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://mainnet-stats.nymte.ch:8090";
 pub(crate) fn validators() -> Vec<ValidatorDetails> {
     vec![ValidatorDetails::new(
         "https://rpc.nyx.nodes.guru/",

common/network-defaults/src/qa.rs

@@ -1,11 +1,12 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::ValidatorDetails;
+use crate::{DenomDetails, ValidatorDetails};
 
 pub(crate) const BECH32_PREFIX: &str = "n";
-pub const DENOM: &str = "unym";
-pub const STAKE_DENOM: &str = "unyx";
+
+pub const MIX_DENOM: DenomDetails = DenomDetails::new("unym", "nym", 6);
+pub const STAKE_DENOM: DenomDetails = DenomDetails::new("unyx", "nyx", 6);
 
 pub(crate) const MIXNET_CONTRACT_ADDRESS: &str =
     "n1suhgf5svhu4usrurvxzlgn54ksxmn8gljarjtxqnapv8kjnp4nrsd3qaep";
@@ -22,6 +23,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",

common/network-defaults/src/sandbox.rs

@@ -1,11 +1,12 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::ValidatorDetails;
+use crate::{DenomDetails, ValidatorDetails};
 
 pub(crate) const BECH32_PREFIX: &str = "nymt";
-pub const DENOM: &str = "unymt";
-pub const STAKE_DENOM: &str = "unyxt";
+
+pub const MIX_DENOM: DenomDetails = DenomDetails::new("unymt", "nymt", 6);
+pub const STAKE_DENOM: DenomDetails = DenomDetails::new("unyxt", "nyxt", 6);
 
 pub(crate) const MIXNET_CONTRACT_ADDRESS: &str = "nymt1ghd753shjuwexxywmgs4xz7x2q732vcnstz02j";
 pub(crate) const VESTING_CONTRACT_ADDRESS: &str = "nymt14ejqjyq8um4p3xfqj74yld5waqljf88fn549lh";
@@ -20,6 +21,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",

common/nymsphinx/addressing/Cargo.toml

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

common/nymsphinx/cover/Cargo.toml

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

common/nymsphinx/params/Cargo.toml

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

common/socks5/proxy-helpers/Cargo.toml

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

common/statistics/Cargo.toml

@@ -2,14 +2,20 @@
 # SPDX-License-Identifier: Apache-2.0
 
 [package]
-name = "statistics"
+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]
-reqwest = "0.11"
+async-trait = { version = "0.1.51" }
+log = "0.4"
+reqwest = { version = "0.11", features = ["json"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
-thiserror = "1"
+sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "chrono"]}
+thiserror = "1"
+tokio = { version = "1.19.1", features = [ "time" ] }
+
+network-defaults = { path = "../network-defaults" }

common/statistics/src/api.rs

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

common/statistics/src/collector.rs

@@ -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();
+        }
+    }
+}

common/statistics/src/error.rs

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

common/statistics/src/lib.rs

@@ -6,11 +6,12 @@ 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<StatsServiceData>,
+    pub stats_data: Vec<StatsData>,
     pub interval_seconds: u32,
     pub timestamp: String,
 }
@@ -25,6 +26,27 @@ impl StatsMessage {
     }
 }
 
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub enum StatsData {
+    Service(StatsServiceData),
+    Gateway(StatsGatewayData),
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct StatsGatewayData {
+    pub gateway_id: String,
+    pub inbox_count: u32,
+}
+
+impl StatsGatewayData {
+    pub fn new(gateway_id: String, inbox_count: u32) -> Self {
+        StatsGatewayData {
+            gateway_id,
+            inbox_count,
+        }
+    }
+}
+
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct StatsServiceData {
     pub requested_service: String,

common/types/src/delegation.rs

@@ -20,7 +20,7 @@ pub struct Delegation {
     pub node_identity: String,
     pub amount: MajorCurrencyAmount,
     pub block_height: u64,
-    pub proxy: Option<String>, // proxy address used to delegate the funds on behalf of anouther address
+    pub proxy: Option<String>, // proxy address used to delegate the funds on behalf of another address
 }
 
 impl TryFrom<MixnetContractDelegation> for Delegation {
@@ -57,6 +57,7 @@ pub struct DelegationRecord {
     pub amount: MajorCurrencyAmount,
     pub block_height: u64,
     pub delegated_on_iso_datetime: String,
+    pub uses_vesting_contract_tokens: bool,
 }
 
 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
@@ -76,7 +77,7 @@ pub struct DelegationWithEverything {
     pub profit_margin_percent: Option<u8>,
     pub avg_uptime_percent: Option<u8>,
     pub stake_saturation: Option<f32>,
-    pub proxy: Option<String>,
+    pub uses_vesting_contract_tokens: bool,
     pub accumulated_rewards: Option<MajorCurrencyAmount>,
     pub pending_events: Vec<DelegationEvent>,
     pub history: Vec<DelegationRecord>,
@@ -144,6 +145,7 @@ pub struct DelegationEvent {
     pub address: String,
     pub amount: Option<MajorCurrencyAmount>,
     pub block_height: u64,
+    pub proxy: Option<String>,
 }
 
 impl TryFrom<ContractDelegationEvent> for DelegationEvent {
@@ -159,6 +161,7 @@ impl TryFrom<ContractDelegationEvent> for DelegationEvent {
                     address: delegation.owner.into_string(),
                     node_identity: delegation.node_identity,
                     amount: Some(amount),
+                    proxy: delegation.proxy.map(|p| p.into_string()),
                 })
             }
             ContractDelegationEvent::Undelegate(pending_undelegate) => Ok(DelegationEvent {
@@ -167,6 +170,7 @@ impl TryFrom<ContractDelegationEvent> for DelegationEvent {
                 address: pending_undelegate.delegate().into_string(),
                 node_identity: pending_undelegate.mix_identity(),
                 amount: None,
+                proxy: pending_undelegate.proxy().map(|p| p.into_string()),
             }),
         }
     }

common/types/src/error.rs

@@ -51,6 +51,8 @@ pub enum TypesError {
         #[from]
         source: cosmwasm_std::DecimalRangeExceeded,
     },
+    #[error("No validator API URL configured")]
+    NoValidatorApiUrlConfigured,
     #[error("{0} is not a valid amount string")]
     InvalidAmount(String),
     #[error("{0} is not a valid denomination string")]
@@ -78,6 +80,7 @@ impl From<ValidatorClientError> for TypesError {
             ValidatorClientError::ValidatorAPIError { source } => source.into(),
             ValidatorClientError::MalformedUrlProvided(e) => e.into(),
             ValidatorClientError::NymdError(e) => e.into(),
+            ValidatorClientError::NoAPIUrlAvailable => TypesError::NoValidatorApiUrlConfigured,
         }
     }
 }

common/types/src/fees.rs

@@ -1,18 +1,84 @@
+use crate::currency::MajorCurrencyAmount;
 use serde::{Deserialize, Serialize};
-
 use validator_client::nymd::Fee;
 
-use crate::currency::MajorCurrencyAmount;
+#[cfg(feature = "generate-ts")]
+use ts_rs::{Dependency, TS};
 
-#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
-#[cfg_attr(
-    feature = "generate-ts",
-    ts(export_to = "ts-packages/types/src/types/rust/FeeDetails.ts")
-)]
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct FeeDetails {
     // expected to be used by the wallet in order to display detailed fee information to the user
     pub amount: Option<MajorCurrencyAmount>,
-    #[cfg_attr(feature = "generate-ts", ts(skip))]
     pub fee: Fee,
 }
+
+#[cfg(feature = "generate-ts")]
+impl TS for FeeDetails {
+    const EXPORT_TO: Option<&'static str> = Some("ts-packages/types/src/types/rust/FeeDetails.ts");
+
+    fn decl() -> String {
+        format!("type {} = {};", Self::name(), Self::inline())
+    }
+
+    fn name() -> String {
+        "FeeDetails".into()
+    }
+
+    fn inline() -> String {
+        "{ amount: MajorCurrencyAmount | null, fee: Fee }".into()
+    }
+
+    fn dependencies() -> Vec<Dependency> {
+        vec![
+            Dependency::from_ty::<MajorCurrencyAmount>()
+                .expect("TS was incorrectly defined on `CurrencyDenom`"),
+            Dependency::from_ty::<ts_type_helpers::Fee>()
+                .expect("TS was incorrectly defined on `ts_type_helpers::Fee`"),
+        ]
+    }
+
+    fn transparent() -> bool {
+        false
+    }
+}
+
+// this should really be sealed and NEVER EVER used as "normal" types,
+// but due to our typescript requirements, we have to expose it to generate
+// the types...
+#[cfg(feature = "generate-ts")]
+pub mod ts_type_helpers {
+    use serde::{Deserialize, Serialize};
+    use validator_client::nymd::GasAdjustment;
+
+    #[derive(Debug, Clone, Serialize, Deserialize, ts_rs::TS)]
+    #[ts(export_to = "ts-packages/types/src/types/rust/Fee.ts")]
+    pub enum Fee {
+        Manual(CosmosFee),
+        Auto(Option<GasAdjustment>),
+    }
+
+    #[derive(Debug, Clone, Serialize, Deserialize, ts_rs::TS)]
+    #[ts(export_to = "ts-packages/types/src/types/rust/CosmosFee.ts")]
+    // this should corresponds to cosmrs::tx::Fee
+    // IMPORTANT NOTE: this should work as of cosmrs 0.7.1 due to their `FromStr` implementations
+    // on the type. The below struct might have to get readjusted if we update cosmrs!!
+    pub struct CosmosFee {
+        amount: Vec<Coin>,
+        gas_limit: u64,
+        payer: Option<String>,
+        granter: Option<String>,
+    }
+
+    // Note: I've got a feeling this one will bite us hard at some point...
+    #[derive(Debug, Clone, Serialize, Deserialize, ts_rs::TS)]
+    #[ts(export_to = "ts-packages/types/src/types/rust/Coin.ts")]
+    // this should corresponds to cosmrs::Coin
+    // IMPORTANT NOTE: this should work as of cosmrs 0.7.1 due to their `FromStr` implementations
+    // on the type. The below struct might have to get readjusted if we update cosmrs!!
+    pub struct Coin {
+        denom: String,
+        // this is not entirely true, but for the purposes
+        // of ts_rs, it's sufficient for the time being
+        amount: u64,
+    }
+}

common/types/src/gas.rs

@@ -51,7 +51,7 @@ impl Gas {
     feature = "generate-ts",
     ts(export_to = "ts-packages/types/src/types/rust/GasInfo.ts")
 )]
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, Debug)]
 pub struct GasInfo {
     /// GasWanted is the maximum units of work we allow this tx to perform.
     pub gas_wanted: u64,

common/types/src/transaction.rs

@@ -60,7 +60,7 @@ pub struct TransactionDetails {
     feature = "generate-ts",
     ts(export_to = "ts-packages/types/src/types/rust/TransactionExecuteResult.ts")
 )]
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, Debug)]
 pub struct TransactionExecuteResult {
     pub logs_json: String,
     pub data_json: String,

common/version-checker/Cargo.toml

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

common/wasm-utils/Cargo.toml

@@ -29,4 +29,4 @@ features = [
     "ProgressEvent",
     "WebSocket",
     "Window",
-]
+]

contracts/Cargo.lock

@@ -1024,7 +1024,7 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
 
 [[package]]
 name = "mixnet-contract"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "az",
  "bs58",
@@ -1826,7 +1826,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "vesting-contract"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "config",
  "cosmwasm-std",

contracts/bandwidth-claim/src/lib.rs

@@ -62,7 +62,7 @@ pub fn migrate(_deps: DepsMut<'_>, _env: Env, _msg: MigrateMsg) -> Result<Respon
 pub mod tests {
     use super::*;
     use bandwidth_claim_contract::payment::PagedPaymentResponse;
-    use config::defaults::DENOM;
+    use config::defaults::MIX_DENOM;
     use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
     use cosmwasm_std::{coins, from_binary};
 
@@ -91,11 +91,11 @@ pub mod tests {
 
         // Contract balance should match what we initialized it as
         assert_eq!(
-            coins(0, DENOM),
+            coins(0, MIX_DENOM.base),
             vec![deps
                 .as_ref()
                 .querier
-                .query_balance(env.contract.address, DENOM)
+                .query_balance(env.contract.address, MIX_DENOM.base)
                 .unwrap()]
         );
     }

contracts/coconut-bandwidth/src/contract.rs

@@ -63,11 +63,10 @@ mod tests {
     use super::*;
     use crate::support::tests::helpers::*;
     use coconut_bandwidth_contract_common::deposit::DepositData;
-    use config::defaults::DENOM;
+    use config::defaults::MIX_DENOM;
     use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
     use cosmwasm_std::{coins, Addr};
     use cw_multi_test::Executor;
-    use serde::de::Unexpected::Str;
 
     #[test]
     fn initialize_contract() {
@@ -84,20 +83,20 @@ mod tests {
 
         // Contract balance should be 0
         assert_eq!(
-            coins(0, DENOM),
+            coins(0, MIX_DENOM.base),
             vec![deps
                 .as_ref()
                 .querier
-                .query_balance(env.contract.address, DENOM)
+                .query_balance(env.contract.address, MIX_DENOM.base)
                 .unwrap()]
         );
     }
 
     #[test]
     fn deposit_and_release() {
-        let init_funds = coins(10, DENOM);
-        let deposit_funds = coins(1, DENOM);
-        let release_funds = coins(2, DENOM);
+        let init_funds = coins(10, MIX_DENOM.base);
+        let deposit_funds = coins(1, MIX_DENOM.base);
+        let release_funds = coins(2, MIX_DENOM.base);
         let mut app = mock_app(&init_funds);
         let multisig_addr = String::from(MULTISIG_CONTRACT);
         let pool_addr = String::from(POOL_CONTRACT);
@@ -157,7 +156,7 @@ mod tests {
             &[],
         )
         .unwrap();
-        let pool_bal = app.wrap().query_balance(pool_addr, DENOM).unwrap();
+        let pool_bal = app.wrap().query_balance(pool_addr, MIX_DENOM.base).unwrap();
         assert_eq!(pool_bal, deposit_funds[0]);
     }
 }

contracts/coconut-bandwidth/src/error.rs

@@ -5,7 +5,7 @@ use cosmwasm_std::StdError;
 use cw_controllers::AdminError;
 use thiserror::Error;
 
-use config::defaults::DENOM;
+use config::defaults::MIX_DENOM;
 
 /// Custom errors for contract failure conditions.
 ///
@@ -22,7 +22,7 @@ pub enum ContractError {
     #[error("No coin was sent for voucher")]
     NoCoin,
 
-    #[error("Wrong coin denomination, you must send {}", DENOM)]
+    #[error("Wrong coin denomination, you must send {}", MIX_DENOM.base)]
     WrongDenom,
 
     #[error("There aren't enough funds in the contract")]

contracts/coconut-bandwidth/src/support/tests.rs

@@ -4,7 +4,6 @@
 #[cfg(test)]
 pub mod helpers {
     pub const OWNER: &str = "admin0001";
-    pub const SOMEBODY: &str = "somebody";
     pub const MULTISIG_CONTRACT: &str = "multisig contract address";
     pub const POOL_CONTRACT: &str = "mix pool contract address";
 
@@ -23,7 +22,7 @@ pub mod helpers {
         let env = mock_env();
         let info = mock_info("creator", &[]);
         instantiate(deps.as_mut(), env.clone(), info, msg).unwrap();
-        return deps;
+        deps
     }
 
     pub fn mock_app(init_funds: &[Coin]) -> App {

contracts/coconut-bandwidth/src/transactions.rs

@@ -11,7 +11,7 @@ use coconut_bandwidth_contract_common::events::{
     DEPOSITED_FUNDS_EVENT_TYPE, DEPOSIT_ENCRYPTION_KEY, DEPOSIT_IDENTITY_KEY, DEPOSIT_INFO,
     DEPOSIT_VALUE,
 };
-use config::defaults::DENOM;
+use config::defaults::MIX_DENOM;
 
 pub(crate) fn deposit_funds(
     _deps: DepsMut<'_>,
@@ -25,7 +25,7 @@ pub(crate) fn deposit_funds(
     if info.funds.len() > 1 {
         return Err(ContractError::MultipleDenoms);
     }
-    if info.funds[0].denom != DENOM {
+    if info.funds[0].denom != MIX_DENOM.base {
         return Err(ContractError::WrongDenom);
     }
 
@@ -45,10 +45,12 @@ pub(crate) fn release_funds(
     info: MessageInfo,
     funds: Coin,
 ) -> Result<Response, ContractError> {
-    if funds.denom != DENOM {
+    if funds.denom != MIX_DENOM.base {
         return Err(ContractError::WrongDenom);
     }
-    let current_balance = deps.querier.query_balance(env.contract.address, DENOM)?;
+    let current_balance = deps
+        .querier
+        .query_balance(env.contract.address, MIX_DENOM.base)?;
     if funds.amount > current_balance.amount {
         return Err(ContractError::NotEnoughFunds);
     }
@@ -90,7 +92,7 @@ mod tests {
             Err(ContractError::NoCoin)
         );
 
-        let coin = Coin::new(1000000, DENOM);
+        let coin = Coin::new(1000000, MIX_DENOM.base);
         let second_coin = Coin::new(1000000, "some_denom");
 
         let info = mock_info("requester", &[coin, second_coin.clone()]);
@@ -120,7 +122,7 @@ mod tests {
             verification_key.clone(),
             encryption_key.clone(),
         );
-        let coin = Coin::new(deposit_value, DENOM);
+        let coin = Coin::new(deposit_value, MIX_DENOM.base);
         let info = mock_info("requester", &[coin]);
 
         let tx = deposit_funds(deps.as_mut(), env.clone(), info, data).unwrap();
@@ -169,7 +171,7 @@ mod tests {
         let mut deps = helpers::init_contract();
         let env = mock_env();
         let invalid_admin = "invalid admin";
-        let funds = Coin::new(1, DENOM);
+        let funds = Coin::new(1, MIX_DENOM.base);
 
         let err = release_funds(
             deps.as_mut(),
@@ -205,7 +207,7 @@ mod tests {
     fn valid_release() {
         let mut deps = helpers::init_contract();
         let env = mock_env();
-        let coin = Coin::new(1, DENOM);
+        let coin = Coin::new(1, MIX_DENOM.base);
 
         deps.querier
             .update_balance(env.contract.address.clone(), vec![coin.clone()]);

contracts/mixnet/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mixnet-contract"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2021"
 

contracts/mixnet/src/constants.rs

@@ -13,4 +13,5 @@ pub const ACTIVE_SET_WORK_FACTOR: u8 = 10;
 // and we can't change this easily to `Duration`, because then the entire rewarded set storage
 // would be messed up... (as we look up stuff "by blocks")
 pub const REWARDED_SET_REFRESH_BLOCKS: u64 = 720; // with blocktime being approximately 5s, it should be roughly 1h
-pub const EPOCHS_IN_INTERVAL: u64 = 720; // Hours in a month
+pub const INTERVAL_SECONDS: u64 = 86400 * 30; // 30 days
+pub const DEFAULT_OPERATOR_INTERVAL_COST: u64 = 40_000_000;

contracts/mixnet/src/contract.rs

@@ -7,10 +7,9 @@ use crate::delegations::queries::query_mixnode_delegation;
 use crate::delegations::queries::{
     query_mixnode_delegations_paged, query_pending_delegation_events,
 };
-use crate::delegations::storage::delegations;
 use crate::error::ContractError;
-use crate::gateways::queries::query_gateways_paged;
 use crate::gateways::queries::query_owns_gateway;
+use crate::gateways::queries::{query_gateway_bond, query_gateways_paged};
 use crate::interval::queries::query_current_epoch;
 use crate::interval::queries::{
     query_current_rewarded_set_height, query_rewarded_set,
@@ -29,14 +28,13 @@ use crate::mixnodes::bonding_queries::{
 };
 use crate::mixnodes::layer_queries::query_layer_distribution;
 use crate::rewards::queries::{
-    query_circulating_supply, query_reward_pool, query_rewarding_status,
+    query_circulating_supply, query_reward_pool, query_rewarding_status, query_staking_supply,
 };
 use crate::rewards::storage as rewards_storage;
 use cosmwasm_std::{
     entry_point, to_binary, Addr, Api, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response,
     Uint128,
 };
-use mixnet_contract_common::mixnode::DelegationEvent;
 use mixnet_contract_common::{
     ContractStateParams, ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg,
 };
@@ -331,6 +329,10 @@ pub fn query(deps: Deps<'_>, env: Env, msg: QueryMsg) -> Result<QueryResponse, C
         QueryMsg::OwnsMixnode { address } => {
             to_binary(&mixnode_queries::query_owns_mixnode(deps, address)?)
         }
+        QueryMsg::GetMixnodeBond { identity } => {
+            to_binary(&mixnode_queries::query_mixnode_bond(deps, identity)?)
+        }
+        QueryMsg::GetGatewayBond { identity } => to_binary(&query_gateway_bond(deps, identity)?),
         QueryMsg::OwnsGateway { address } => to_binary(&query_owns_gateway(deps, address)?),
         QueryMsg::StateParams {} => to_binary(&query_contract_settings_params(deps)?),
         QueryMsg::LayerDistribution {} => to_binary(&query_layer_distribution(deps)?),
@@ -367,6 +369,7 @@ pub fn query(deps: Deps<'_>, env: Env, msg: QueryMsg) -> Result<QueryResponse, C
         )?),
         QueryMsg::GetRewardPool {} => to_binary(&query_reward_pool(deps)?),
         QueryMsg::GetCirculatingSupply {} => to_binary(&query_circulating_supply(deps)?),
+        QueryMsg::GetStakingSupply {} => to_binary(&query_staking_supply(deps)?),
         QueryMsg::GetIntervalRewardPercent {} => to_binary(&INTERVAL_REWARD_PERCENT),
         QueryMsg::GetSybilResistancePercent {} => to_binary(&SYBIL_RESISTANCE_PERCENT),
         QueryMsg::GetActiveSetWorkFactor {} => to_binary(&ACTIVE_SET_WORK_FACTOR),
@@ -394,7 +397,12 @@ pub fn query(deps: Deps<'_>, env: Env, msg: QueryMsg) -> Result<QueryResponse, C
         QueryMsg::GetRewardedSetRefreshBlocks {} => {
             to_binary(&query_rewarded_set_refresh_minimum_blocks())
         }
-        QueryMsg::GetEpochsInInterval {} => to_binary(&crate::constants::EPOCHS_IN_INTERVAL),
+        QueryMsg::GetEpochsInInterval {} => {
+            to_binary(&crate::support::helpers::epochs_in_interval(deps.storage)?)
+        }
+        QueryMsg::GetCurrentOperatorCost {} => to_binary(
+            &crate::support::helpers::current_operator_epoch_cost(deps.storage)?,
+        ),
         QueryMsg::GetCurrentEpoch {} => to_binary(&query_current_epoch(deps.storage)?),
         QueryMsg::QueryOperatorReward { address } => to_binary(
             &crate::rewards::queries::query_operator_reward(deps, address)?,
@@ -435,87 +443,8 @@ pub fn query(deps: Deps<'_>, env: Env, msg: QueryMsg) -> Result<QueryResponse, C
     Ok(query_res?)
 }
 
-fn migrate_contract_state_params(deps: DepsMut<'_>) -> Result<(), ContractError> {
-    use crate::mixnet_contract_settings::storage::CONTRACT_STATE;
-    use cw_storage_plus::Item;
-    use serde::{Deserialize, Serialize};
-
-    #[derive(Serialize, Deserialize)]
-    struct OldContractState {
-        pub owner: Addr,
-        pub rewarding_validator_address: Addr,
-        pub params: OldContractStateParams,
-    }
-
-    #[derive(Serialize, Deserialize)]
-    struct OldContractStateParams {
-        pub minimum_mixnode_pledge: Uint128,
-        pub minimum_gateway_pledge: Uint128,
-        pub mixnode_rewarded_set_size: u32,
-        pub mixnode_active_set_size: u32,
-    }
-
-    const OLD_CONTRACT_STATE: Item<'_, OldContractState> = Item::new("config");
-
-    let old_contract_state = OLD_CONTRACT_STATE.load(deps.storage)?;
-
-    let old_params = old_contract_state.params;
-
-    let new_params = ContractStateParams {
-        minimum_mixnode_pledge: old_params.minimum_mixnode_pledge,
-        minimum_gateway_pledge: old_params.minimum_gateway_pledge,
-        mixnode_rewarded_set_size: old_params.mixnode_rewarded_set_size,
-        mixnode_active_set_size: old_params.mixnode_active_set_size,
-        staking_supply: INITIAL_STAKING_SUPPLY,
-    };
-
-    let new_contract_state = ContractState {
-        owner: old_contract_state.owner,
-        rewarding_validator_address: old_contract_state.rewarding_validator_address,
-        params: new_params,
-    };
-
-    CONTRACT_STATE.save(deps.storage, &new_contract_state)?;
-
-    Ok(())
-}
-
-fn _deal_with_zero_delegations(deps: DepsMut<'_>) -> Result<(), ContractError> {
-    // if there exists any delegation of 0 value, remove it
-    let zero_delegations = delegations()
-        .range(deps.storage, None, None, cosmwasm_std::Order::Ascending)
-        .filter_map(|r| r.ok())
-        .filter(|(_k, v)| v.amount.amount == Uint128::zero())
-        .map(|(k, _v)| k)
-        .collect::<Vec<_>>();
-
-    for delegation in &zero_delegations {
-        delegations().remove(deps.storage, delegation.clone())?;
-    }
-
-    // similarly, if there exists any event that is scheduled to insert/remove delegation with 0 value, purge it
-    let delegate_events_to_purge = crate::delegations::storage::PENDING_DELEGATION_EVENTS
-        .range(deps.storage, None, None, cosmwasm_std::Order::Ascending)
-        .filter_map(|r| r.ok())
-        .filter(|(_k, v)| match v {
-            DelegationEvent::Delegate(d) => d.amount.amount == Uint128::zero(),
-            _ => false,
-        })
-        .map(|(k, _v)| k)
-        .collect::<Vec<_>>();
-
-    for delegation_event in delegate_events_to_purge {
-        crate::delegations::storage::PENDING_DELEGATION_EVENTS
-            .remove(deps.storage, delegation_event);
-    }
-
-    Ok(())
-}
-
 #[entry_point]
-pub fn migrate(deps: DepsMut<'_>, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
-    migrate_contract_state_params(deps)?;
-
+pub fn migrate(_deps: DepsMut<'_>, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
     Ok(Default::default())
 }
 
@@ -523,7 +452,7 @@ pub fn migrate(deps: DepsMut<'_>, _env: Env, _msg: MigrateMsg) -> Result<Respons
 pub mod tests {
     use super::*;
     use crate::support::tests;
-    use config::defaults::{DEFAULT_NETWORK, DENOM};
+    use config::defaults::{DEFAULT_NETWORK, MIX_DENOM};
     use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
     use cosmwasm_std::{coins, from_binary};
     use mixnet_contract_common::PagedMixnodeResponse;
@@ -555,7 +484,7 @@ pub mod tests {
 
         // Contract balance should match what we initialized it as
         assert_eq!(
-            coins(0, DENOM),
+            coins(0, MIX_DENOM.base),
             tests::queries::query_contract_balance(env.contract.address, deps)
         );
     }

contracts/mixnet/src/delegations/queries.rs

@@ -200,7 +200,7 @@ pub(crate) fn query_mixnode_delegations_paged(
 pub(crate) mod tests {
     use super::*;
     use crate::support::tests::test_helpers;
-    use config::defaults::DENOM;
+    use config::defaults::MIX_DENOM;
     use cosmwasm_std::{coin, Addr, Storage};
     use rand::Rng;
 
@@ -385,7 +385,7 @@ pub(crate) mod tests {
         let delegation = Delegation::new(
             delegation_owner.clone(),
             node_identity.clone(),
-            coin(1234, DENOM),
+            coin(1234, MIX_DENOM.base),
             1234,
             None,
         );
@@ -433,7 +433,7 @@ pub(crate) mod tests {
         let delegation = Delegation::new(
             delegation_owner2,
             node_identity1.clone(),
-            coin(1234, DENOM),
+            coin(1234, MIX_DENOM.base),
             1234,
             None,
         );
@@ -460,7 +460,7 @@ pub(crate) mod tests {
         let delegation = Delegation::new(
             delegation_owner1.clone(),
             node_identity2,
-            coin(1234, DENOM),
+            coin(1234, MIX_DENOM.base),
             1234,
             None,
         );

contracts/mixnet/src/delegations/storage.rs

@@ -77,7 +77,7 @@ mod tests {
     mod reverse_mix_delegations {
         use super::*;
         use crate::support::tests::test_helpers;
-        use config::defaults::DENOM;
+        use config::defaults::MIX_DENOM;
         use cosmwasm_std::testing::mock_env;
         use cosmwasm_std::{coin, Order};
         use mixnet_contract_common::Delegation;
@@ -87,7 +87,7 @@ mod tests {
             let mut deps = test_helpers::init_contract();
             let node_identity: IdentityKey = "foo".into();
             let delegation_owner = Addr::unchecked("bar");
-            let delegation = coin(12345, DENOM);
+            let delegation = coin(12345, MIX_DENOM.base);
 
             let dummy_data = Delegation::new(
                 delegation_owner.clone(),
@@ -125,7 +125,7 @@ mod tests {
             let node_identity2: IdentityKey = "foo2".into();
             let delegation_owner1 = Addr::unchecked("bar");
             let delegation_owner2 = Addr::unchecked("bar2");
-            let delegation = coin(12345, DENOM);
+            let delegation = coin(12345, MIX_DENOM.base);
 
             assert!(test_helpers::read_delegation(
                 deps.as_ref().storage,

contracts/mixnet/src/delegations/transactions.rs

@@ -6,7 +6,7 @@ use super::storage::{self, PENDING_DELEGATION_EVENTS};
 use crate::error::ContractError;
 use crate::mixnet_contract_settings::storage as mixnet_params_storage;
 use crate::mixnodes::storage as mixnodes_storage;
-use config::defaults::DENOM;
+use config::defaults::MIX_DENOM;
 use cosmwasm_std::{
     coins, wasm_execute, Addr, Api, BankMsg, Coin, DepsMut, Env, Event, MessageInfo, Order,
     Response, Storage, Uint128, WasmMsg,
@@ -85,7 +85,7 @@ fn validate_delegation_stake(mut delegation: Vec<Coin>) -> Result<Coin, Contract
     }
 
     // check that the denomination is correct
-    if delegation[0].denom != DENOM {
+    if delegation[0].denom != MIX_DENOM.base {
         return Err(ContractError::WrongDenom {});
     }
 
@@ -389,7 +389,7 @@ pub(crate) fn try_reconcile_undelegation(
                 .as_ref()
                 .unwrap_or(&pending_undelegate.delegate())
                 .to_string(),
-            amount: coins(total_funds.u128(), DENOM),
+            amount: coins(total_funds.u128(), MIX_DENOM.base),
         })
     } else {
         None
@@ -401,7 +401,7 @@ pub(crate) fn try_reconcile_undelegation(
         let msg = Some(VestingContractExecuteMsg::TrackUndelegation {
             owner: pending_undelegate.delegate().as_str().to_string(),
             mix_identity: pending_undelegate.mix_identity(),
-            amount: Coin::new(total_funds.u128(), DENOM),
+            amount: Coin::new(total_funds.u128(), MIX_DENOM.base),
         });
 
         wasm_msg = Some(wasm_execute(proxy, &msg, vec![one_ucoin()])?);
@@ -492,7 +492,7 @@ mod tests {
             assert_eq!(
                 Err(ContractError::MultipleDenoms),
                 validate_delegation_stake(vec![
-                    coin(123, DENOM),
+                    coin(123, MIX_DENOM.base),
                     coin(123, "BTC"),
                     coin(123, "DOGE")
                 ])
@@ -511,16 +511,16 @@ mod tests {
         fn stake_coin_must_have_value_greater_than_zero() {
             assert_eq!(
                 Err(ContractError::EmptyDelegation),
-                validate_delegation_stake(coins(0, DENOM))
+                validate_delegation_stake(coins(0, MIX_DENOM.base))
             )
         }
 
         #[test]
         fn stake_can_have_any_positive_value() {
             // this might change in the future, but right now an arbitrary (positive) value can be delegated
-            assert!(validate_delegation_stake(coins(1, DENOM)).is_ok());
-            assert!(validate_delegation_stake(coins(123, DENOM)).is_ok());
-            assert!(validate_delegation_stake(coins(10000000000, DENOM)).is_ok());
+            assert!(validate_delegation_stake(coins(1, MIX_DENOM.base)).is_ok());
+            assert!(validate_delegation_stake(coins(123, MIX_DENOM.base)).is_ok());
+            assert!(validate_delegation_stake(coins(10000000000, MIX_DENOM.base)).is_ok());
         }
     }
 
@@ -543,7 +543,7 @@ mod tests {
                 try_delegate_to_mixnode(
                     deps.as_mut(),
                     mock_env(),
-                    mock_info("sender", &coins(123, DENOM)),
+                    mock_info("sender", &coins(123, MIX_DENOM.base)),
                     "non-existent-mix-identity".into(),
                 )
             );
@@ -559,7 +559,7 @@ mod tests {
                 deps.as_mut(),
             );
             let delegation_owner = Addr::unchecked("sender");
-            let delegation = coin(123, DENOM);
+            let delegation = coin(123, MIX_DENOM.base);
             assert!(try_delegate_to_mixnode(
                 deps.as_mut(),
                 mock_env(),
@@ -616,7 +616,7 @@ mod tests {
                 try_delegate_to_mixnode(
                     deps.as_mut(),
                     mock_env(),
-                    mock_info(delegation_owner.as_str(), &coins(123, DENOM)),
+                    mock_info(delegation_owner.as_str(), &coins(123, MIX_DENOM.base)),
                     identity,
                 )
             );
@@ -637,7 +637,7 @@ mod tests {
                 tests::fixtures::good_mixnode_pledge(),
                 deps.as_mut(),
             );
-            let delegation = coin(123, DENOM);
+            let delegation = coin(123, MIX_DENOM.base);
             let delegation_owner = Addr::unchecked("sender");
             assert!(try_delegate_to_mixnode(
                 deps.as_mut(),
@@ -687,8 +687,8 @@ mod tests {
                 deps.as_mut(),
             );
             let delegation_owner = Addr::unchecked("sender");
-            let delegation1 = coin(100, DENOM);
-            let delegation2 = coin(50, DENOM);
+            let delegation1 = coin(100, MIX_DENOM.base);
+            let delegation2 = coin(50, MIX_DENOM.base);
 
             let mut env = mock_env();
 
@@ -715,7 +715,7 @@ mod tests {
             // let expected = Delegation::new(
             //     delegation_owner.clone(),
             //     identity.clone(),
-            //     coin(delegation1.amount.u128() + delegation2.amount.u128(), DENOM),
+            //     coin(delegation1.amount.u128() + delegation2.amount.u128(), MIX_DENOM.base),
             //     mock_env().block.height,
             //     None,
             // );
@@ -750,7 +750,7 @@ mod tests {
                 deps.as_mut(),
             );
             let delegation_owner = Addr::unchecked("sender");
-            let delegation = coin(100, DENOM);
+            let delegation = coin(100, MIX_DENOM.base);
             let env1 = mock_env();
             let mut env2 = mock_env();
             let initial_height = env1.block.height;
@@ -815,8 +815,8 @@ mod tests {
             );
             let delegation_owner1 = Addr::unchecked("sender1");
             let delegation_owner2 = Addr::unchecked("sender2");
-            let delegation1 = coin(100, DENOM);
-            let delegation2 = coin(120, DENOM);
+            let delegation1 = coin(100, MIX_DENOM.base);
+            let delegation2 = coin(120, MIX_DENOM.base);
             let env1 = mock_env();
             let mut env2 = mock_env();
             let initial_height = env1.block.height;
@@ -891,7 +891,7 @@ mod tests {
             try_delegate_to_mixnode(
                 deps.as_mut(),
                 mock_env(),
-                mock_info(delegation_owner.as_str(), &coins(100, DENOM)),
+                mock_info(delegation_owner.as_str(), &coins(100, MIX_DENOM.base)),
                 identity.clone(),
             )
             .unwrap();
@@ -903,7 +903,7 @@ mod tests {
                 try_delegate_to_mixnode(
                     deps.as_mut(),
                     mock_env(),
-                    mock_info(delegation_owner.as_str(), &coins(50, DENOM)),
+                    mock_info(delegation_owner.as_str(), &coins(50, MIX_DENOM.base)),
                     identity,
                 )
             );
@@ -928,14 +928,14 @@ mod tests {
             assert!(try_delegate_to_mixnode(
                 deps.as_mut(),
                 mock_env(),
-                mock_info(delegation_owner.as_str(), &coins(123, DENOM)),
+                mock_info(delegation_owner.as_str(), &coins(123, MIX_DENOM.base)),
                 identity1.clone(),
             )
             .is_ok());
             assert!(try_delegate_to_mixnode(
                 deps.as_mut(),
                 mock_env(),
-                mock_info(delegation_owner.as_str(), &coins(42, DENOM)),
+                mock_info(delegation_owner.as_str(), &coins(42, MIX_DENOM.base)),
                 identity2.clone(),
             )
             .is_ok());
@@ -945,7 +945,7 @@ mod tests {
             let expected1 = Delegation::new(
                 delegation_owner.clone(),
                 identity1.clone(),
-                coin(123, DENOM),
+                coin(123, MIX_DENOM.base),
                 mock_env().block.height,
                 None,
             );
@@ -953,7 +953,7 @@ mod tests {
             let expected2 = Delegation::new(
                 delegation_owner.clone(),
                 identity2.clone(),
-                coin(42, DENOM),
+                coin(42, MIX_DENOM.base),
                 mock_env().block.height,
                 None,
             );
@@ -989,8 +989,8 @@ mod tests {
                 tests::fixtures::good_mixnode_pledge(),
                 deps.as_mut(),
             );
-            let delegation1 = coin(123, DENOM);
-            let delegation2 = coin(234, DENOM);
+            let delegation1 = coin(123, MIX_DENOM.base);
+            let delegation2 = coin(234, MIX_DENOM.base);
             assert!(try_delegate_to_mixnode(
                 deps.as_mut(),
                 mock_env(),
@@ -1026,7 +1026,7 @@ mod tests {
                 deps.as_mut(),
             );
             let delegation_owner = Addr::unchecked("sender");
-            let delegation_amount = coin(100, DENOM);
+            let delegation_amount = coin(100, MIX_DENOM.base);
             try_delegate_to_mixnode(
                 deps.as_mut(),
                 mock_env(),
@@ -1118,7 +1118,7 @@ mod tests {
             try_delegate_to_mixnode(
                 deps.as_mut(),
                 mock_env(),
-                mock_info(delegation_owner.as_str(), &coins(100, DENOM)),
+                mock_info(delegation_owner.as_str(), &coins(100, MIX_DENOM.base)),
                 identity.clone(),
             )
             .unwrap();
@@ -1137,7 +1137,7 @@ mod tests {
             let expected_response = Response::new()
                 .add_message(BankMsg::Send {
                     to_address: delegation_owner.clone().into(),
-                    amount: coins(100, DENOM),
+                    amount: coins(100, MIX_DENOM.base),
                 })
                 .add_event(new_undelegation_event(
                     &delegation_owner,
@@ -1188,7 +1188,7 @@ mod tests {
             try_delegate_to_mixnode(
                 deps.as_mut(),
                 mock_env(),
-                mock_info(delegation_owner.as_str(), &coins(100, DENOM)),
+                mock_info(delegation_owner.as_str(), &coins(100, MIX_DENOM.base)),
                 identity.clone(),
             )
             .unwrap();
@@ -1207,7 +1207,7 @@ mod tests {
             let expected_response = Response::new()
                 .add_message(BankMsg::Send {
                     to_address: delegation_owner.clone().into(),
-                    amount: coins(100, DENOM),
+                    amount: coins(100, MIX_DENOM.base),
                 })
                 .add_event(new_undelegation_event(
                     &delegation_owner,
@@ -1251,8 +1251,8 @@ mod tests {
             );
             let delegation_owner1 = Addr::unchecked("sender1");
             let delegation_owner2 = Addr::unchecked("sender2");
-            let delegation1 = coin(123, DENOM);
-            let delegation2 = coin(234, DENOM);
+            let delegation1 = coin(123, MIX_DENOM.base);
+            let delegation2 = coin(234, MIX_DENOM.base);
             assert!(try_delegate_to_mixnode(
                 deps.as_mut(),
                 mock_env(),

contracts/mixnet/src/error.rs

@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use config::defaults::DENOM;
+use config::defaults::MIX_DENOM;
 use cosmwasm_std::{Addr, StdError};
 use mixnet_contract_common::{error::MixnetContractError, IdentityKey};
 use thiserror::Error;
@@ -33,13 +33,13 @@ pub enum ContractError {
     #[error("MIXNET ({}): Unauthorized", line!())]
     Unauthorized,
 
-    #[error("MIXNET ({}): Wrong coin denomination, you must send {}", line!(), DENOM)]
+    #[error("MIXNET ({}): Wrong coin denomination, you must send {}", line!(), MIX_DENOM.base)]
     WrongDenom,
 
     #[error("MIXNET ({}): Received multiple coin types during staking", line!())]
     MultipleDenoms,
 
-    #[error("MIXNET ({}): No coin was sent for the bonding, you must send {}", line!(), DENOM)]
+    #[error("MIXNET ({}): No coin was sent for the bonding, you must send {}", line!(), MIX_DENOM.base)]
     NoBondFound,
 
     #[error("MIXNET ({}): Provided active set size is bigger than the rewarded set", line!())]