pausing implementation

More dealing action
And actually receiving broadcasted data from other dealers !
2022-05-23 11:44:13 +01:00 · 2022-05-20 17:23:15 +01:00 · 2022-05-20 17:21:22 +01:00 · 2022-05-19 17:36:49 +01:00 · 2022-05-19 15:11:41 +01:00 · 2022-05-17 17:20:39 +01:00
630 changed files with 11727 additions and 25134 deletions
@@ -1,9 +0,0 @@
-# Description
-
-Closes: #XXXX
-
-<!-- If appropriate, insert relevant description here -->
-
-# Checklist:
-
- [ ] added a changelog entry to `CHANGELOG.md`
@@ -10,7 +10,7 @@ on:

 jobs:
  build:
-    runs-on: [ self-hosted, custom-linux ]
+    runs-on: [ self-hosted, custom-linux-exoscale ]
    # Enable sccache via environment variable
    env:
      RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache
@@ -1,72 +0,0 @@
-name: Continuous integration on dispatch
-
-on: workflow_dispatch
-
-jobs:
-  build:
-    runs-on: [ self-hosted, custom-linux ]
-    # Enable sccache via environment variable
-    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
-
-      - 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: --workspace
-
-      - name: Run all tests
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --workspace --all-features
-
-      - name: Check formatting
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-
-      - uses: actions-rs/clippy-check@v1
-        name: Clippy checks
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-features
-
-      - name: Run clippy
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --workspace -- -D warnings
-
-      - name: Build all binaries with coconut enabled
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --workspace --features=coconut
-
-      - name: Run all tests with coconut enabled
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --workspace --features=coconut
-
-      - name: Run clippy with coconut enabled
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --features=coconut -- -D warnings
@@ -31,8 +31,6 @@ jobs:
 #      continue-on-error: true
    - run: yarn && yarn build
      continue-on-error: true
-    - run: yarn storybook:build
-      name: Build storybook
    - name: Deploy branch to CI www
      continue-on-error: true
      uses: easingthemes/ssh-deploy@main
@@ -44,17 +42,6 @@ jobs:
        REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
        TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/network-explorer-${{ env.GITHUB_REF_SLUG }}
        EXCLUDE: "/dist/, /node_modules/"
-    - name: Deploy storybook to CI www
-      continue-on-error: true
-      uses: easingthemes/ssh-deploy@main
-      env:
-        SSH_PRIVATE_KEY: ${{ secrets.CI_WWW_SSH_PRIVATE_KEY }}
-        ARGS: "-rltgoDzvO --delete"
-        SOURCE: "explorer/storybook-static/"
-        REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
-        REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
-        TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/ne-sb-${{ env.GITHUB_REF_SLUG }}
-        EXCLUDE: "/dist/, /node_modules/"
    - name: Keybase - Node Install
      run: npm install
      working-directory: .github/workflows/support-files
@@ -64,7 +51,6 @@ jobs:
        NYM_PROJECT_NAME: "Network Explorer"
        NYM_CI_WWW_BASE: "${{ secrets.NYM_CI_WWW_BASE }}"
        NYM_CI_WWW_LOCATION: "network-explorer-${{ env.GITHUB_REF_SLUG }}"
-        NYM_CI_WWW_LOCATION_STORYBOOK: "ne-sb-${{ env.GITHUB_REF_SLUG }}"
        GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
        GIT_BRANCH: "${GITHUB_REF##*/}"
        KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
@@ -75,12 +75,6 @@ jobs:
          command: clippy
          args: --workspace --all-targets -- -D warnings

-      - name: Reclaim some disk space (because Windows is being annoying)
-        uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' }}
-        with:
-          command: clean
-
      # COCONUT stuff
      - name: Build all binaries with coconut enabled
        uses: actions-rs/cargo@v1
@@ -106,33 +100,6 @@ jobs:
        with:
          command: clippy
          args: --workspace --all-targets --features=coconut -- -D warnings
-
-      # nym-wallet (the rust part)
-      - name: Build nym-wallet rust code
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --manifest-path nym-wallet/Cargo.toml --workspace
-
-      - name: Run nym-wallet tests
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --manifest-path nym-wallet/Cargo.toml --workspace
-
-      - name: Check nym-wallet formatting
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --manifest-path nym-wallet/Cargo.toml --all -- --check
-
-      - name: Run clippy for nym-wallet
-        uses: actions-rs/cargo@v1
-        if: ${{ matrix.rust != 'nightly' }}
-        with:
-          command: clippy
-          args: --manifest-path nym-wallet/Cargo.toml --workspace --all-targets -- -D warnings
-
  notification:
    needs: build
    runs-on: ubuntu-latest
@@ -66,7 +66,6 @@ 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
@@ -44,7 +44,6 @@ jobs:
        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:
@@ -65,7 +65,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
@@ -1,6 +1,5 @@
 🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩🟩
 > :rocket: {{ env.NYM_PROJECT_NAME }}  ➡️➡️➡️➡️➡️ **View output:** https://{{ env.NYM_CI_WWW_LOCATION }}.{{ env.NYM_CI_WWW_BASE }}/
-> `storybook`: https://{{ env.NYM_CI_WWW_LOCATION_STORYBOOK }}.{{ env.NYM_CI_WWW_BASE }}
 > ✅ **SUCCESS**
 > `branch` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/tree/{{ env.GIT_BRANCH_NAME }}
 > `commit` {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/commit/{{ env.GITHUB_SHA }}
@@ -1,59 +0,0 @@
-name: Nym Wallet (rust)
-
-on:
-  push:
-    paths-ignore:
-      - 'explorer/**'
-  pull_request:
-    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
-
-      - 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-wallet/Cargo.toml --workspace
-
-      - name: Run all tests
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --manifest-path nym-wallet/Cargo.toml --workspace
-
-      - name: Check formatting
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --manifest-path nym-wallet/Cargo.toml --all -- --check
-
-      - uses: actions-rs/clippy-check@v1
-        name: Clippy checks
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --manifest-path nym-wallet/Cargo.toml --workspace --all-features
-
-      - name: Run clippy
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --manifest-path nym-wallet/Cargo.toml --workspace --all-features -- -D warnings
@@ -1,67 +1,7 @@
 # Changelog

-Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
 ## [Unreleased]

-### Added
-
- all: added network compilation target to `--help` (or `--version`) commands ([#1256]).
- explorer-api: learned how to sum the delegations by owner in a new endpoint.
- gateway: Added gateway coconut verifications and validator-api communication for double spending protection ([#1261])
- mixnet-contract: Added ClaimOperatorReward and ClaimDelegatorReward messages ([#1292])
- mixnet-contract: Replace all naked `-` with `saturating_sub`.
- validator-api: add `estimated_node_profit` and `estimated_operator_cost` to `reward-estimate` endpoint ([#1284])
- validator-api: add detailed mixnode bond endpoints, and explorer-api makes use of that data to append stake saturation.
- validator-api: add Swagger to document the REST API ([#1249]).
- validator-api: Added new endpoints for coconut spending flow and communications with coconut & multisig contracts ([#1261])
- vesting-contract: Added ClaimOperatorReward and ClaimDelegatorReward messages ([#1292])
- wallet: add simple CLI tool for decrypting and recovering the wallet file.
- wallet: added support for multiple accounts ([#1265])
- wallet: compound and claim reward endpoints for operators and delegators ([#1302])
- wallet: require password to switch accounts
- wallet: the wallet backend learned how to keep track of validator name, either hardcoded or by querying the status endpoint.
- wallet: new delegation and rewards UI
- wallet: show version in nav bar
- wallet: contract admin route put back
- network-statistics: a new mixnet service that aggregates and exposes anonymized data about mixnet services ([#1328])
-
-### Fixed
-
- mixnet-contract: `estimated_delegator_reward` calculation ([#1284])
- mixnet-contract: delegator and operator rewards use lambda and sigma instead of lambda_ticked and sigma_ticked ([#1284])
- mixnet-contract: removed `expect` in `query_delegator_reward` and queries containing invalid proxy address should now return a more human-readable error ([#1257])
- mixnet-contract: replaced integer division with fixed for performance calculations ([#1284])
- mixnet-contract: Under certain circumstances nodes could not be unbonded ([#1255](https://github.com/nymtech/nym/issues/1255)) ([#1258])
- mixnode, gateway: attempting to determine reconnection backoff to persistently failing mixnode could result in a crash ([#1260])
- mixnode: the mixnode learned how to shutdown gracefully.
- vesting-contract: replaced `checked_sub` with `saturating_sub` to fix the underflow in `get_vesting_tokens` ([#1275])
- native & socks5 clients: fail early when clients try to re-init with a different gateway, which is not supported yet ([#1322])
-
-### Changed
-
- validator-client: created internal `Coin` type that replaces coins from `cosmrs` and `cosmwasm` for API entrypoints [[#1295]]
- all: updated all `cosmwasm`-related dependencies to `1.0.0` and `cw-storage-plus` to `0.13.4` [[#1318]]
- network-requester: allow to voluntarily store and send statistical data about the number of bytes the proxied server serves ([#1328])
-
-[#1249]: https://github.com/nymtech/nym/pull/1249
-[#1256]: https://github.com/nymtech/nym/pull/1256
-[#1257]: https://github.com/nymtech/nym/pull/1257
-[#1258]: https://github.com/nymtech/nym/pull/1258
-[#1260]: https://github.com/nymtech/nym/pull/1260
-[#1261]: https://github.com/nymtech/nym/pull/1261
-[#1265]: https://github.com/nymtech/nym/pull/1265
-[#1267]: https://github.com/nymtech/nym/pull/1267
-[#1275]: https://github.com/nymtech/nym/pull/1275
-[#1278]: https://github.com/nymtech/nym/pull/1278
-[#1284]: https://github.com/nymtech/nym/pull/1284
-[#1292]: https://github.com/nymtech/nym/pull/1292
-[#1295]: https://github.com/nymtech/nym/pull/1295
-[#1302]: https://github.com/nymtech/nym/pull/1302
-[#1318]: https://github.com/nymtech/nym/pull/1318
-[#1322]: https://github.com/nymtech/nym/pull/1322
-[#1328]: https://github.com/nymtech/nym/pull/1328
-
 ## [nym-wallet-v1.0.4](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.4) (2022-05-04)

 ### Changed
@@ -10,8 +10,7 @@ overflow-checks = true
 panic = "abort"

 [profile.test]
-# equivalent of running in `--release` (but since we're in test profile we're keeping overflow checks and all of those by default)
-opt-level = 3
+opt-level = 2

 [workspace]

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

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

-exclude = ["explorer", "contracts", "tokenomics-py", "clients/webassembly", "nym-wallet"]
+exclude = ["explorer", "contracts", "tokenomics-py", "clients/webassembly"]
@@ -26,7 +26,7 @@ clippy-all-wallet:
 	cargo clippy --workspace --manifest-path nym-wallet/Cargo.toml --all-features -- -D warnings

 test-main:
-	cargo test --all-features --workspace
+	cargo test --all-features --workspace --release

 test-contracts:
 	cargo test --manifest-path contracts/Cargo.toml --all-features
@@ -54,7 +54,3 @@ fmt-wallet:

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

 # internal
@@ -6,7 +6,7 @@ use crate::client::real_messages_control::acknowledgement_control::Retransmissio
 use futures::channel::mpsc::{self, UnboundedReceiver, UnboundedSender};
 use futures::StreamExt;
 use log::*;
-use nonexhaustive_delayqueue::{Expired, NonExhaustiveDelayQueue, QueueKey};
+use nonexhaustive_delayqueue::{Expired, NonExhaustiveDelayQueue, QueueKey, TimerError};
 use nymsphinx::chunking::fragment::FragmentIdentifier;
 use nymsphinx::Delay as SphinxDelay;
 use std::collections::HashMap;
@@ -209,11 +209,16 @@ impl ActionController {
    }

    // note: when the entry expires it's automatically removed from pending_acks_timers
-    fn handle_expired_ack_timer(&mut self, expired_ack: Expired<FragmentIdentifier>) {
+    fn handle_expired_ack_timer(
+        &mut self,
+        expired_ack: Result<Expired<FragmentIdentifier>, TimerError>,
+    ) {
        // I'm honestly not sure how to handle it, because getting it means other things in our
        // system are already misbehaving. If we ever see this panic, then I guess we should worry
        // about it. Perhaps just reschedule it at later point?
-        let frag_id = expired_ack.into_inner();
+        let frag_id = expired_ack
+            .expect("Tokio timer returned an error!")
+            .into_inner();

        trace!("{} has expired", frag_id);

@@ -15,8 +15,9 @@ rand = "0.7.3"
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
 url = "2.2"
-tokio = { version = "1.19.1", features = ["rt-multi-thread", "net", "signal", "macros"] } # async runtime
+tokio = { version = "1.4", features = ["rt-multi-thread", "net", "signal", "macros"] } # async runtime

+coconut-bandwidth-contract-common = { path = "../../common/cosmwasm-smart-contracts/coconut-bandwidth-contract" }
 coconut-interface = { path = "../../common/coconut-interface" }
 credentials = { path = "../../common/credentials" }
 credential-storage = { path = "../../common/credential-storage" }
@@ -2,48 +2,66 @@
 // SPDX-License-Identifier: Apache-2.0

 use bip39::Mnemonic;
+use coconut_bandwidth_contract_common::deposit::DepositData;
 use std::str::FromStr;
 use url::Url;

 use crate::error::Result;
-use crate::{MNEMONIC, NYMD_URL};
+use crate::{CONTRACT_ADDRESS, MNEMONIC, NYMD_URL};

-use network_defaults::{DEFAULT_NETWORK, DENOM, VOUCHER_INFO};
-use validator_client::nymd::traits::CoconutBandwidthSigningClient;
-use validator_client::nymd::{Coin, Fee, NymdClient, SigningNymdClient};
+use coconut_bandwidth_contract_common::msg::ExecuteMsg;
+use network_defaults::DEFAULT_NETWORK;
+use validator_client::nymd::{
+    AccountId, CosmosCoin, Decimal, Denom, NymdClient, SigningNymdClient,
+};

 pub(crate) struct Client {
    nymd_client: NymdClient<SigningNymdClient>,
+    denom: Denom,
+    contract_address: AccountId,
 }

 impl Client {
    pub fn new() -> Self {
        let nymd_url = Url::from_str(NYMD_URL).unwrap();
        let mnemonic = Mnemonic::from_str(MNEMONIC).unwrap();
-        let nymd_client =
-            NymdClient::connect_with_mnemonic(DEFAULT_NETWORK, nymd_url.as_ref(), mnemonic, None)
-                .unwrap();
+        let nymd_client = NymdClient::connect_with_mnemonic(
+            DEFAULT_NETWORK,
+            nymd_url.as_ref(),
+            None,
+            None,
+            None,
+            mnemonic,
+            None,
+        )
+        .unwrap();
+        let denom = Denom::from_str(network_defaults::DENOM).unwrap();
+        let contract_address = AccountId::from_str(CONTRACT_ADDRESS).unwrap();

-        Client { nymd_client }
+        Client {
+            nymd_client,
+            denom,
+            contract_address,
+        }
    }

    pub async fn deposit(
        &self,
        amount: u64,
+        info: &str,
        verification_key: String,
        encryption_key: String,
-        fee: Option<Fee>,
    ) -> Result<String> {
-        let amount = Coin::new(amount as u128, DENOM.to_string());
+        let req = ExecuteMsg::DepositFunds {
+            data: DepositData::new(info.to_string(), verification_key, encryption_key),
+        };
+        let funds = vec![CosmosCoin {
+            denom: self.denom.clone(),
+            amount: Decimal::from(amount),
+        }];
        Ok(self
            .nymd_client
-            .deposit(
-                amount,
-                String::from(VOUCHER_INFO),
-                verification_key,
-                encryption_key,
-                fee,
-            )
+            .execute(&self.contract_address, &req, Default::default(), "", funds)
            .await?
            .transaction_hash
            .to_string())
@@ -55,9 +55,9 @@ impl Execute for Deposit {
        let tx_hash = client
            .deposit(
                self.amount,
+                VOUCHER_INFO,
                signing_keypair.public_key.clone(),
                encryption_keypair.public_key.clone(),
-                None,
            )
            .await?;

@@ -27,7 +27,7 @@ pretty_env_logger = "0.4" # for formatting log messages
 rand = { version = "0.7.3", features = ["wasm-bindgen"] } # rng-related traits + some rng implementation to use
 serde = { version = "1.0.104", features = ["derive"] } # for config serialization/deserialization
 sled = "0.34" # for storage of replySURB decryption keys
-tokio = { version = "1.19.1", features = ["rt-multi-thread", "net", "signal"] } # async runtime
+tokio = { version = "1.4", features = ["rt-multi-thread", "net", "signal"] } # async runtime
 tokio-tungstenite = "0.14" # websocket

 ## internal
@@ -592,9 +592,9 @@
      }
    },
    "node_modules/async": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
-      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
      "dev": true,
      "dependencies": {
        "lodash": "^4.17.14"
@@ -4825,9 +4825,9 @@
      "dev": true
    },
    "async": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
-      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
      "dev": true,
      "requires": {
        "lodash": "^4.17.14"
@@ -119,7 +119,6 @@ async fn gateway_details(
        .expect("The list of validator apis is empty");
    let validator_client = validator_client::ApiClient::new(validator_api.clone());

-    log::trace!("Fetching list of gateways from: {}", validator_api);
    let gateways = validator_client.get_cached_gateways().await.unwrap();
    let valid_gateways = gateways
        .into_iter()
@@ -187,9 +186,6 @@ pub async fn execute(matches: ArgMatches<'static>) {
    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 {
@@ -214,14 +210,12 @@ pub async fn execute(matches: ArgMatches<'static>) {
        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;

@@ -244,14 +238,8 @@ pub async fn execute(matches: ArgMatches<'static>) {
        .save_to_file(None)
        .expect("Failed to save the config file");
    println!("Saved configuration file to {:?}", config_save_location);
-    println!("Using gateway: {}", config.get_base().get_gateway_id());
-    log::debug!("Gateway id: {}", config.get_base().get_gateway_id());
-    log::debug!("Gateway owner: {}", config.get_base().get_gateway_owner());
-    log::debug!(
-        "Gateway listener: {}",
-        config.get_base().get_gateway_listener()
-    );
-    println!("Client configuration completed.");
+    println!("Using gateway: {}", config.get_base().get_gateway_id(),);
+    println!("Client configuration completed.\n\n\n");

    show_address(&config);
 }
@@ -39,11 +39,15 @@ pub(crate) fn override_config(mut config: Config, matches: &ArgMatches<'_>) -> C
            .set_custom_validator_apis(parse_validators(raw_validators));
    }

+    if let Some(gateway_id) = matches.value_of("gateway") {
+        config.get_base_mut().with_gateway_id(gateway_id);
+    }
+
    if matches.is_present("disable-socket") {
        config = config.with_socket(SocketType::None);
    }

-    if let Some(port) = matches.value_of("port").map(str::parse) {
+    if let Some(port) = matches.value_of("port").map(|port| port.parse::<u16>()) {
        if let Err(err) = port {
            // if port was overridden, it must be parsable
            panic!("Invalid port value provided - {:?}", err);
@@ -70,9 +70,7 @@ pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
 fn version_check(cfg: &Config) -> bool {
    let binary_version = env!("CARGO_PKG_VERSION");
    let config_version = cfg.get_base().get_version();
-    if binary_version == config_version {
-        true
-    } else {
+    if binary_version != config_version {
        warn!("The mixnode binary has different version than what is specified in config file! {} and {}", binary_version, config_version);
        if is_minor_version_compatible(binary_version, config_version) {
            info!("but they are still semver compatible. However, consider running the `upgrade` command");
@@ -81,6 +79,8 @@ fn version_check(cfg: &Config) -> bool {
            error!("and they are semver incompatible! - please run the `upgrade` command before attempting `run` again");
            false
        }
+    } else {
+        true
    }
 }

@@ -131,22 +131,22 @@ fn minor_0_12_upgrade(
    config
 }

-fn do_upgrade(mut config: Config, matches: &ArgMatches<'_>, package_version: &Version) {
+fn do_upgrade(mut config: Config, matches: &ArgMatches<'_>, package_version: Version) {
    loop {
        let config_version = parse_config_version(&config);

-        if &config_version == package_version {
+        if config_version == package_version {
            println!("You're using the most recent version!");
            return;
        }

        config = match config_version.major {
            0 => match config_version.minor {
-                9 | 10 => outdated_upgrade(&config_version, package_version),
-                11 => minor_0_12_upgrade(config, matches, &config_version, package_version),
-                _ => unsupported_upgrade(&config_version, package_version),
+                9 | 10 => outdated_upgrade(&config_version, &package_version),
+                11 => minor_0_12_upgrade(config, matches, &config_version, &package_version),
+                _ => unsupported_upgrade(&config_version, &package_version),
            },
-            _ => unsupported_upgrade(&config_version, package_version),
+            _ => unsupported_upgrade(&config_version, &package_version),
        }
    }
 }
@@ -167,5 +167,5 @@ pub fn execute(matches: &ArgMatches<'_>) {
    }

    // here be upgrade path to 0.9.X and beyond based on version number from config
-    do_upgrade(existing_config, matches, &package_version)
+    do_upgrade(existing_config, matches, package_version)
 }
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0

 use clap::{crate_version, App, ArgMatches};
-use network_defaults::DEFAULT_NETWORK;

 pub mod client;
 pub mod commands;
@@ -68,7 +67,6 @@ fn long_version() -> String {
 {:<20}{}
 {:<20}{}
 {:<20}{}
-{:<20}{}
 "#,
        "Build Timestamp:",
        env!("VERGEN_BUILD_TIMESTAMP"),
@@ -86,8 +84,6 @@ fn long_version() -> String {
        env!("VERGEN_RUSTC_CHANNEL"),
        "cargo Profile:",
        env!("VERGEN_CARGO_PROFILE"),
-        "Network:",
-        DEFAULT_NETWORK
    )
 }

@@ -108,7 +104,5 @@ fn setup_logging() {
        .filter_module("want", log::LevelFilter::Warn)
        .filter_module("tungstenite", log::LevelFilter::Warn)
        .filter_module("tokio_tungstenite", log::LevelFilter::Warn)
-        .filter_module("handlebars", log::LevelFilter::Warn)
-        .filter_module("sled", log::LevelFilter::Warn)
        .init();
 }
@@ -20,7 +20,7 @@ pretty_env_logger = "0.4"
 rand = { version = "0.7.3", features = ["wasm-bindgen"] }
 serde = { version = "1.0", features = ["derive"] } # for config serialization/deserialization
 snafu = "0.6"
-tokio = { version = "1.19.1", features = ["rt-multi-thread", "net", "signal"] }
+tokio = { version = "1.4", features = ["rt-multi-thread", "net", "signal"] }
 url = "2.2"

 # internal
@@ -187,9 +187,6 @@ pub async fn execute(matches: ArgMatches<'static>) {
    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 {
@@ -39,6 +39,10 @@ pub(crate) fn override_config(mut config: Config, matches: &ArgMatches<'_>) -> C
            .set_custom_validator_apis(parse_validators(raw_validators));
    }

+    if let Some(gateway_id) = matches.value_of("gateway") {
+        config.get_base_mut().with_gateway_id(gateway_id);
+    }
+
    if let Some(port) = matches.value_of("port").map(|port| port.parse::<u16>()) {
        if let Err(err) = port {
            // if port was overridden, it must be parsable
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0

 use clap::{crate_version, App, ArgMatches};
-use network_defaults::DEFAULT_NETWORK;

 pub mod client;
 mod commands;
@@ -68,7 +67,6 @@ fn long_version() -> String {
 {:<20}{}
 {:<20}{}
 {:<20}{}
-{:<20}{}
 "#,
        "Build Timestamp:",
        env!("VERGEN_BUILD_TIMESTAMP"),
@@ -86,8 +84,6 @@ fn long_version() -> String {
        env!("VERGEN_RUSTC_CHANNEL"),
        "cargo Profile:",
        env!("VERGEN_CARGO_PROFILE"),
-        "Network:",
-        DEFAULT_NETWORK
    )
 }

@@ -16,7 +16,7 @@ use proxy_helpers::connection_controller::{
 };
 use proxy_helpers::proxy_runner::ProxyRunner;
 use rand::RngCore;
-use socks5_requests::{ConnectionId, Message, RemoteAddress, Request};
+use socks5_requests::{ConnectionId, RemoteAddress, Request};
 use std::io;
 use std::net::SocketAddr;
 use std::pin::Pin;
@@ -224,9 +224,8 @@ impl SocksClient {

    async fn send_connect_to_mixnet(&mut self, remote_address: RemoteAddress) {
        let req = Request::new_connect(self.connection_id, remote_address, self.self_address);
-        let msg = Message::Request(req);

-        let input_message = InputMessage::new_fresh(self.service_provider, msg.into_bytes(), false);
+        let input_message = InputMessage::new_fresh(self.service_provider, req.into_bytes(), false);
        self.input_sender.unbounded_send(input_message).unwrap();
    }

@@ -253,8 +252,7 @@ impl SocksClient {
        )
        .run(move |conn_id, read_data, socket_closed| {
            let provider_request = Request::new_send(conn_id, read_data, socket_closed);
-            let provider_message = Message::Request(provider_request);
-            InputMessage::new_fresh(recipient, provider_message.into_bytes(), false)
+            InputMessage::new_fresh(recipient, provider_request.into_bytes(), false)
        })
        .await
        .into_inner();
@@ -24,7 +24,8 @@
    },
    "../pkg": {
      "name": "@nymproject/nym-client-wasm",
-      "version": "0.0.1"
+      "version": "0.12.0",
+      "license": "Apache-2.0"
    },
    "node_modules/@discoveryjs/json-ext": {
      "version": "0.5.7",
@@ -585,9 +586,9 @@
      }
    },
    "node_modules/async": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
-      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
      "dev": true,
      "dependencies": {
        "lodash": "^4.17.14"
@@ -4304,9 +4305,9 @@
      "dev": true
    },
    "async": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
-      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
      "dev": true,
      "requires": {
        "lodash": "^4.17.14"
@@ -35,7 +35,7 @@ default-features = false

 # non-wasm-only dependencies
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio]
-version = "1.19.1"
+version = "1.4"
 features = ["macros", "rt", "net", "sync", "time"]

 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-tungstenite]
@@ -101,7 +101,7 @@ impl GatewayClient {
    }

    pub fn set_disabled_credentials_mode(&mut self, disabled_credentials_mode: bool) {
-        self.disabled_credentials_mode = disabled_credentials_mode;
+        self.disabled_credentials_mode = disabled_credentials_mode
    }

    // TODO: later convert into proper builder methods
@@ -496,6 +496,7 @@ impl GatewayClient {
            self.shared_key.as_ref().unwrap(),
            iv,
        )
+        .ok_or(GatewayClientError::SerializeCredential)?
        .into();
        self.bandwidth_remaining = match self.send_websocket_message(msg).await? {
            ServerResponse::Bandwidth { available_total } => Ok(available_total),
@@ -9,8 +9,8 @@ edition = "2021"
 [dependencies]
 futures = "0.3"
 log = "0.4.8"
-tokio = { version = "1.19.1", features = ["time", "net", "rt"] }
-tokio-util = { version = "0.7.3", features = ["codec"] }
+tokio = { version = "1.4", features = ["time", "net", "rt"] }
+tokio-util = { version = "0.6", features = ["codec"] }

 # internal
 nymsphinx = {path = "../../nymsphinx" }
@@ -133,14 +133,20 @@ impl Client {
        if current_attempt == 0 {
            None
        } else {
-            let exp = 2_u32.checked_pow(current_attempt);
-            let backoff = exp
-                .and_then(|exp| self.config.initial_reconnection_backoff.checked_mul(exp))
-                .unwrap_or(self.config.maximum_reconnection_backoff);
+            // according to https://github.com/tokio-rs/tokio/issues/1953 there's an undocumented
+            // limit of tokio delay of about 2 years.
+            // let's ensure our delay is always on a sane side of being maximum 1 hour.
+            let maximum_sane_delay = Duration::from_secs(60 * 60);

            Some(std::cmp::min(
-                backoff,
-                self.config.maximum_reconnection_backoff,
+                maximum_sane_delay,
+                std::cmp::min(
+                    self.config
+                        .initial_reconnection_backoff
+                        .checked_mul(2_u32.pow(current_attempt))
+                        .unwrap_or(self.config.maximum_reconnection_backoff),
+                    self.config.maximum_reconnection_backoff,
+                ),
            ))
        }
    }
@@ -248,45 +254,3 @@ impl SendWithoutResponse for Client {
        }
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn dummy_client() -> Client {
-        Client::new(Config {
-            initial_reconnection_backoff: Duration::from_millis(10_000),
-            maximum_reconnection_backoff: Duration::from_millis(300_000),
-            initial_connection_timeout: Duration::from_millis(1_500),
-            maximum_connection_buffer_size: 128,
-        })
-    }
-
-    #[test]
-    fn determining_backoff_works_regardless_of_attempt() {
-        let client = dummy_client();
-        assert!(client.determine_backoff(0).is_none());
-        assert!(client.determine_backoff(1).is_some());
-        assert!(client.determine_backoff(2).is_some());
-        assert_eq!(
-            client.determine_backoff(16).unwrap(),
-            client.config.maximum_reconnection_backoff
-        );
-        assert_eq!(
-            client.determine_backoff(32).unwrap(),
-            client.config.maximum_reconnection_backoff
-        );
-        assert_eq!(
-            client.determine_backoff(1024).unwrap(),
-            client.config.maximum_reconnection_backoff
-        );
-        assert_eq!(
-            client.determine_backoff(65536).unwrap(),
-            client.config.maximum_reconnection_backoff
-        );
-        assert_eq!(
-            client.determine_backoff(u32::MAX).unwrap(),
-            client.config.maximum_reconnection_backoff
-        );
-    }
-}
@@ -10,11 +10,10 @@ rust-version = "1.56"
 [dependencies]
 base64 = "0.13"
 colored = "2.0"
-cw3 = "0.13.1"
 mixnet-contract-common = { path= "../../cosmwasm-smart-contracts/mixnet-contract" }
 vesting-contract-common = { path= "../../cosmwasm-smart-contracts/vesting-contract" }
-coconut-bandwidth-contract-common = { path= "../../cosmwasm-smart-contracts/coconut-bandwidth-contract" }
-multisig-contract-common = { path = "../../cosmwasm-smart-contracts/multisig-contract" }
+coconut-dkg-common = { path = "../../cosmwasm-smart-contracts/coconut-dkg-contract", optional = true }
+contracts-common = { path = "../../cosmwasm-smart-contracts/contracts-common", optional = true }
 vesting-contract = { path = "../../../contracts/vesting" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
@@ -22,7 +21,7 @@ reqwest = { version = "0.11", features = ["json"] }
 thiserror = "1"
 log = "0.4"
 url = { version = "2.2", features = ["serde"] }
-tokio = { version = "1.19.1", features = ["sync", "time"] }
+tokio = { version = "1.10", features = ["sync", "time"] }
 futures = "0.3"

 coconut-interface = { path = "../../coconut-interface" }
@@ -35,13 +34,12 @@ validator-api-requests = { path = "../../../validator-api/validator-api-requests
 async-trait = { version = "0.1.51", optional = true }
 bip39 = { version = "1", features = ["rand"], optional = true }
 config = { path = "../../config", optional = true }
-cosmrs = { version = "0.7.0", features = ["rpc", "bip32", "cosmwasm"], optional = true}
-prost = { version = "0.10", default-features = false, optional = true }
+cosmrs = { git = "https://github.com/nymtech/cosmos-rust", branch = "bugfix/account-id-length-validation", features = ["rpc", "bip32", "cosmwasm"], optional = true}
+prost = { version = "0.9", default-features = false, optional = true }
 flate2 = { version = "1.0.20", optional = true }
 sha2 = { version = "0.9.5", optional = true }
 itertools = { version = "0.10", optional = true }
-cosmwasm-std = { version = "1.0.0", optional = true }
-execute = { path = "../../execute" }
+cosmwasm-std = { version = "1.0.0-beta8", optional = true }

 [dev-dependencies]
 ts-rs = "6.1.2"
@@ -58,5 +56,4 @@ nymd-client = [
    "itertools",
    "cosmwasm-std",
 ]
-generate-ts = []
-
+dkg = ["nymd-client", "coconut-dkg-common", "contracts-common"]
@@ -2,20 +2,16 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::{validator_api, ValidatorClientError};
-use coconut_interface::{
-    BlindSignRequestBody, BlindedSignatureResponse, ExecuteReleaseFundsRequestBody,
-    ProposeReleaseFundsRequestBody, ProposeReleaseFundsResponse, VerificationKeyResponse,
-    VerifyCredentialBody, VerifyCredentialResponse,
-};
+use coconut_interface::{BlindSignRequestBody, BlindedSignatureResponse, VerificationKeyResponse};
 use mixnet_contract_common::{GatewayBond, IdentityKeyRef, MixNodeBond};
 use url::Url;

+#[cfg(feature = "nymd-client")]
+use validator_api_requests::models::UptimeResponse;
 use validator_api_requests::models::{
    CoreNodeStatusResponse, MixnodeStatusResponse, RewardEstimationResponse,
    StakeSaturationResponse,
 };
-#[cfg(feature = "nymd-client")]
-use validator_api_requests::models::{MixNodeBondAnnotated, UptimeResponse};

 #[cfg(feature = "nymd-client")]
 use network_defaults::DEFAULT_NETWORK;
@@ -25,6 +21,12 @@ use crate::nymd::{
    error::NymdError, CosmWasmClient, NymdClient, QueryNymdClient, SigningNymdClient,
 };

+#[cfg(feature = "dkg")]
+use crate::nymd::{traits::DkgClient, SigningCosmWasmClient};
+#[cfg(feature = "dkg")]
+use coconut_dkg_common::dealer::ContractDealingCommitment;
+#[cfg(feature = "dkg")]
+use coconut_dkg_common::types::{BlacklistedDealer, DealerDetails, EpochId};
 #[cfg(feature = "nymd-client")]
 use mixnet_contract_common::{
    mixnode::DelegationEvent, ContractStateParams, Delegation, IdentityKey, Interval,
@@ -33,6 +35,8 @@ use mixnet_contract_common::{
 };
 #[cfg(feature = "nymd-client")]
 use std::collections::{HashMap, HashSet};
+#[cfg(feature = "nymd-client")]
+use std::str::FromStr;

 #[cfg(feature = "nymd-client")]
 #[must_use]
@@ -41,57 +45,48 @@ pub struct Config {
    network: network_defaults::all::Network,
    api_url: Url,
    nymd_url: Url,
-    mixnet_contract_address: cosmrs::AccountId,
-    vesting_contract_address: cosmrs::AccountId,
-    bandwidth_claim_contract_address: cosmrs::AccountId,
+    mixnet_contract_address: Option<cosmrs::AccountId>,
+    vesting_contract_address: Option<cosmrs::AccountId>,
+    erc20_bridge_contract_address: Option<cosmrs::AccountId>,
+    #[cfg(feature = "dkg")]
+    coconut_dkg_contract_address: Option<cosmrs::AccountId>,

    mixnode_page_limit: Option<u32>,
    gateway_page_limit: Option<u32>,
    mixnode_delegations_page_limit: Option<u32>,
    rewarded_set_page_limit: Option<u32>,
+    #[cfg(feature = "dkg")]
+    dealers_page_limit: Option<u32>,
 }

 #[cfg(feature = "nymd-client")]
 impl Config {
-    pub fn new(network: network_defaults::all::Network, nymd_url: Url, api_url: Url) -> Self {
+    pub fn new(
+        network: network_defaults::all::Network,
+        nymd_url: Url,
+        api_url: Url,
+        mixnet_contract_address: Option<cosmrs::AccountId>,
+        vesting_contract_address: Option<cosmrs::AccountId>,
+        erc20_bridge_contract_address: Option<cosmrs::AccountId>,
+    ) -> Self {
        Config {
            network,
            nymd_url,
-            mixnet_contract_address: DEFAULT_NETWORK
-                .mixnet_contract_address()
-                .parse()
-                .expect("Error parsing mixnet contract address"),
-            vesting_contract_address: DEFAULT_NETWORK
-                .vesting_contract_address()
-                .parse()
-                .expect("Error parsing vesting contract address"),
-            bandwidth_claim_contract_address: DEFAULT_NETWORK
-                .bandwidth_claim_contract_address()
-                .parse()
-                .expect("Error parsing bandwidth claim contract address"),
+            mixnet_contract_address,
+            vesting_contract_address,
+            erc20_bridge_contract_address,
+            #[cfg(feature = "dkg")]
+            coconut_dkg_contract_address: None,
            api_url,
            mixnode_page_limit: None,
            gateway_page_limit: None,
            mixnode_delegations_page_limit: None,
            rewarded_set_page_limit: None,
+            #[cfg(feature = "dkg")]
+            dealers_page_limit: None,
        }
    }

-    pub fn with_mixnode_contract_address(mut self, address: cosmrs::AccountId) -> Self {
-        self.mixnet_contract_address = address;
-        self
-    }
-
-    pub fn with_vesting_contract_address(mut self, address: cosmrs::AccountId) -> Self {
-        self.vesting_contract_address = address;
-        self
-    }
-
-    pub fn with_bandwidth_claim_contract_address(mut self, address: cosmrs::AccountId) -> Self {
-        self.bandwidth_claim_contract_address = address;
-        self
-    }
-
    pub fn with_mixnode_page_limit(mut self, limit: Option<u32>) -> Config {
        self.mixnode_page_limit = limit;
        self
@@ -111,20 +106,33 @@ impl Config {
        self.rewarded_set_page_limit = limit;
        self
    }
+
+    #[cfg(feature = "dkg")]
+    pub fn with_coconut_dkg_contract(
+        mut self,
+        coconut_dkg_contract_address: Option<cosmrs::AccountId>,
+    ) -> Config {
+        self.coconut_dkg_contract_address = coconut_dkg_contract_address;
+        self
+    }
 }

 #[cfg(feature = "nymd-client")]
 pub struct Client<C> {
    pub network: network_defaults::all::Network,
-    mixnet_contract_address: cosmrs::AccountId,
-    vesting_contract_address: cosmrs::AccountId,
-    bandwidth_claim_contract_address: cosmrs::AccountId,
+    mixnet_contract_address: Option<cosmrs::AccountId>,
+    vesting_contract_address: Option<cosmrs::AccountId>,
+    erc20_bridge_contract_address: Option<cosmrs::AccountId>,
+    #[cfg(feature = "dkg")]
+    coconut_dkg_contract_address: Option<cosmrs::AccountId>,
    mnemonic: Option<bip39::Mnemonic>,

    mixnode_page_limit: Option<u32>,
    gateway_page_limit: Option<u32>,
    mixnode_delegations_page_limit: Option<u32>,
    rewarded_set_page_limit: Option<u32>,
+    #[cfg(feature = "dkg")]
+    dealers_page_limit: Option<u32>,

    // ideally they would have been read-only, but unfortunately rust doesn't have such features
    pub validator_api: validator_api::Client,
@@ -138,26 +146,33 @@ impl Client<SigningNymdClient> {
        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(
+        let mut nymd_client = NymdClient::connect_with_mnemonic(
            config.network,
            config.nymd_url.as_str(),
+            config.mixnet_contract_address.clone(),
+            config.vesting_contract_address.clone(),
+            config.erc20_bridge_contract_address.clone(),
            mnemonic.clone(),
            None,
-        )?
-        .with_mixnet_contract_address(config.mixnet_contract_address.clone())
-        .with_vesting_contract_address(config.vesting_contract_address.clone())
-        .with_bandwidth_claim_contract_address(config.bandwidth_claim_contract_address.clone());
+        )?;
+
+        #[cfg(feature = "dkg")]
+        nymd_client.set_coconut_dkg_contract_address(config.coconut_dkg_contract_address.clone());

        Ok(Client {
            network: config.network,
            mixnet_contract_address: config.mixnet_contract_address,
            vesting_contract_address: config.vesting_contract_address,
-            bandwidth_claim_contract_address: config.bandwidth_claim_contract_address,
+            erc20_bridge_contract_address: config.erc20_bridge_contract_address,
+            #[cfg(feature = "dkg")]
+            coconut_dkg_contract_address: config.coconut_dkg_contract_address,
            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,
+            #[cfg(feature = "dkg")]
+            dealers_page_limit: config.dealers_page_limit,
            validator_api: validator_api_client,
            nymd: nymd_client,
        })
@@ -167,12 +182,12 @@ impl Client<SigningNymdClient> {
        self.nymd = NymdClient::connect_with_mnemonic(
            self.network,
            new_endpoint.as_ref(),
+            self.mixnet_contract_address.clone(),
+            self.vesting_contract_address.clone(),
+            self.erc20_bridge_contract_address.clone(),
            self.mnemonic.clone().unwrap(),
            None,
-        )?
-        .with_mixnet_contract_address(self.mixnet_contract_address.clone())
-        .with_vesting_contract_address(self.vesting_contract_address.clone())
-        .with_bandwidth_claim_contract_address(self.bandwidth_claim_contract_address.clone());
+        )?;
        Ok(())
    }

@@ -185,30 +200,56 @@ impl Client<SigningNymdClient> {
 impl Client<QueryNymdClient> {
    pub fn new_query(config: Config) -> Result<Client<QueryNymdClient>, ValidatorClientError> {
        let validator_api_client = validator_api::Client::new(config.api_url.clone());
-        let nymd_client = NymdClient::connect(config.nymd_url.as_str())?
-            .with_mixnet_contract_address(config.mixnet_contract_address.clone())
-            .with_vesting_contract_address(config.vesting_contract_address.clone());
+        let mut nymd_client = NymdClient::connect(
+            config.nymd_url.as_str(),
+            Some(config.mixnet_contract_address.clone().unwrap_or_else(|| {
+                cosmrs::AccountId::from_str(DEFAULT_NETWORK.mixnet_contract_address()).unwrap()
+            })),
+            Some(config.vesting_contract_address.clone().unwrap_or_else(|| {
+                cosmrs::AccountId::from_str(DEFAULT_NETWORK.vesting_contract_address()).unwrap()
+            })),
+            Some(
+                config
+                    .erc20_bridge_contract_address
+                    .clone()
+                    .unwrap_or_else(|| {
+                        cosmrs::AccountId::from_str(
+                            DEFAULT_NETWORK.bandwidth_claim_contract_address(),
+                        )
+                        .unwrap()
+                    }),
+            ),
+        )?;
+
+        #[cfg(feature = "dkg")]
+        nymd_client.set_coconut_dkg_contract_address(config.coconut_dkg_contract_address.clone());

        Ok(Client {
            network: config.network,
            mixnet_contract_address: config.mixnet_contract_address,
            vesting_contract_address: config.vesting_contract_address,
-            bandwidth_claim_contract_address: config.bandwidth_claim_contract_address,
+            erc20_bridge_contract_address: config.erc20_bridge_contract_address,
+            #[cfg(feature = "dkg")]
+            coconut_dkg_contract_address: config.coconut_dkg_contract_address,
            mnemonic: None,
            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: config.rewarded_set_page_limit,
+            #[cfg(feature = "dkg")]
+            dealers_page_limit: config.dealers_page_limit,
            validator_api: validator_api_client,
            nymd: nymd_client,
        })
    }

    pub fn change_nymd(&mut self, new_endpoint: Url) -> Result<(), ValidatorClientError> {
-        self.nymd = NymdClient::connect(new_endpoint.as_ref())?
-            .with_mixnet_contract_address(self.mixnet_contract_address.clone())
-            .with_vesting_contract_address(self.vesting_contract_address.clone())
-            .with_bandwidth_claim_contract_address(self.bandwidth_claim_contract_address.clone());
+        self.nymd = NymdClient::connect(
+            new_endpoint.as_ref(),
+            self.mixnet_contract_address.clone(),
+            self.vesting_contract_address.clone(),
+            self.erc20_bridge_contract_address.clone(),
+        )?;
        Ok(())
    }
 }
@@ -219,13 +260,23 @@ impl<C> Client<C> {
        self.validator_api.change_url(new_endpoint)
    }

+    #[cfg(feature = "dkg")]
+    pub fn set_coconut_dkg_contract(
+        &mut self,
+        coconut_dkg_contract_address: Option<cosmrs::AccountId>,
+    ) {
+        self.nymd
+            .set_coconut_dkg_contract_address(coconut_dkg_contract_address.clone());
+        self.coconut_dkg_contract_address = coconut_dkg_contract_address;
+    }
+
    // use case: somebody initialised client without a contract in order to upload and initialise one
    // and now they want to actually use it without making new client
    pub fn set_mixnet_contract_address(&mut self, mixnet_contract_address: cosmrs::AccountId) {
-        self.mixnet_contract_address = mixnet_contract_address
+        self.mixnet_contract_address = Some(mixnet_contract_address)
    }

-    pub fn get_mixnet_contract_address(&self) -> cosmrs::AccountId {
+    pub fn get_mixnet_contract_address(&self) -> Option<cosmrs::AccountId> {
        self.mixnet_contract_address.clone()
    }

@@ -233,36 +284,18 @@ impl<C> Client<C> {
        Ok(self.validator_api.get_mixnodes().await?)
    }

-    pub async fn get_cached_mixnodes_detailed(
-        &self,
-    ) -> Result<Vec<MixNodeBondAnnotated>, ValidatorClientError> {
-        Ok(self.validator_api.get_mixnodes_detailed().await?)
-    }
-
    pub async fn get_cached_rewarded_mixnodes(
        &self,
    ) -> Result<Vec<MixNodeBond>, ValidatorClientError> {
        Ok(self.validator_api.get_rewarded_mixnodes().await?)
    }

-    pub async fn get_cached_rewarded_mixnodes_detailed(
-        &self,
-    ) -> Result<Vec<MixNodeBondAnnotated>, ValidatorClientError> {
-        Ok(self.validator_api.get_rewarded_mixnodes_detailed().await?)
-    }
-
    pub async fn get_cached_active_mixnodes(
        &self,
    ) -> Result<Vec<MixNodeBond>, ValidatorClientError> {
        Ok(self.validator_api.get_active_mixnodes().await?)
    }

-    pub async fn get_cached_active_mixnodes_detailed(
-        &self,
-    ) -> Result<Vec<MixNodeBondAnnotated>, ValidatorClientError> {
-        Ok(self.validator_api.get_active_mixnodes_detailed().await?)
-    }
-
    pub async fn get_cached_gateways(&self) -> Result<Vec<GatewayBond>, ValidatorClientError> {
        Ok(self.validator_api.get_gateways().await?)
    }
@@ -733,34 +766,116 @@ impl ApiClient {
    ) -> Result<VerificationKeyResponse, ValidatorClientError> {
        Ok(self.validator_api.get_coconut_verification_key().await?)
    }
+}

-    pub async fn verify_bandwidth_credential(
+// dkg-related impl block
+#[cfg(feature = "dkg")]
+impl<C> Client<C>
+where
+    C: SigningCosmWasmClient + Send + Sync,
+{
+    pub async fn get_all_nymd_current_dealers(
        &self,
-        request_body: &VerifyCredentialBody,
-    ) -> Result<VerifyCredentialResponse, ValidatorClientError> {
-        Ok(self
-            .validator_api
-            .verify_bandwidth_credential(request_body)
-            .await?)
+    ) -> Result<Vec<DealerDetails>, ValidatorClientError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        let mut dealers = Vec::new();
+        let mut start_after = None;
+        loop {
+            let mut paged_response = self
+                .nymd
+                .get_current_dealers_paged(start_after.take(), self.dealers_page_limit)
+                .await?;
+            dealers.append(&mut paged_response.dealers);
+
+            if let Some(start_after_res) = paged_response.start_next_after {
+                start_after = Some(start_after_res.into_string())
+            } else {
+                break;
+            }
+        }
+
+        Ok(dealers)
    }

-    pub async fn propose_release_funds(
+    pub async fn get_all_nymd_past_dealers(
        &self,
-        request_body: &ProposeReleaseFundsRequestBody,
-    ) -> Result<ProposeReleaseFundsResponse, ValidatorClientError> {
-        Ok(self
-            .validator_api
-            .propose_release_funds(request_body)
-            .await?)
+    ) -> Result<Vec<DealerDetails>, ValidatorClientError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        let mut dealers = Vec::new();
+        let mut start_after = None;
+        loop {
+            let mut paged_response = self
+                .nymd
+                .get_past_dealers_paged(start_after.take(), self.dealers_page_limit)
+                .await?;
+            dealers.append(&mut paged_response.dealers);
+
+            if let Some(start_after_res) = paged_response.start_next_after {
+                start_after = Some(start_after_res.into_string())
+            } else {
+                break;
+            }
+        }
+
+        Ok(dealers)
    }

-    pub async fn execute_release_funds(
+    pub async fn get_all_nymd_blacklisted_dealers(
        &self,
-        request_body: &ExecuteReleaseFundsRequestBody,
-    ) -> Result<(), ValidatorClientError> {
-        Ok(self
-            .validator_api
-            .execute_release_funds(request_body)
-            .await?)
+    ) -> Result<Vec<BlacklistedDealer>, ValidatorClientError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        let mut dealers = Vec::new();
+        let mut start_after = None;
+        loop {
+            let mut paged_response = self
+                .nymd
+                .get_blacklisted_dealers_paged(start_after.take(), self.dealers_page_limit)
+                .await?;
+            dealers.append(&mut paged_response.blacklisted_dealers);
+
+            if let Some(start_after_res) = paged_response.start_next_after {
+                start_after = Some(start_after_res.into_string())
+            } else {
+                break;
+            }
+        }
+
+        Ok(dealers)
+    }
+
+    pub async fn get_all_nymd_epoch_dealings_commitments(
+        &self,
+        epoch_id: EpochId,
+    ) -> Result<Vec<ContractDealingCommitment>, ValidatorClientError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        let mut commitments = Vec::new();
+        let mut start_after = None;
+        loop {
+            let mut paged_response = self
+                .nymd
+                .get_epoch_dealings_commitments_paged(
+                    epoch_id,
+                    start_after.take(),
+                    self.dealers_page_limit,
+                )
+                .await?;
+            commitments.append(&mut paged_response.commitments);
+
+            if let Some(start_after_res) = paged_response.start_next_after {
+                start_after = Some(start_after_res.into_string())
+            } else {
+                break;
+            }
+        }
+
+        Ok(commitments)
    }
 }
@@ -19,7 +19,7 @@ const CONNECTION_TEST_TIMEOUT_SEC: u64 = 2;
 pub async fn run_validator_connection_test<H: BuildHasher + 'static>(
    nymd_urls: impl Iterator<Item = (Network, Url)>,
    api_urls: impl Iterator<Item = (Network, Url)>,
-    mixnet_contract_address: HashMap<Network, cosmrs::AccountId, H>,
+    mixnet_contract_address: HashMap<Network, Option<cosmrs::AccountId>, H>,
 ) -> (
    HashMap<Network, Vec<(Url, bool)>>,
    HashMap<Network, Vec<(Url, bool)>>,
@@ -47,15 +47,14 @@ pub async fn run_validator_connection_test<H: BuildHasher + 'static>(
 fn setup_connection_tests<H: BuildHasher + 'static>(
    nymd_urls: impl Iterator<Item = (Network, Url)>,
    api_urls: impl Iterator<Item = (Network, Url)>,
-    mixnet_contract_address: HashMap<Network, cosmrs::AccountId, H>,
+    mixnet_contract_address: HashMap<Network, Option<cosmrs::AccountId>, H>,
 ) -> impl Iterator<Item = ClientForConnectionTest> {
    let nymd_connection_test_clients = nymd_urls.filter_map(move |(network, url)| {
        let address = mixnet_contract_address
            .get(&network)
            .expect("No configured contract address")
            .clone();
-        NymdClient::<QueryNymdClient>::connect(url.as_str())
-            .map(|client| client.with_mixnet_contract_address(address))
+        NymdClient::<QueryNymdClient>::connect(url.as_str(), address, None, None)
            .map(move |client| ClientForConnectionTest::Nymd(network, url, Box::new(client)))
            .ok()
    });
@@ -1,130 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-use serde::{Deserialize, Serialize};
-use std::fmt;
-
-pub use cosmrs::Coin as CosmosCoin;
-pub use cosmwasm_std::Coin as CosmWasmCoin;
-
-#[derive(Serialize, Deserialize, Clone, Copy, Default, Debug, PartialEq)]
-pub struct MismatchedDenoms;
-
-// the reason the coin is created here as opposed to different place in the codebase is that
-// eventually we want to either publish the cosmwasm client separately or commit it to
-// some other project, like cosmrs. Either way, in that case we can't really have
-// a dependency on an internal type
-#[derive(Serialize, Deserialize, Clone, Default, Debug, PartialEq)]
-pub struct Coin {
-    pub amount: u128,
-    pub denom: String,
-}
-
-impl Coin {
-    pub fn new<S: Into<String>>(amount: u128, denom: S) -> Self {
-        Coin {
-            amount,
-            denom: denom.into(),
-        }
-    }
-
-    pub fn try_add(&self, other: &Self) -> Result<Self, MismatchedDenoms> {
-        if self.denom != other.denom {
-            Err(MismatchedDenoms)
-        } else {
-            Ok(Coin {
-                amount: self.amount + other.amount,
-                denom: self.denom.clone(),
-            })
-        }
-    }
-}
-
-impl fmt::Display for Coin {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}{}", self.amount, self.denom)
-    }
-}
-
-impl From<Coin> for CosmosCoin {
-    fn from(coin: Coin) -> Self {
-        assert!(
-            coin.amount <= u64::MAX as u128,
-            "the coin amount is higher than the maximum supported by cosmrs"
-        );
-
-        CosmosCoin {
-            denom: coin
-                .denom
-                .parse()
-                .expect("the coin should have had a valid denom!"),
-            amount: (coin.amount as u64).into(),
-        }
-    }
-}
-
-impl From<CosmosCoin> for Coin {
-    fn from(coin: CosmosCoin) -> Self {
-        Coin {
-            amount: coin
-                .amount
-                .to_string()
-                .parse()
-                .expect("somehow failed to parse string representation of u64"),
-            denom: coin.denom.to_string(),
-        }
-    }
-}
-
-impl From<Coin> for CosmWasmCoin {
-    fn from(coin: Coin) -> Self {
-        CosmWasmCoin::new(coin.amount, coin.denom)
-    }
-}
-
-impl From<CosmWasmCoin> for Coin {
-    fn from(coin: CosmWasmCoin) -> Self {
-        Coin {
-            amount: coin.amount.u128(),
-            denom: coin.denom,
-        }
-    }
-}
-
-pub trait CoinConverter {
-    type Target;
-
-    fn convert_coin(&self) -> Self::Target;
-}
-
-impl CoinConverter for CosmosCoin {
-    type Target = CosmWasmCoin;
-
-    fn convert_coin(&self) -> Self::Target {
-        CosmWasmCoin::new(
-            self.amount
-                .to_string()
-                .parse()
-                .expect("cosmos coin had an invalid amount assigned"),
-            self.denom.to_string(),
-        )
-    }
-}
-
-impl CoinConverter for CosmWasmCoin {
-    type Target = CosmosCoin;
-
-    fn convert_coin(&self) -> Self::Target {
-        assert!(
-            self.amount.u128() <= u64::MAX as u128,
-            "the coin amount is higher than the maximum supported by cosmrs"
-        );
-
-        CosmosCoin {
-            denom: self
-                .denom
-                .parse()
-                .expect("cosmwasm coin had an invalid amount assigned"),
-            amount: (self.amount.u128() as u64).into(),
-        }
-    }
-}
@@ -1,7 +1,6 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::nymd::coin::Coin;
 use crate::nymd::cosmwasm_client::helpers::{create_pagination, next_page_key};
 use crate::nymd::cosmwasm_client::types::{
    Account, Code, CodeDetails, Contract, ContractCodeHistoryEntry, ContractCodeId,
@@ -26,7 +25,8 @@ use cosmrs::rpc::{self, HttpClient, Order};
 use cosmrs::tendermint::abci::Code as AbciCode;
 use cosmrs::tendermint::abci::Transaction;
 use cosmrs::tendermint::{abci, block, chain};
-use cosmrs::{tx, AccountId, Coin as CosmosCoin, Denom, Tx};
+use cosmrs::{tx, AccountId, Coin, Denom, Tx};
+use cosmwasm_std::Coin as CosmWasmCoin;
 use prost::Message;
 use serde::{Deserialize, Serialize};
 use std::convert::{TryFrom, TryInto};
@@ -135,7 +135,7 @@ pub trait CosmWasmClient: rpc::Client {
            .await?;

        res.balance
-            .map(|proto| CosmosCoin::try_from(proto).map(Into::into))
+            .map(TryFrom::try_from)
            .transpose()
            .map_err(|_| NymdError::SerializationError("Coin".to_owned()))
    }
@@ -166,12 +166,16 @@ pub trait CosmWasmClient: rpc::Client {

        raw_balances
            .into_iter()
-            .map(|proto| CosmosCoin::try_from(proto).map(Into::into))
+            .map(TryFrom::try_from)
            .collect::<Result<_, _>>()
            .map_err(|_| NymdError::SerializationError("Coins".to_owned()))
    }

-    async fn get_total_supply(&self) -> Result<Vec<Coin>, NymdError> {
+    // this is annoyingly and inconsistently returning `Vec<CosmWasmCoin>` rather than
+    // Vec<Coin>, since cosmrs::Coin can't deal with IBC denoms.
+    // Presumably after https://github.com/cosmos/cosmos-rust/issues/173 is resolved,
+    // the code could be adjusted
+    async fn get_total_supply(&self) -> Result<Vec<CosmWasmCoin>, NymdError> {
        let path = Some("/cosmos.bank.v1beta1.Query/TotalSupply".parse().unwrap());

        let mut supply = Vec::new();
@@ -194,7 +198,12 @@ pub trait CosmWasmClient: rpc::Client {

        supply
            .into_iter()
-            .map(|proto| CosmosCoin::try_from(proto).map(Into::into))
+            .map(|coin| {
+                coin.amount.parse().map(|amount| CosmWasmCoin {
+                    denom: coin.denom,
+                    amount,
+                })
+            })
            .collect::<Result<_, _>>()
            .map_err(|_| NymdError::SerializationError("Coins".to_owned()))
    }
@@ -474,9 +483,6 @@ pub trait CosmWasmClient: rpc::Client {
    // deprecation warning is due to the fact the protobuf files built were based on cosmos-sdk 0.44,
    // where they prefer using tx_bytes directly. However, in 0.42, which we are using at the time
    // of writing this, the option does not work
-    // TODO: we should really stop using the `tx` argument here and use `tx_bytes` exlusively,
-    // however, at the time of writing this update, while our QA and mainnet networks do support it,
-    // sandbox is still running old version of wasmd that lacks support for `tx_bytes`
    #[allow(deprecated)]
    async fn query_simulate(
        &self,
@@ -68,7 +68,6 @@ pub(crate) fn create_pagination(key: Vec<u8>) -> PageRequest {
        offset: 0,
        limit: 0,
        count_total: false,
-        reverse: false,
    }
 }

@@ -4,11 +4,11 @@
 use crate::nymd::error::NymdError;
 use cosmrs::tendermint::abci;
 use itertools::Itertools;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;

 // it seems that currently validators just emit stringified events (which are also returned as part of deliverTx response)
 // as theirs logs
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Deserialize)]
 pub struct Log {
    #[serde(default)]
    // weird thing is that the first msg_index seems to always be undefined on the raw logs
@@ -22,7 +22,7 @@ pub struct Log {

 /// Searches in logs for the first event of the given event type and in that event
 /// for the first attribute with the given attribute key.
-pub fn find_attribute<'a>(
+pub(crate) fn find_attribute<'a>(
    logs: &'a [Log],
    event_type: &str,
    attribute_key: &str,
@@ -1,14 +1,9 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::nymd::cosmwasm_client::client::CosmWasmClient;
-use crate::nymd::cosmwasm_client::helpers::{compress_wasm_code, CheckResponse};
-use crate::nymd::cosmwasm_client::logs::{self, parse_raw_logs};
-use crate::nymd::cosmwasm_client::types::*;
-use crate::nymd::error::NymdError;
-use crate::nymd::fee::{Fee, DEFAULT_SIMULATED_GAS_MULTIPLIER};
-use crate::nymd::wallet::DirectSecp256k1HdWallet;
-use crate::nymd::{Coin, GasPrice, TxResponse};
+use std::convert::TryInto;
+use std::time::Duration;
+
 use async_trait::async_trait;
 use cosmrs::bank::MsgSend;
 use cosmrs::distribution::MsgWithdrawDelegatorReward;
@@ -17,40 +12,33 @@ use cosmrs::rpc::endpoint::broadcast;
 use cosmrs::rpc::{Error as TendermintRpcError, HttpClient, HttpClientUrl, SimpleRequest};
 use cosmrs::staking::{MsgDelegate, MsgUndelegate};
 use cosmrs::tx::{self, Msg, SignDoc, SignerInfo};
-use cosmrs::{cosmwasm, rpc, AccountId, Any, Tx};
+use cosmrs::{cosmwasm, rpc, AccountId, Any, Coin, Tx};
 use log::debug;
 use serde::Serialize;
 use sha2::Digest;
 use sha2::Sha256;
-use std::convert::TryInto;
-use std::time::Duration;
+
+use crate::nymd::cosmwasm_client::client::CosmWasmClient;
+use crate::nymd::cosmwasm_client::helpers::{compress_wasm_code, CheckResponse};
+use crate::nymd::cosmwasm_client::logs::{self, parse_raw_logs};
+use crate::nymd::cosmwasm_client::types::*;
+use crate::nymd::error::NymdError;
+use crate::nymd::fee::{Fee, DEFAULT_SIMULATED_GAS_MULTIPLIER};
+use crate::nymd::wallet::DirectSecp256k1HdWallet;
+use crate::nymd::{CosmosCoin, GasPrice, TxResponse};
+
+// we need to have **a** valid secp256k1 signature for simulation purposes.
+// it doesn't matter what it is as long as it parses correctly
+const DUMMY_SECP256K1_SIGNATURE: &[u8] = &[
+    54, 167, 169, 61, 100, 173, 231, 87, 1, 113, 179, 49, 102, 141, 67, 22, 170, 153, 52, 88, 178,
+    159, 200, 11, 37, 138, 76, 221, 187, 70, 104, 123, 98, 216, 190, 249, 149, 81, 1, 158, 0, 220,
+    32, 147, 101, 60, 64, 77, 44, 83, 221, 119, 170, 124, 109, 177, 73, 116, 46, 57, 102, 181, 98,
+    91,
+];

 const DEFAULT_BROADCAST_POLLING_RATE: Duration = Duration::from_secs(4);
 const DEFAULT_BROADCAST_TIMEOUT: Duration = Duration::from_secs(60);

-fn empty_fee() -> tx::Fee {
-    tx::Fee {
-        amount: vec![],
-        gas_limit: Default::default(),
-        payer: None,
-        granter: None,
-    }
-}
-
-fn single_unspecified_signer_auth(
-    public_key: Option<tx::SignerPublicKey>,
-    sequence_number: tx::SequenceNumber,
-) -> tx::AuthInfo {
-    tx::SignerInfo {
-        public_key,
-        mode_info: tx::ModeInfo::Single(tx::mode_info::Single {
-            mode: SignMode::Unspecified,
-        }),
-        sequence: sequence_number,
-    }
-    .auth_info(empty_fee())
-}
-
 #[async_trait]
 pub trait SigningCosmWasmClient: CosmWasmClient {
    fn signer(&self) -> &DirectSecp256k1HdWallet;
@@ -76,21 +64,33 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
        let sequence_response = self.get_sequence(signer_address).await?;

        let partial_tx = Tx {
-            body: tx::Body::new(messages, memo, 0u32),
-            auth_info: single_unspecified_signer_auth(public_key, sequence_response.sequence),
-            signatures: vec![Vec::new()],
+            body: tx::Body {
+                messages,
+                memo: memo.into(),
+                timeout_height: 0u32.into(),
+                extension_options: vec![],
+                non_critical_extension_options: vec![],
+            },
+            auth_info: tx::AuthInfo {
+                signer_infos: vec![tx::SignerInfo {
+                    public_key,
+                    mode_info: tx::ModeInfo::Single(tx::mode_info::Single {
+                        mode: SignMode::Unspecified,
+                    }),
+                    sequence: sequence_response.sequence,
+                }],
+                fee: tx::Fee::from_amount_and_gas(
+                    CosmosCoin {
+                        denom: "".parse().unwrap(),
+                        amount: 0u64.into(),
+                    },
+                    0,
+                ),
+            },
+            signatures: vec![DUMMY_SECP256K1_SIGNATURE.try_into().unwrap()],
        };
-        self.query_simulate(Some(partial_tx), Vec::new()).await

-        // for completion sake, once we're able to transition into using `tx_bytes`,
-        // we might want to use something like this instead:
-        // let tx_raw: tx::Raw = cosmrs::proto::cosmos::tx::v1beta1::TxRaw {
-        //     body_bytes: partial_tx.body.into_bytes().unwrap(),
-        //     auth_info_bytes: partial_tx.auth_info.into_bytes().unwrap(),
-        //     signatures: partial_tx.signatures,
-        // }
-        // .into();
-        // self.query_simulate(None, tx_raw.to_bytes().unwrap()).await
+        self.query_simulate(Some(partial_tx), Vec::new()).await
    }

    async fn upload(
@@ -310,7 +310,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            sender: sender_address.clone(),
            contract: contract_address.clone(),
            msg: serde_json::to_vec(msg)?,
-            funds: funds.into_iter().map(Into::into).collect(),
+            funds,
        }
        .to_any()
        .map_err(|_| NymdError::SerializationError("MsgExecuteContract".to_owned()))?;
@@ -320,6 +320,8 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            .await?
            .check_response()?;

+        println!("height: {}", tx_res.height);
+
        let gas_info = GasInfo::new(tx_res.tx_result.gas_wanted, tx_res.tx_result.gas_used);

        Ok(ExecuteResult {
@@ -349,7 +351,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
                    sender: sender_address.clone(),
                    contract: contract_address.clone(),
                    msg: serde_json::to_vec(&msg)?,
-                    funds: funds.into_iter().map(Into::into).collect(),
+                    funds,
                }
                .to_any()
                .map_err(|_| NymdError::SerializationError("MsgExecuteContract".to_owned()))
@@ -382,7 +384,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
        let send_msg = MsgSend {
            from_address: sender_address.clone(),
            to_address: recipient_address.clone(),
-            amount: amount.into_iter().map(Into::into).collect(),
+            amount,
        }
        .to_any()
        .map_err(|_| NymdError::SerializationError("MsgSend".to_owned()))?;
@@ -408,7 +410,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
                MsgSend {
                    from_address: sender_address.clone(),
                    to_address,
-                    amount: amount.into_iter().map(Into::into).collect(),
+                    amount,
                }
                .to_any()
                .map_err(|_| NymdError::SerializationError("MsgExecuteContract".to_owned()))
@@ -431,7 +433,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
        let delegate_msg = MsgDelegate {
            delegator_address: delegator_address.to_owned(),
            validator_address: validator_address.to_owned(),
-            amount: amount.into(),
+            amount,
        }
        .to_any()
        .map_err(|_| NymdError::SerializationError("MsgDelegate".to_owned()))?;
@@ -452,7 +454,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
        let undelegate_msg = MsgUndelegate {
            delegator_address: delegator_address.to_owned(),
            validator_address: validator_address.to_owned(),
-            amount: amount.into(),
+            amount: Some(amount),
        }
        .to_any()
        .map_err(|_| NymdError::SerializationError("MsgUndelegate".to_owned()))?;
@@ -28,7 +28,7 @@ use cosmrs::proto::cosmwasm::wasm::v1::{
 use cosmrs::tendermint::abci::Data;
 use cosmrs::tendermint::{abci, chain};
 use cosmrs::tx::{AccountNumber, Gas, SequenceNumber};
-use cosmrs::{tx, AccountId, Any, Coin as CosmosCoin};
+use cosmrs::{tx, AccountId, Any, Coin};
 use prost::Message;
 use serde::Serialize;
 use std::convert::{TryFrom, TryInto};
@@ -107,9 +107,9 @@ impl TryFrom<ProtoModuleAccount> for ModuleAccount {
 #[derive(Debug)]
 pub struct BaseVestingAccount {
    pub base_account: Option<BaseAccount>,
-    pub original_vesting: Vec<CosmosCoin>,
-    pub delegated_free: Vec<CosmosCoin>,
-    pub delegated_vesting: Vec<CosmosCoin>,
+    pub original_vesting: Vec<Coin>,
+    pub delegated_free: Vec<Coin>,
+    pub delegated_vesting: Vec<Coin>,
    pub end_time: i64,
 }

@@ -184,7 +184,7 @@ impl TryFrom<ProtoDelayedVestingAccount> for DelayedVestingAccount {
 #[derive(Debug)]
 pub struct Period {
    pub length: i64,
-    pub amount: Vec<CosmosCoin>,
+    pub amount: Vec<Coin>,
 }

 impl TryFrom<ProtoPeriod> for Period {
@@ -489,7 +489,7 @@ impl TryFrom<ProtoContractCodeHistoryEntry> for ContractCodeHistoryEntry {
    }
 }

-#[derive(Copy, Clone, Debug, Default, Eq, PartialEq)]
+#[derive(Debug)]
 pub struct GasInfo {
    /// GasWanted is the maximum units of work we allow this tx to perform.
    pub gas_wanted: Gas,
@@ -628,7 +628,7 @@ pub struct InstantiateOptions {
    /// created and before the instantiation message is executed by the contract.
    ///
    /// Only native tokens are supported.
-    pub funds: Vec<CosmosCoin>,
+    pub funds: Vec<Coin>,

    /// A bech32 encoded address of an admin account.
    /// Caution: an admin has the privilege to upgrade a contract.
@@ -636,15 +636,6 @@ pub struct InstantiateOptions {
    pub admin: Option<AccountId>,
 }

-impl InstantiateOptions {
-    pub fn new<T: Into<CosmosCoin>>(funds: Vec<T>, admin: Option<AccountId>) -> Self {
-        InstantiateOptions {
-            funds: funds.into_iter().map(Into::into).collect(),
-            admin,
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct InstantiateResult {
    /// The address of the newly instantiated contract
@@ -21,12 +21,9 @@ pub enum NymdError {
    #[error("There was an issue with bip32 - {0}")]
    Bip32Error(#[from] bip32::Error),

-    #[error("There was an issue with bip39 - {0}")]
+    #[error("There was an issue with bip32 - {0}")]
    Bip39Error(#[from] bip39::Error),

-    #[error("There was an issue on the cosmrs side - {0}")]
-    CosmrsError(#[from] cosmrs::Error),
-
    #[error("Failed to derive account address")]
    AccountDerivationError,

@@ -42,10 +39,10 @@ pub enum NymdError {
    #[error("There was an issue with a tendermint RPC request - {0}")]
    TendermintError(#[from] TendermintRpcError),

-    #[error("There was an issue when attempting to serialize data ({0})")]
+    #[error("There was an issue when attempting to serialize data")]
    SerializationError(String),

-    #[error("There was an issue when attempting to deserialize data ({0})")]
+    #[error("There was an issue when attempting to deserialize data")]
    DeserializationError(String),

    #[error("There was an issue when attempting to encode our protobuf data - {0}")]
@@ -124,12 +121,6 @@ pub enum NymdError {

    #[error("Transaction with ID {hash} has been submitted but not yet found on the chain. You might want to check for it later. There was a total wait of {} seconds", .timeout.as_secs())]
    BroadcastTimeout { hash: tx::Hash, timeout: Duration },
-
-    #[error("Cosmwasm std error: {0}")]
-    CosmwasmStdError(#[from] cosmwasm_std::StdError),
-
-    #[error("Coconut interface error: {0}")]
-    CoconutInterfaceError(#[from] coconut_interface::error::CoconutInterfaceError),
 }

 impl NymdError {
@@ -4,7 +4,7 @@
 use crate::nymd::error::NymdError;
 use config::defaults;
 use cosmrs::tx::Gas;
-use cosmrs::Coin;
+use cosmrs::{Coin, Denom};
 use cosmwasm_std::{Decimal, Fraction, Uint128};
 use std::ops::Mul;
 use std::str::FromStr;
@@ -13,12 +13,11 @@ use std::str::FromStr;
 /// the smallest fee token unit, such as 0.012utoken.
 #[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
 pub struct GasPrice {
-    // I really dislike the usage of cosmwasm Decimal, but I didn't feel like implementing
-    // our own maths subcrate just for the purposes of calculating gas requirements
-    // this should definitely be rectified later on
+    // I really hate the combination of cosmwasm Decimal with cosmos-sdk Denom,
+    // but cosmos-sdk's Decimal is too basic for our needs
    pub amount: Decimal,

-    pub denom: String,
+    pub denom: Denom,
 }

 impl<'a> Mul<Gas> for &'a GasPrice {
@@ -45,10 +44,7 @@ impl<'a> Mul<Gas> for &'a GasPrice {

        assert!(amount.u128() <= u64::MAX as u128);
        Coin {
-            denom: self
-                .denom
-                .parse()
-                .expect("the gas price has been created with invalid denom"),
+            denom: self.denom.clone(),
            amount: (amount.u128() as u64).into(),
        }
    }
@@ -67,7 +63,9 @@ impl FromStr for GasPrice {
            .parse()
            .map_err(|_| NymdError::MalformedGasPrice)?;
        let possible_denom = s.chars().skip(amount_len).collect::<String>();
-        let denom = possible_denom.trim().to_string();
+        let denom = possible_denom
+            .parse()
+            .map_err(|_| NymdError::MalformedGasPrice)?;

        Ok(GasPrice { amount, denom })
    }
@@ -108,14 +106,8 @@ mod tests {
        );

        assert!(".25upunk".parse::<GasPrice>().is_err());
-
-        assert_eq!(
-            "0.025upunk".parse::<GasPrice>().unwrap(),
-            "0.025 upunk".parse().unwrap()
-        );
-
-        let gas: GasPrice = "0.025   upunk    ".parse().unwrap();
-        assert_eq!("upunk", gas.denom);
+        assert!("0.025 upunk".parse::<GasPrice>().is_err());
+        assert!("0.025UPUNK".parse::<GasPrice>().is_err());
    }

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

 use cosmrs::tx;
-use serde::{Deserialize, Serialize};

 pub mod gas_price;
+pub mod helpers;

 pub const DEFAULT_SIMULATED_GAS_MULTIPLIER: f32 = 1.3;

-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone)]
 pub enum Fee {
-    Manual(#[serde(with = "sealed::TxFee")] tx::Fee),
+    Manual(tx::Fee),
    Auto(Option<f32>),
 }

@@ -31,91 +31,3 @@ impl Default for Fee {
        Fee::Auto(Some(DEFAULT_SIMULATED_GAS_MULTIPLIER))
    }
 }
-
-// a workaround to provide serde implementation for tx::Fee. We don't want to ever expose any of those
-// types to the public and ideally they will get replaced by proper implementation inside comrs
-mod sealed {
-    use cosmrs::tx::{self, Gas};
-    use cosmrs::Coin as CosmosCoin;
-    use cosmrs::{AccountId, Decimal as CosmosDecimal, Denom as CosmosDenom};
-    use serde::{Deserialize, Deserializer, Serialize, Serializer};
-
-    fn cosmos_denom_inner_getter(val: &CosmosDenom) -> String {
-        val.as_ref().to_string()
-    }
-
-    #[derive(Serialize, Deserialize)]
-    #[serde(remote = "CosmosDenom")]
-    struct Denom(#[serde(getter = "cosmos_denom_inner_getter")] String);
-
-    impl From<Denom> for CosmosDenom {
-        fn from(val: Denom) -> Self {
-            val.0.parse().unwrap()
-        }
-    }
-
-    fn cosmos_decimal_inner_getter(val: &CosmosDecimal) -> u64 {
-        // haha, this code is so disgusting. I'll make a PR on cosmrs to slightly alleviate those issues...
-        // note: unwrap here is fine as the to_string is just returning a stringified u64 which, well, is a valid u64
-        val.to_string().parse().unwrap()
-    }
-
-    // at the time of writing it the current cosmrs' Decimal is extremely limited...
-    #[derive(Serialize, Deserialize)]
-    #[serde(remote = "CosmosDecimal")]
-    struct Decimal(#[serde(getter = "cosmos_decimal_inner_getter")] u64);
-
-    impl From<Decimal> for CosmosDecimal {
-        fn from(val: Decimal) -> Self {
-            val.0.into()
-        }
-    }
-
-    #[derive(Serialize, Deserialize, Clone)]
-    struct Coin {
-        #[serde(with = "Denom")]
-        denom: CosmosDenom,
-        #[serde(with = "Decimal")]
-        amount: CosmosDecimal,
-    }
-
-    impl From<Coin> for CosmosCoin {
-        fn from(val: Coin) -> Self {
-            CosmosCoin {
-                denom: val.denom,
-                amount: val.amount,
-            }
-        }
-    }
-
-    impl From<CosmosCoin> for Coin {
-        fn from(val: CosmosCoin) -> Self {
-            Coin {
-                denom: val.denom,
-                amount: val.amount,
-            }
-        }
-    }
-
-    fn coin_vec_ser<S: Serializer>(val: &[CosmosCoin], serializer: S) -> Result<S::Ok, S::Error> {
-        let vec: Vec<Coin> = val.iter().cloned().map(Into::into).collect();
-        vec.serialize(serializer)
-    }
-    fn coin_vec_deser<'de, D: Deserializer<'de>>(
-        deserializer: D,
-    ) -> Result<Vec<CosmosCoin>, D::Error> {
-        let vec: Vec<Coin> = Deserialize::deserialize(deserializer)?;
-        Ok(vec.iter().cloned().map(Into::into).collect())
-    }
-
-    #[derive(Serialize, Deserialize)]
-    #[serde(remote = "tx::Fee")]
-    pub(super) struct TxFee {
-        #[serde(serialize_with = "coin_vec_ser")]
-        #[serde(deserialize_with = "coin_vec_deser")]
-        pub amount: Vec<CosmosCoin>,
-        pub gas_limit: Gas,
-        pub payer: Option<AccountId>,
-        pub granter: Option<AccountId>,
-    }
-}
@@ -1,49 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-pub use crate::nymd::cosmwasm_client::signing_client::SigningCosmWasmClient;
-use crate::nymd::cosmwasm_client::types::ExecuteResult;
-use crate::nymd::error::NymdError;
-use crate::nymd::{Coin, Fee, NymdClient};
-use coconut_bandwidth_contract_common::{deposit::DepositData, msg::ExecuteMsg};
-
-use async_trait::async_trait;
-
-#[async_trait]
-pub trait CoconutBandwidthSigningClient {
-    async fn deposit(
-        &self,
-        amount: Coin,
-        info: String,
-        verification_key: String,
-        encryption_key: String,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
-}
-
-#[async_trait]
-impl<C: SigningCosmWasmClient + Sync + Send> CoconutBandwidthSigningClient for NymdClient<C> {
-    async fn deposit(
-        &self,
-        amount: Coin,
-        info: String,
-        verification_key: String,
-        encryption_key: String,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
-        let req = ExecuteMsg::DepositFunds {
-            data: DepositData::new(info.to_string(), verification_key, encryption_key),
-        };
-        self.client
-            .execute(
-                self.address(),
-                self.coconut_bandwidth_contract_address(),
-                &req,
-                fee,
-                "CoconutBandwidth::Deposit",
-                vec![amount],
-            )
-            .await
-    }
-}
@@ -0,0 +1,213 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::nymd::cosmwasm_client::types::ExecuteResult;
+use crate::nymd::error::NymdError;
+use crate::nymd::{cosmwasm_coin_to_cosmos_coin, Fee, NymdClient, SigningCosmWasmClient};
+use async_trait::async_trait;
+use coconut_dkg_common::dealer::{DealerDetailsResponse, PagedCommitmentsResponse};
+use coconut_dkg_common::msg::ExecuteMsg as DkgExecuteMsg;
+use coconut_dkg_common::msg::QueryMsg as DkgQueryMsg;
+use coconut_dkg_common::types::{
+    BlacklistingResponse, EncodedBTEPublicKeyWithProof, EncodedEd25519PublicKey, Epoch, EpochId,
+    MinimumDepositResponse, PagedBlacklistingResponse, PagedDealerResponse,
+};
+use contracts_common::commitment::ContractSafeCommitment;
+use cosmrs::AccountId;
+
+#[async_trait]
+pub trait DkgClient {
+    async fn get_current_dkg_epoch(&self) -> Result<Epoch, NymdError>;
+    async fn get_dealer_details(
+        &self,
+        address: &AccountId,
+    ) -> Result<DealerDetailsResponse, NymdError>;
+    async fn get_current_dealers_paged(
+        &self,
+        start_after: Option<String>,
+        page_limit: Option<u32>,
+    ) -> Result<PagedDealerResponse, NymdError>;
+    async fn get_past_dealers_paged(
+        &self,
+        start_after: Option<String>,
+        page_limit: Option<u32>,
+    ) -> Result<PagedDealerResponse, NymdError>;
+
+    async fn get_blacklisted_dealers_paged(
+        &self,
+        start_after: Option<String>,
+        page_limit: Option<u32>,
+    ) -> Result<PagedBlacklistingResponse, NymdError>;
+
+    async fn get_blacklisting(&self, dealer: String) -> Result<BlacklistingResponse, NymdError>;
+    async fn get_deposit_amount(&self) -> Result<MinimumDepositResponse, NymdError>;
+    async fn get_epoch_dealings_commitments_paged(
+        &self,
+        epoch: EpochId,
+        start_after: Option<String>,
+        page_limit: Option<u32>,
+    ) -> Result<PagedCommitmentsResponse, NymdError>;
+
+    async fn register_dealer(
+        &self,
+        identity: EncodedEd25519PublicKey,
+        bte_key: EncodedBTEPublicKeyWithProof,
+        owner_signature: String,
+        listening_address: String,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NymdError>;
+    async fn submit_dealing_commitment(
+        &self,
+        epoch_id: u32,
+        commitment: ContractSafeCommitment,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NymdError>;
+}
+
+#[async_trait]
+impl<C> DkgClient for NymdClient<C>
+where
+    C: SigningCosmWasmClient + Send + Sync,
+{
+    async fn get_current_dkg_epoch(&self) -> Result<Epoch, NymdError> {
+        let request = DkgQueryMsg::GetCurrentEpoch {};
+        self.client
+            .query_contract_smart(self.coconut_dkg_contract_address()?, &request)
+            .await
+    }
+
+    async fn get_dealer_details(
+        &self,
+        address: &AccountId,
+    ) -> Result<DealerDetailsResponse, NymdError> {
+        let request = DkgQueryMsg::GetDealerDetails {
+            dealer_address: address.to_string(),
+        };
+        self.client
+            .query_contract_smart(self.coconut_dkg_contract_address()?, &request)
+            .await
+    }
+
+    async fn get_current_dealers_paged(
+        &self,
+        start_after: Option<String>,
+        page_limit: Option<u32>,
+    ) -> Result<PagedDealerResponse, NymdError> {
+        let request = DkgQueryMsg::GetCurrentDealers {
+            start_after,
+            limit: page_limit,
+        };
+        self.client
+            .query_contract_smart(self.coconut_dkg_contract_address()?, &request)
+            .await
+    }
+
+    async fn get_past_dealers_paged(
+        &self,
+        start_after: Option<String>,
+        page_limit: Option<u32>,
+    ) -> Result<PagedDealerResponse, NymdError> {
+        let request = DkgQueryMsg::GetPastDealers {
+            start_after,
+            limit: page_limit,
+        };
+        self.client
+            .query_contract_smart(self.coconut_dkg_contract_address()?, &request)
+            .await
+    }
+
+    async fn get_blacklisted_dealers_paged(
+        &self,
+        start_after: Option<String>,
+        page_limit: Option<u32>,
+    ) -> Result<PagedBlacklistingResponse, NymdError> {
+        let request = DkgQueryMsg::GetBlacklistedDealers {
+            start_after,
+            limit: page_limit,
+        };
+        self.client
+            .query_contract_smart(self.coconut_dkg_contract_address()?, &request)
+            .await
+    }
+
+    async fn get_blacklisting(&self, dealer: String) -> Result<BlacklistingResponse, NymdError> {
+        let request = DkgQueryMsg::GetBlacklisting { dealer };
+        self.client
+            .query_contract_smart(self.coconut_dkg_contract_address()?, &request)
+            .await
+    }
+
+    async fn get_deposit_amount(&self) -> Result<MinimumDepositResponse, NymdError> {
+        let request = DkgQueryMsg::GetDepositAmount {};
+        self.client
+            .query_contract_smart(self.coconut_dkg_contract_address()?, &request)
+            .await
+    }
+
+    async fn get_epoch_dealings_commitments_paged(
+        &self,
+        epoch: EpochId,
+        start_after: Option<String>,
+        page_limit: Option<u32>,
+    ) -> Result<PagedCommitmentsResponse, NymdError> {
+        let request = DkgQueryMsg::GetEpochDealingsCommitments {
+            limit: page_limit,
+            start_after,
+            epoch,
+        };
+        self.client
+            .query_contract_smart(self.coconut_dkg_contract_address()?, &request)
+            .await
+    }
+
+    async fn register_dealer(
+        &self,
+        identity: EncodedEd25519PublicKey,
+        bte_key: EncodedBTEPublicKeyWithProof,
+        owner_signature: String,
+        listening_address: String,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NymdError> {
+        let req = DkgExecuteMsg::RegisterDealer {
+            ed25519_key: identity,
+            bte_key_with_proof: bte_key,
+            owner_signature,
+            host: listening_address,
+        };
+        let deposit = self.get_deposit_amount().await?;
+
+        self.client
+            .execute(
+                self.address(),
+                self.coconut_dkg_contract_address()?,
+                &req,
+                fee.unwrap_or_default(),
+                format!("registering {} as a dealer", self.address()),
+                vec![cosmwasm_coin_to_cosmos_coin(deposit.amount)],
+            )
+            .await
+    }
+
+    async fn submit_dealing_commitment(
+        &self,
+        epoch_id: u32,
+        commitment: ContractSafeCommitment,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NymdError> {
+        let req = DkgExecuteMsg::CommitDealing {
+            epoch_id,
+            commitment,
+        };
+
+        self.client
+            .execute(
+                self.address(),
+                self.coconut_dkg_contract_address()?,
+                &req,
+                fee.unwrap_or_default(),
+                "dealing commitment",
+                Vec::new(),
+            )
+            .await
+    }
+}
@@ -1,14 +1,12 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-mod coconut_bandwidth_signing_client;
-mod multisig_query_client;
-mod multisig_signing_client;
+#[cfg(feature = "dkg")]
+mod dkg_client;
 mod vesting_query_client;
 mod vesting_signing_client;

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

-use crate::nymd::coin::Coin;
 pub use crate::nymd::cosmwasm_client::client::CosmWasmClient;
 use crate::nymd::error::NymdError;
 use crate::nymd::NymdClient;
 use async_trait::async_trait;
-use cosmwasm_std::{Coin as CosmWasmCoin, Timestamp};
+use cosmwasm_std::{Coin, Timestamp};
 use vesting_contract::vesting::Account;
 use vesting_contract_common::{
    messages::QueryMsg as VestingQueryMsg, OriginalVestingResponse, Period, PledgeData,
@@ -84,9 +83,8 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
            block_time,
        };
        self.client
-            .query_contract_smart::<_, CosmWasmCoin>(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
            .await
-            .map(Into::into)
    }

    async fn spendable_coins(
@@ -99,9 +97,8 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
            block_time,
        };
        self.client
-            .query_contract_smart::<_, CosmWasmCoin>(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
            .await
-            .map(Into::into)
    }
    async fn vested_coins(
        &self,
@@ -113,9 +110,8 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
            block_time,
        };
        self.client
-            .query_contract_smart::<_, CosmWasmCoin>(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
            .await
-            .map(Into::into)
    }
    async fn vesting_coins(
        &self,
@@ -127,9 +123,8 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
            block_time,
        };
        self.client
-            .query_contract_smart::<_, CosmWasmCoin>(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
            .await
-            .map(Into::into)
    }

    async fn vesting_start_time(
@@ -140,7 +135,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
            vesting_account_address: vesting_account_address.to_string(),
        };
        self.client
-            .query_contract_smart(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
            .await
    }

@@ -152,7 +147,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
            vesting_account_address: vesting_account_address.to_string(),
        };
        self.client
-            .query_contract_smart(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
            .await
    }

@@ -164,7 +159,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
            vesting_account_address: vesting_account_address.to_string(),
        };
        self.client
-            .query_contract_smart(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
            .await
    }

@@ -178,12 +173,10 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
            block_time,
        };
        self.client
-            .query_contract_smart::<_, CosmWasmCoin>(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
            .await
-            .map(Into::into)
    }

-    /// Returns the total amount of delegated tokens that have vested
    async fn delegated_vesting(
        &self,
        vesting_account_address: &str,
@@ -194,9 +187,8 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
            block_time,
        };
        self.client
-            .query_contract_smart::<_, CosmWasmCoin>(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
            .await
-            .map(Into::into)
    }

    async fn get_account(&self, address: &str) -> Result<Account, NymdError> {
@@ -204,7 +196,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
            address: address.to_string(),
        };
        self.client
-            .query_contract_smart(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
            .await
    }
    async fn get_mixnode_pledge(&self, address: &str) -> Result<Option<PledgeData>, NymdError> {
@@ -212,7 +204,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
            address: address.to_string(),
        };
        self.client
-            .query_contract_smart(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
            .await
    }
    async fn get_gateway_pledge(&self, address: &str) -> Result<Option<PledgeData>, NymdError> {
@@ -220,7 +212,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
            address: address.to_string(),
        };
        self.client
-            .query_contract_smart(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
            .await
    }

@@ -229,7 +221,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
            address: address.to_string(),
        };
        self.client
-            .query_contract_smart(self.vesting_contract_address(), &request)
+            .query_contract_smart(self.vesting_contract_address()?, &request)
            .await
    }
 }
@@ -4,8 +4,10 @@
 pub use crate::nymd::cosmwasm_client::signing_client::SigningCosmWasmClient;
 use crate::nymd::cosmwasm_client::types::ExecuteResult;
 use crate::nymd::error::NymdError;
-use crate::nymd::{Coin, Fee, NymdClient};
+use crate::nymd::fee::helpers::Operation;
+use crate::nymd::{cosmwasm_coin_to_cosmos_coin, NymdClient};
 use async_trait::async_trait;
+use cosmwasm_std::Coin;
 use mixnet_contract_common::{Gateway, IdentityKey, IdentityKeyRef, MixNode};
 use vesting_contract_common::messages::{ExecuteMsg as VestingExecuteMsg, VestingSpecification};

@@ -14,30 +16,23 @@ pub trait VestingSigningClient {
    async fn vesting_update_mixnode_config(
        &self,
        profix_margin_percent: u8,
-        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NymdError>;

-    async fn update_mixnet_address(
-        &self,
-        address: &str,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    async fn update_mixnet_address(&self, address: &str) -> Result<ExecuteResult, NymdError>;

    async fn vesting_bond_gateway(
        &self,
        gateway: Gateway,
        owner_signature: &str,
        pledge: Coin,
-        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NymdError>;

-    async fn vesting_unbond_gateway(&self, fee: Option<Fee>) -> Result<ExecuteResult, NymdError>;
+    async fn vesting_unbond_gateway(&self) -> Result<ExecuteResult, NymdError>;

    async fn vesting_track_unbond_gateway(
        &self,
        owner: &str,
        amount: Coin,
-        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NymdError>;

    async fn vesting_bond_mixnode(
@@ -45,42 +40,33 @@ pub trait VestingSigningClient {
        mix_node: MixNode,
        owner_signature: &str,
        pledge: Coin,
-        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NymdError>;
-    async fn vesting_unbond_mixnode(&self, fee: Option<Fee>) -> Result<ExecuteResult, NymdError>;
+    async fn vesting_unbond_mixnode(&self) -> Result<ExecuteResult, NymdError>;

    async fn vesting_track_unbond_mixnode(
        &self,
        owner: &str,
        amount: Coin,
-        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NymdError>;

-    async fn withdraw_vested_coins(
-        &self,
-        amount: Coin,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    async fn withdraw_vested_coins(&self, amount: Coin) -> Result<ExecuteResult, NymdError>;

    async fn vesting_track_undelegation(
        &self,
        address: &str,
        mix_identity: IdentityKey,
        amount: Coin,
-        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NymdError>;

    async fn vesting_delegate_to_mixnode<'a>(
        &self,
        mix_identity: IdentityKeyRef<'a>,
-        amount: Coin,
-        fee: Option<Fee>,
+        amount: &Coin,
    ) -> Result<ExecuteResult, NymdError>;

    async fn vesting_undelegate_from_mixnode<'a>(
        &self,
        mix_identity: IdentityKeyRef<'a>,
-        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NymdError>;

    async fn create_periodic_vesting_account(
@@ -89,71 +75,27 @@ pub trait VestingSigningClient {
        staking_address: Option<String>,
        vesting_spec: Option<VestingSpecification>,
        amount: Coin,
-        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NymdError>;
 }

 #[async_trait]
 impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient<C> {
-    async fn vesting_update_mixnode_config(
-        &self,
-        profit_margin_percent: u8,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
-        let req = VestingExecuteMsg::UpdateMixnodeConfig {
-            profit_margin_percent,
-        };
-        self.client
-            .execute(
-                self.address(),
-                self.vesting_contract_address(),
-                &req,
-                fee,
-                "VestingContract::UpdateMixnetConfig",
-                vec![],
-            )
-            .await
-    }
-
-    async fn update_mixnet_address(
-        &self,
-        address: &str,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
-        let req = VestingExecuteMsg::UpdateMixnetAddress {
-            address: address.to_string(),
-        };
-        self.client
-            .execute(
-                self.address(),
-                self.vesting_contract_address(),
-                &req,
-                fee,
-                "VestingContract::UpdateMixnetAddress",
-                vec![],
-            )
-            .await
-    }
-
    async fn vesting_bond_gateway(
        &self,
        gateway: Gateway,
        owner_signature: &str,
        pledge: Coin,
-        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
+        let fee = self.operation_fee(Operation::BondGateway);
        let req = VestingExecuteMsg::BondGateway {
            gateway,
            owner_signature: owner_signature.to_string(),
-            amount: pledge.into(),
+            amount: pledge,
        };
        self.client
            .execute(
                self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                &req,
                fee,
                "VestingContract::BondGateway",
@@ -162,13 +104,13 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
            .await
    }

-    async fn vesting_unbond_gateway(&self, fee: Option<Fee>) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
+    async fn vesting_unbond_gateway(&self) -> Result<ExecuteResult, NymdError> {
+        let fee = self.operation_fee(Operation::UnbondGateway);
        let req = VestingExecuteMsg::UnbondGateway {};
        self.client
            .execute(
                self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                &req,
                fee,
                "VestingContract::UnbondGateway",
@@ -181,17 +123,16 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
        &self,
        owner: &str,
        amount: Coin,
-        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
+        let fee = self.operation_fee(Operation::TrackUnbondGateway);
        let req = VestingExecuteMsg::TrackUnbondGateway {
            owner: owner.to_string(),
-            amount: amount.into(),
+            amount,
        };
        self.client
            .execute(
                self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                &req,
                fee,
                "VestingContract::TrackUnbondGateway",
@@ -205,18 +146,17 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
        mix_node: MixNode,
        owner_signature: &str,
        pledge: Coin,
-        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
+        let fee = self.operation_fee(Operation::BondMixnode);
        let req = VestingExecuteMsg::BondMixnode {
            mix_node,
            owner_signature: owner_signature.to_string(),
-            amount: pledge.into(),
+            amount: pledge,
        };
        self.client
            .execute(
                self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                &req,
                fee,
                "VestingContract::BondMixnode",
@@ -225,13 +165,13 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
            .await
    }

-    async fn vesting_unbond_mixnode(&self, fee: Option<Fee>) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
+    async fn vesting_unbond_mixnode(&self) -> Result<ExecuteResult, NymdError> {
+        let fee = self.operation_fee(Operation::UnbondMixnode);
        let req = VestingExecuteMsg::UnbondMixnode {};
        self.client
            .execute(
                self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                &req,
                fee,
                "VestingContract::UnbondMixnode",
@@ -244,17 +184,16 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
        &self,
        owner: &str,
        amount: Coin,
-        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
+        let fee = self.operation_fee(Operation::TrackUnbondMixnode);
        let req = VestingExecuteMsg::TrackUnbondMixnode {
            owner: owner.to_string(),
-            amount: amount.into(),
+            amount,
        };
        self.client
            .execute(
                self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                &req,
                fee,
                "VestingContract::TrackUnbondMixnode",
@@ -262,19 +201,14 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
            )
            .await
    }
-    async fn withdraw_vested_coins(
-        &self,
-        amount: Coin,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
-        let req = VestingExecuteMsg::WithdrawVestedCoins {
-            amount: amount.into(),
-        };
+
+    async fn withdraw_vested_coins(&self, amount: Coin) -> Result<ExecuteResult, NymdError> {
+        let fee = self.operation_fee(Operation::WithdrawVestedCoins);
+        let req = VestingExecuteMsg::WithdrawVestedCoins { amount };
        self.client
            .execute(
                self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                &req,
                fee,
                "VestingContract::WithdrawVested",
@@ -282,23 +216,23 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
            )
            .await
    }
+
    async fn vesting_track_undelegation(
        &self,
        address: &str,
        mix_identity: IdentityKey,
        amount: Coin,
-        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
+        let fee = self.operation_fee(Operation::TrackUndelegation);
        let req = VestingExecuteMsg::TrackUndelegation {
            owner: address.to_string(),
            mix_identity,
-            amount: amount.into(),
+            amount,
        };
        self.client
            .execute(
                self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                &req,
                fee,
                "VestingContract::TrackUndelegation",
@@ -309,18 +243,17 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
    async fn vesting_delegate_to_mixnode<'a>(
        &self,
        mix_identity: IdentityKeyRef<'a>,
-        amount: Coin,
-        fee: Option<Fee>,
+        amount: &Coin,
    ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
+        let fee = self.operation_fee(Operation::DelegateToMixnode);
        let req = VestingExecuteMsg::DelegateToMixnode {
            mix_identity: mix_identity.into(),
-            amount: amount.into(),
+            amount: amount.clone(),
        };
        self.client
            .execute(
                self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                &req,
                fee,
                "VestingContract::DelegateToMixnode",
@@ -328,20 +261,18 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
            )
            .await
    }
-
    async fn vesting_undelegate_from_mixnode<'a>(
        &self,
        mix_identity: IdentityKeyRef<'a>,
-        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
+        let fee = self.operation_fee(Operation::UndelegateFromMixnode);
        let req = VestingExecuteMsg::UndelegateFromMixnode {
            mix_identity: mix_identity.into(),
        };
        self.client
            .execute(
                self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                &req,
                fee,
                "VestingContract::UndelegateFromMixnode",
@@ -349,16 +280,14 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
            )
            .await
    }
-
    async fn create_periodic_vesting_account(
        &self,
        owner_address: &str,
        staking_address: Option<String>,
        vesting_spec: Option<VestingSpecification>,
        amount: Coin,
-        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
+        let fee = self.operation_fee(Operation::CreatePeriodicVestingAccount);
        let req = VestingExecuteMsg::CreateAccount {
            owner_address: owner_address.to_string(),
            staking_address,
@@ -367,11 +296,48 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
        self.client
            .execute(
                self.address(),
-                self.vesting_contract_address(),
+                self.vesting_contract_address()?,
                &req,
                fee,
                "VestingContract::CreatePeriodicVestingAccount",
-                vec![amount],
+                vec![cosmwasm_coin_to_cosmos_coin(amount)],
+            )
+            .await
+    }
+
+    async fn update_mixnet_address(&self, address: &str) -> Result<ExecuteResult, NymdError> {
+        let fee = self.operation_fee(Operation::UpdateMixnetAddress);
+        let req = VestingExecuteMsg::UpdateMixnetAddress {
+            address: address.to_string(),
+        };
+        self.client
+            .execute(
+                self.address(),
+                self.vesting_contract_address()?,
+                &req,
+                fee,
+                "VestingContract::UpdateMixnetAddress",
+                vec![],
+            )
+            .await
+    }
+
+    async fn vesting_update_mixnode_config(
+        &self,
+        profit_margin_percent: u8,
+    ) -> Result<ExecuteResult, NymdError> {
+        let fee = self.operation_fee(Operation::UpdateMixnodeConfig);
+        let req = VestingExecuteMsg::UpdateMixnodeConfig {
+            profit_margin_percent,
+        };
+        self.client
+            .execute(
+                self.address(),
+                self.vesting_contract_address()?,
+                &req,
+                fee,
+                "VestingContract::UpdateMixnetConfig",
+                vec![],
            )
            .await
    }
@@ -3,18 +3,14 @@

 use crate::validator_api::error::ValidatorAPIError;
 use crate::validator_api::routes::{CORE_STATUS_COUNT, SINCE_ARG};
-use coconut_interface::{
-    BlindSignRequestBody, BlindedSignatureResponse, ExecuteReleaseFundsRequestBody,
-    ProposeReleaseFundsRequestBody, ProposeReleaseFundsResponse, VerificationKeyResponse,
-    VerifyCredentialBody, VerifyCredentialResponse,
-};
+use coconut_interface::{BlindSignRequestBody, BlindedSignatureResponse, VerificationKeyResponse};
 use mixnet_contract_common::{GatewayBond, IdentityKeyRef, MixNodeBond};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use url::Url;
 use validator_api_requests::models::{
-    CoreNodeStatusResponse, InclusionProbabilityResponse, MixNodeBondAnnotated,
-    MixnodeStatusResponse, RewardEstimationResponse, StakeSaturationResponse, UptimeResponse,
+    CoreNodeStatusResponse, InclusionProbabilityResponse, MixnodeStatusResponse,
+    RewardEstimationResponse, StakeSaturationResponse, UptimeResponse,
 };

 pub mod error;
@@ -89,16 +85,6 @@ impl Client {
            .await
    }

-    pub async fn get_mixnodes_detailed(
-        &self,
-    ) -> Result<Vec<MixNodeBondAnnotated>, ValidatorAPIError> {
-        self.query_validator_api(
-            &[routes::API_VERSION, routes::MIXNODES, routes::DETAILED],
-            NO_PARAMS,
-        )
-        .await
-    }
-
    pub async fn get_gateways(&self) -> Result<Vec<GatewayBond>, ValidatorAPIError> {
        self.query_validator_api(&[routes::API_VERSION, routes::GATEWAYS], NO_PARAMS)
            .await
@@ -112,21 +98,6 @@ impl Client {
        .await
    }

-    pub async fn get_active_mixnodes_detailed(
-        &self,
-    ) -> Result<Vec<MixNodeBondAnnotated>, ValidatorAPIError> {
-        self.query_validator_api(
-            &[
-                routes::API_VERSION,
-                routes::MIXNODES,
-                routes::ACTIVE,
-                routes::DETAILED,
-            ],
-            NO_PARAMS,
-        )
-        .await
-    }
-
    pub async fn get_rewarded_mixnodes(&self) -> Result<Vec<MixNodeBond>, ValidatorAPIError> {
        self.query_validator_api(
            &[routes::API_VERSION, routes::MIXNODES, routes::REWARDED],
@@ -135,21 +106,6 @@ impl Client {
        .await
    }

-    pub async fn get_rewarded_mixnodes_detailed(
-        &self,
-    ) -> Result<Vec<MixNodeBondAnnotated>, ValidatorAPIError> {
-        self.query_validator_api(
-            &[
-                routes::API_VERSION,
-                routes::MIXNODES,
-                routes::REWARDED,
-                routes::DETAILED,
-            ],
-            NO_PARAMS,
-        )
-        .await
-    }
-
    pub async fn get_probs_mixnode_rewarded(
        &self,
        mixnode_id: &str,
@@ -375,57 +331,6 @@ impl Client {
        )
        .await
    }
-
-    pub async fn verify_bandwidth_credential(
-        &self,
-        request_body: &VerifyCredentialBody,
-    ) -> Result<VerifyCredentialResponse, ValidatorAPIError> {
-        self.post_validator_api(
-            &[
-                routes::API_VERSION,
-                routes::COCONUT_ROUTES,
-                routes::BANDWIDTH,
-                routes::COCONUT_VERIFY_BANDWIDTH_CREDENTIAL,
-            ],
-            NO_PARAMS,
-            request_body,
-        )
-        .await
-    }
-
-    pub async fn propose_release_funds(
-        &self,
-        request_body: &ProposeReleaseFundsRequestBody,
-    ) -> Result<ProposeReleaseFundsResponse, ValidatorAPIError> {
-        self.post_validator_api(
-            &[
-                routes::API_VERSION,
-                routes::COCONUT_ROUTES,
-                routes::BANDWIDTH,
-                routes::COCONUT_PROPOSE_RELEASE_FUNDS,
-            ],
-            NO_PARAMS,
-            request_body,
-        )
-        .await
-    }
-
-    pub async fn execute_release_funds(
-        &self,
-        request_body: &ExecuteReleaseFundsRequestBody,
-    ) -> Result<(), ValidatorAPIError> {
-        self.post_validator_api(
-            &[
-                routes::API_VERSION,
-                routes::COCONUT_ROUTES,
-                routes::BANDWIDTH,
-                routes::COCONUT_EXECUTE_RELEASE_FUNDS,
-            ],
-            NO_PARAMS,
-            request_body,
-        )
-        .await
-    }
 }

 // utility function that should solve the double slash problem in validator API forever.
@@ -7,7 +7,6 @@ pub const API_VERSION: &str = VALIDATOR_API_VERSION;
 pub const MIXNODES: &str = "mixnodes";
 pub const GATEWAYS: &str = "gateways";

-pub const DETAILED: &str = "detailed";
 pub const ACTIVE: &str = "active";
 pub const REWARDED: &str = "rewarded";

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

 pub const STATUS_ROUTES: &str = "status";
 pub const MIXNODE: &str = "mixnode";
@@ -1,7 +1,6 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use nymcoconut::CoconutError;
 use thiserror::Error;

 #[derive(Debug, Error)]
@@ -12,6 +11,9 @@ pub enum CoconutInterfaceError {
    #[error("Could not decode base 58 string - {0}")]
    MalformedString(#[from] bs58::decode::Error),

-    #[error("Coconut error - {0}")]
-    CoconutError(#[from] CoconutError),
+    #[error("Not enough public attributes were specified")]
+    NotEnoughPublicAttributes,
+
+    #[error("Could not recover bandwidth value")]
+    InvalidBandwidth,
 }
@@ -5,158 +5,96 @@ pub mod error;

 use getset::{CopyGetters, Getters};
 use serde::{Deserialize, Serialize};
+use std::str::FromStr;

 use error::CoconutInterfaceError;

 pub use nymcoconut::*;

-#[derive(Debug, Serialize, Deserialize, Getters, CopyGetters, Clone, PartialEq)]
+#[derive(Serialize, Deserialize, Getters, CopyGetters, Clone)]
 pub struct Credential {
    #[getset(get = "pub")]
    n_params: u32,
    #[getset(get = "pub")]
    theta: Theta,
-    voucher_value: u64,
-    voucher_info: String,
+    public_attributes: Vec<Vec<u8>>,
+    #[getset(get = "pub")]
+    signature: Signature,
 }
 impl Credential {
    pub fn new(
        n_params: u32,
        theta: Theta,
-        voucher_value: u64,
+        voucher_value: String,
        voucher_info: String,
+        signature: &Signature,
    ) -> Credential {
+        let public_attributes = vec![voucher_value.into_bytes(), voucher_info.into_bytes()];
        Credential {
            n_params,
            theta,
-            voucher_value,
-            voucher_info,
+            public_attributes,
+            signature: *signature,
        }
    }

-    pub fn blinded_serial_number(&self) -> String {
-        self.theta.blinded_serial_number_bs58()
-    }
+    pub fn voucher_value(&self) -> Result<u64, CoconutInterfaceError> {
+        let bandwidth_vec = self
+            .public_attributes
+            .get(0)
+            .ok_or(CoconutInterfaceError::NotEnoughPublicAttributes)?
+            .to_owned();
+        let bandwidth_str = String::from_utf8(bandwidth_vec)
+            .map_err(|_| CoconutInterfaceError::InvalidBandwidth)?;
+        let value =
+            u64::from_str(&bandwidth_str).map_err(|_| CoconutInterfaceError::InvalidBandwidth)?;

-    pub fn has_blinded_serial_number(
-        &self,
-        blinded_serial_number_bs58: &str,
-    ) -> Result<bool, CoconutInterfaceError> {
-        Ok(self
-            .theta
-            .has_blinded_serial_number(blinded_serial_number_bs58)?)
-    }
-
-    pub fn voucher_value(&self) -> u64 {
-        self.voucher_value
+        Ok(value)
    }

    pub fn verify(&self, verification_key: &VerificationKey) -> bool {
        let params = Parameters::new(self.n_params).unwrap();
-        let public_attributes = vec![
-            self.voucher_value.to_string().as_bytes(),
-            self.voucher_info.as_bytes(),
-        ]
-        .iter()
-        .map(hash_to_scalar)
-        .collect::<Vec<Attribute>>();
+        let public_attributes = self
+            .public_attributes
+            .iter()
+            .map(hash_to_scalar)
+            .collect::<Vec<Attribute>>();
        nymcoconut::verify_credential(&params, verification_key, &self.theta, &public_attributes)
    }
-
-    pub fn as_bytes(&self) -> Vec<u8> {
-        let n_params_bytes = self.n_params.to_be_bytes();
-        let theta_bytes = self.theta.to_bytes();
-        let theta_bytes_len = theta_bytes.len();
-        let voucher_value_bytes = self.voucher_value.to_be_bytes();
-        let voucher_info_bytes = self.voucher_info.as_bytes();
-        let voucher_info_len = voucher_info_bytes.len();
-
-        let mut bytes = Vec::with_capacity(28 + theta_bytes_len + voucher_info_len);
-        bytes.extend_from_slice(&n_params_bytes);
-        bytes.extend_from_slice(&(theta_bytes_len as u64).to_be_bytes());
-        bytes.extend_from_slice(&theta_bytes);
-        bytes.extend_from_slice(&voucher_value_bytes);
-        bytes.extend_from_slice(voucher_info_bytes);
-
-        bytes
-    }
-
-    pub fn from_bytes(bytes: &[u8]) -> Result<Self, CoconutError> {
-        if bytes.len() < 28 {
-            return Err(CoconutError::Deserialization(String::from(
-                "To few bytes in credential",
-            )));
-        }
-        let mut four_byte = [0u8; 4];
-        let mut eight_byte = [0u8; 8];
-
-        four_byte.copy_from_slice(&bytes[..4]);
-        let n_params = u32::from_be_bytes(four_byte);
-        eight_byte.copy_from_slice(&bytes[4..12]);
-        let theta_len = u64::from_be_bytes(eight_byte);
-        if bytes.len() < 28 + theta_len as usize {
-            return Err(CoconutError::Deserialization(String::from(
-                "To few bytes in credential",
-            )));
-        }
-        let theta = Theta::from_bytes(&bytes[12..12 + theta_len as usize])
-            .map_err(|e| CoconutError::Deserialization(e.to_string()))?;
-        eight_byte.copy_from_slice(&bytes[12 + theta_len as usize..20 + theta_len as usize]);
-        let voucher_value = u64::from_be_bytes(eight_byte);
-        let voucher_info = String::from_utf8(bytes[20 + theta_len as usize..].to_vec())
-            .map_err(|e| CoconutError::Deserialization(e.to_string()))?;
-
-        Ok(Credential {
-            n_params,
-            theta,
-            voucher_value,
-            voucher_info,
-        })
-    }
 }

-impl Bytable for Credential {
-    fn to_byte_vec(&self) -> Vec<u8> {
-        self.as_bytes()
-    }
-
-    fn try_from_byte_slice(slice: &[u8]) -> Result<Self, CoconutError> {
-        Credential::from_bytes(slice)
-    }
-}
-
-impl Base58 for Credential {}
-
-#[derive(Serialize, Deserialize, Getters, CopyGetters)]
+#[derive(Serialize, Deserialize, Debug, Getters, CopyGetters)]
 pub struct VerifyCredentialBody {
    #[getset(get = "pub")]
-    credential: Credential,
+    n_params: u32,
    #[getset(get = "pub")]
-    proposal_id: u64,
+    theta: Theta,
+    public_attributes: Vec<String>,
 }

 impl VerifyCredentialBody {
-    pub fn new(credential: Credential, proposal_id: u64) -> VerifyCredentialBody {
+    pub fn new(
+        n_params: u32,
+        theta: &Theta,
+        public_attributes: &[Attribute],
+    ) -> VerifyCredentialBody {
        VerifyCredentialBody {
-            credential,
-            proposal_id,
+            n_params,
+            theta: theta.clone(),
+            public_attributes: public_attributes
+                .iter()
+                .map(|attr| attr.to_bs58())
+                .collect(),
        }
    }
-}

-#[derive(Debug, Serialize, Deserialize)]
-pub struct VerifyCredentialResponse {
-    pub verification_result: bool,
-}
-
-impl VerifyCredentialResponse {
-    pub fn new(verification_result: bool) -> Self {
-        VerifyCredentialResponse {
-            verification_result,
-        }
+    pub fn public_attributes(&self) -> Vec<Attribute> {
+        self.public_attributes
+            .iter()
+            .map(|x| Attribute::try_from_bs58(x).unwrap())
+            .collect()
    }
 }
-
 //  All strings are base58 encoded representations of structs
 #[derive(Clone, Serialize, Deserialize, Debug, Getters, CopyGetters)]
 pub struct BlindSignRequestBody {
@@ -256,86 +194,3 @@ impl VerificationKeyResponse {
        VerificationKeyResponse { key }
    }
 }
-
-#[derive(Serialize, Deserialize, Getters, CopyGetters)]
-pub struct ProposeReleaseFundsRequestBody {
-    #[getset(get = "pub")]
-    credential: Credential,
-}
-
-impl ProposeReleaseFundsRequestBody {
-    pub fn new(credential: Credential) -> Self {
-        ProposeReleaseFundsRequestBody { credential }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ProposeReleaseFundsResponse {
-    pub proposal_id: u64,
-}
-
-impl ProposeReleaseFundsResponse {
-    pub fn new(proposal_id: u64) -> Self {
-        ProposeReleaseFundsResponse { proposal_id }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize, Getters, CopyGetters)]
-pub struct ExecuteReleaseFundsRequestBody {
-    #[getset(get = "pub")]
-    proposal_id: u64,
-}
-
-impl ExecuteReleaseFundsRequestBody {
-    pub fn new(proposal_id: u64) -> Self {
-        ExecuteReleaseFundsRequestBody { proposal_id }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn serde_coconut_credential() {
-        let voucher_value = 1000000u64;
-        let voucher_info = String::from("BandwidthVoucher");
-        let serial_number =
-            Attribute::try_from_bs58("7Rp3imcuNX3w9se9wm5th8gSvc2czsnMrGsdt5HsrycA").unwrap();
-        let binding_number =
-            Attribute::try_from_bs58("Auf8yVEgyEAWNHaXUZmimS4n9g5YiYnNYqp6F9BtBe9E").unwrap();
-        let signature = Signature::try_from_bs58(
-            "ta3pM9ffj5T6YGbwjSBp2W118rcwyP9PXStc\
-        7ssb91g5GQYMQHhuTNajbdZcjxUFBFL5rhED8EHpRzE8r432ss3qbPBfpNev4CdkfMkQ3wepyM7hy7q1W6Rn9WmFoZL\
-        ZR9j",
-        )
-        .unwrap();
-        let params = Parameters::new(4).unwrap();
-        let verification_key = VerificationKey::try_from_bs58("8CFtVVXdwLy4WHMQPE4\
-        woe89q3DRHoNxBSchftrEjSBPWA4r4xZv4Y9qSvS5x5bMmFtp7BX6ikECAnuXr5EjXWSsgjirZJmpS5XDUynVfht1cD\
-        FWGDvy2XFrRCuoCMotNXi3PoF6wYqdTR9Rqcfoj3i2H5Nid422WBaLtVoC9QNobvpvaqq6vX5PbsSyPayvU8HCXFxM6\
-        JjScYpbRTxQtdwefWLrk3LmXyJQBWi7c2VAhSxu9msp7VTBycqdwQNgxHETStZuwXsozxaGQ2KssVUCaaoYPR4g2RqK\
-        UAvtWwA7pMiAQNcbkXcbsjCgVjWaCpMWC37XA31cLcFf3zbjHD9e5tXjAcqa4M89fbFhuvvSXxowSAZ5NoWrN32kd5d\
-        wxJm1JW3Tt2h6yDDBe84oMy71462dZn7N78DVk2mFNGwBCibrZWA7oUzRBMfYxiQrksoFcou7QfLLd58zoNYmPQPt84\
-        1VpQopEBfdQ7Nf9zoXxBt3zMy7g5NsFGvzh7KTbDUyeeXrdkKJPQBs6dqaizr9sS8CPPmR4uk96vDTRh8CJ5FbSsmb8\
-        nP71dRvvwRZJHGzwYirMo6SXS3ZYxFuiA3mkxYuqDHCwkTWDuRCcAaztrDYRZg7VCMo4Q446AaEso5eqpeWpHZQt53E\
-        ZRpqmNYKASGwMhTeEHPSLgSmtoAAUcaRWpGRzYfd6kzEma8tdGLwyP4rLXgvSvtDLP37dU7YgF3LEXbGAz57U9ATy46\
-        6sroLpHPdaCWB8RF11wvB6Tu196JnJd2KyQBP1iUWP3rtZs3GhAF1QVcxquh8BqDZzAcpQ6wCS1P9c5GxKgww77FVF5\
-        Kp83XtoxSrw3GaYVyKTGxNh3vcKPR31txCjTxPaN2fg7TaPLhoQJX4YaAroFSXqrqbbRsisuHhhCeUP2YwDjHedes9y")
-            .unwrap();
-        let theta = prove_bandwidth_credential(
-            &params,
-            &verification_key,
-            &signature,
-            serial_number,
-            binding_number,
-        )
-        .unwrap();
-        let credential = Credential::new(4, theta, voucher_value, voucher_info);
-
-        let serialized_credential = credential.as_bytes();
-        let deserialized_credential = Credential::from_bytes(&serialized_credential).unwrap();
-
-        assert_eq!(credential, deserialized_credential);
-    }
-}
@@ -7,7 +7,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-cfg-if = "1.0.0"
 handlebars = "3.0.1"
 humantime-serde = "1.0"
 log = "0.4"
@@ -15,6 +15,7 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
    fn template() -> &'static str;

    fn config_file_name() -> String {
+        log::trace!("NymdConfig::config_file_name");
        "config.toml".to_string()
    }

@@ -22,6 +23,7 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {

    // default, most probable, implementations; can be easily overridden where required
    fn default_config_directory(id: Option<&str>) -> PathBuf {
+        log::trace!("NymdConfig::default_config_directory");
        if let Some(id) = id {
            Self::default_root_directory().join(id).join("config")
        } else {
@@ -30,6 +32,7 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
    }

    fn default_data_directory(id: Option<&str>) -> PathBuf {
+        log::trace!("NymdConfig::default_data_path");
        if let Some(id) = id {
            Self::default_root_directory().join(id).join("data")
        } else {
@@ -38,6 +41,7 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
    }

    fn default_config_file_path(id: Option<&str>) -> PathBuf {
+        log::trace!("NymdConfig::default_config_file_path");
        Self::default_config_directory(id).join(Self::config_file_name())
    }

@@ -65,16 +69,14 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
        let location = custom_location
            .unwrap_or_else(|| self.config_directory().join(Self::config_file_name()));

-        cfg_if::cfg_if! {
-            if #[cfg(unix)] {
-                fs::write(location.clone(), templated_config)?;
-                let mut perms = fs::metadata(location.clone())?.permissions();
-                perms.set_mode(0o600);
-                fs::set_permissions(location, perms)?;
-            } else {
-                fs::write(location, templated_config)?;
-            }
-        }
+        fs::write(location.clone(), templated_config)?;
+
+        #[cfg(unix)]
+        let mut perms = fs::metadata(location.clone())?.permissions();
+        #[cfg(unix)]
+        perms.set_mode(0o600);
+        #[cfg(unix)]
+        fs::set_permissions(location, perms)?;

        Ok(())
    }
@@ -6,6 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-cosmwasm-std = "1.0.0"
+cosmwasm-std = "1.0.0-beta6"
 schemars = "0.8"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
@@ -1,14 +1,13 @@
 [package]
-name = "multisig-contract-common"
+name = "coconut-dkg-common"
 version = "0.1.0"
 edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-cw-utils = { version = "0.13.1" }
-cw3 = { version = "0.13.1" }
-cw4 = { version = "0.13.1" }
-cosmwasm-std = "1.0.0"
+cosmwasm-std = "1.0.0-beta8"
 schemars = "0.8"
-serde = { version = "1.0.103", default-features = false, features = ["derive"] }
+serde = { version = "1.0.103", default-features = false, features = ["derive"] }
+
+contracts-common = { path = "../contracts-common" }
@@ -0,0 +1,251 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::types::{
+    BlockHeight, EncodedBTEPublicKeyWithProof, EncodedEd25519PublicKey, EpochId, NodeIndex,
+};
+use contracts_common::commitment::ContractSafeCommitment;
+use cosmwasm_std::Addr;
+use serde::{Deserialize, Serialize};
+use std::fmt::{Display, Formatter};
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+#[serde(rename_all = "snake_case")]
+pub struct DealerDetails {
+    pub address: Addr,
+    pub joined_at: BlockHeight,
+    pub left_at: Option<BlockHeight>,
+    pub blacklisting: Option<Blacklisting>,
+    pub ed25519_public_key: EncodedEd25519PublicKey,
+    pub bte_public_key_with_proof: EncodedBTEPublicKeyWithProof,
+    pub assigned_index: NodeIndex,
+    // TODO: in the future, perhaps, this could get replaced by some gossip system and address books
+    // like in 'normal' Tendermint?
+    pub host: String,
+}
+
+#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq)]
+#[serde(rename_all = "snake_case")]
+pub struct Blacklisting {
+    pub reason: BlacklistingReason,
+    pub height: BlockHeight,
+    pub expiration: Option<BlockHeight>,
+}
+
+impl Blacklisting {
+    pub fn has_expired(&self, current_block: BlockHeight) -> bool {
+        self.expiration
+            .map(|expiration| expiration <= current_block)
+            .unwrap_or_default()
+    }
+}
+
+impl Display for Blacklisting {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        if let Some(expiration) = self.expiration {
+            write!(
+                f,
+                "blacklisted at block height {}. reason given: {}. expires at: {}",
+                self.height, self.height, expiration
+            )
+        } else {
+            write!(
+                f,
+                "permanently blacklisted at block height {}. reason given: {}",
+                self.height, self.height
+            )
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq)]
+#[serde(rename_all = "snake_case")]
+pub enum BlacklistingReason {
+    InactiveForConsecutiveEpochs,
+    MalformedBTEPublicKey,
+    InvalidBTEPublicKey,
+    MalformedEd25519PublicKey,
+    Ed25519PossessionVerificationFailure,
+}
+
+impl Display for BlacklistingReason {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            BlacklistingReason::InactiveForConsecutiveEpochs => {
+                write!(f, "has been inactive for multiple consecutive epochs")
+            }
+            BlacklistingReason::MalformedBTEPublicKey => {
+                write!(f, "provided malformed BTE Public Key")
+            }
+            BlacklistingReason::InvalidBTEPublicKey => write!(f, "provided invalid BTE Public Key"),
+            BlacklistingReason::MalformedEd25519PublicKey => {
+                write!(f, "provided malformed ed25519 Public Key")
+            }
+            BlacklistingReason::Ed25519PossessionVerificationFailure => {
+                write!(
+                    f,
+                    "failed to verify possession of provided ed25519 Public Key"
+                )
+            }
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)]
+#[serde(rename_all = "snake_case")]
+pub enum DealerType {
+    Current,
+    Past,
+    Unknown,
+}
+
+impl DealerType {
+    pub fn is_current(&self) -> bool {
+        matches!(&self, DealerType::Current)
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[serde(rename_all = "snake_case")]
+pub struct DealerDetailsResponse {
+    pub details: Option<DealerDetails>,
+    pub dealer_type: DealerType,
+}
+
+impl DealerDetailsResponse {
+    pub fn new(details: Option<DealerDetails>, dealer_type: DealerType) -> Self {
+        DealerDetailsResponse {
+            details,
+            dealer_type,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[serde(rename_all = "snake_case")]
+pub struct PagedDealerResponse {
+    pub dealers: Vec<DealerDetails>,
+    pub per_page: usize,
+    pub start_next_after: Option<Addr>,
+}
+
+impl PagedDealerResponse {
+    pub fn new(
+        dealers: Vec<DealerDetails>,
+        per_page: usize,
+        start_next_after: Option<Addr>,
+    ) -> Self {
+        PagedDealerResponse {
+            dealers,
+            per_page,
+            start_next_after,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[serde(rename_all = "snake_case")]
+pub struct PagedBlacklistingResponse {
+    pub blacklisted_dealers: Vec<BlacklistedDealer>,
+    pub per_page: usize,
+    pub start_next_after: Option<Addr>,
+}
+
+impl PagedBlacklistingResponse {
+    pub fn new(
+        blacklisted_dealers: Vec<BlacklistedDealer>,
+        per_page: usize,
+        start_next_after: Option<Addr>,
+    ) -> Self {
+        PagedBlacklistingResponse {
+            blacklisted_dealers,
+            per_page,
+            start_next_after,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[serde(rename_all = "snake_case")]
+pub struct BlacklistedDealer {
+    pub dealer: Addr,
+    pub blacklisting: Blacklisting,
+}
+
+impl BlacklistedDealer {
+    pub fn new(dealer: Addr, blacklisting: Blacklisting) -> Self {
+        BlacklistedDealer {
+            dealer,
+            blacklisting,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[serde(rename_all = "snake_case")]
+pub struct BlacklistingResponse {
+    pub dealer: Addr,
+    pub blacklisting: Option<Blacklisting>,
+}
+
+impl BlacklistingResponse {
+    pub fn new(dealer: Addr, blacklisting: Option<Blacklisting>) -> Self {
+        BlacklistingResponse {
+            dealer,
+            blacklisting,
+        }
+    }
+
+    pub fn is_blacklisted(&self, current_height: BlockHeight) -> bool {
+        match self.blacklisting {
+            None => false,
+            Some(blacklisting) => !blacklisting.has_expired(current_height),
+        }
+    }
+
+    pub fn unchecked_get_blacklisting(&self) -> &Blacklisting {
+        self.blacklisting
+            .as_ref()
+            .expect("dealer is not blacklisted")
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[serde(rename_all = "snake_case")]
+pub struct ContractDealingCommitment {
+    pub commitment: ContractSafeCommitment,
+    pub dealer: Addr,
+    pub epoch_id: EpochId,
+}
+
+impl ContractDealingCommitment {
+    pub fn new(commitment: ContractSafeCommitment, dealer: Addr, epoch_id: EpochId) -> Self {
+        ContractDealingCommitment {
+            commitment,
+            dealer,
+            epoch_id,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[serde(rename_all = "snake_case")]
+pub struct PagedCommitmentsResponse {
+    pub commitments: Vec<ContractDealingCommitment>,
+    pub per_page: usize,
+    pub start_next_after: Option<Addr>,
+}
+
+impl PagedCommitmentsResponse {
+    pub fn new(
+        commitments: Vec<ContractDealingCommitment>,
+        per_page: usize,
+        start_next_after: Option<Addr>,
+    ) -> Self {
+        PagedCommitmentsResponse {
+            commitments,
+            per_page,
+            start_next_after,
+        }
+    }
+}
@@ -0,0 +1,6 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod dealer;
+pub mod msg;
+pub mod types;
@@ -0,0 +1,74 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::types::{
+    BlockHeight, EncodedBTEPublicKeyWithProof, EncodedEd25519PublicKey, EpochId, Threshold,
+};
+use contracts_common::commitment::ContractSafeCommitment;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub struct InstantiateMsg {
+    pub public_key_submission_end_height: BlockHeight,
+    pub system_threshold: Option<Threshold>,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum ExecuteMsg {
+    RegisterDealer {
+        ed25519_key: EncodedEd25519PublicKey,
+        bte_key_with_proof: EncodedBTEPublicKeyWithProof,
+        owner_signature: String,
+        host: String,
+    },
+    CommitDealing {
+        epoch_id: u32,
+        // the commitment shall be constructed on the epoch, dealing and all receivers (as a BTreeMap)
+        commitment: ContractSafeCommitment,
+    },
+
+    // DEBUG ONLY TXs. THEY SHALL BE REMOVED BEFORE FINALISING THE CODE
+    // only exists for debugging purposes on local network to reset the entire state of the contract
+    DebugUnsafeResetAll {
+        init_msg: InstantiateMsg,
+    },
+
+    DebugAdvanceEpochState {},
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum QueryMsg {
+    GetCurrentEpoch {},
+    GetDealerDetails {
+        dealer_address: String,
+    },
+    GetCurrentDealers {
+        limit: Option<u32>,
+        start_after: Option<String>,
+    },
+    GetPastDealers {
+        limit: Option<u32>,
+        start_after: Option<String>,
+    },
+    GetBlacklistedDealers {
+        limit: Option<u32>,
+        start_after: Option<String>,
+    },
+    GetBlacklisting {
+        dealer: String,
+    },
+    GetDepositAmount {},
+    GetEpochDealingsCommitments {
+        limit: Option<u32>,
+        start_after: Option<String>,
+        epoch: EpochId,
+    },
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub struct MigrateMsg {}
@@ -0,0 +1,178 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use serde::{Deserialize, Serialize};
+use std::cmp::Ordering;
+use std::fmt::{Display, Formatter};
+
+pub use crate::dealer::{
+    BlacklistedDealer, Blacklisting, BlacklistingReason, BlacklistingResponse, DealerDetails,
+    PagedBlacklistingResponse, PagedDealerResponse,
+};
+pub use contracts_common::commitment::ContractSafeCommitment;
+pub use cosmwasm_std::{Addr, Coin};
+
+pub type BlockHeight = u64;
+pub type EncodedEd25519PublicKey = String;
+pub type EncodedEd25519PublicKeyRef<'a> = &'a str;
+pub type EncodedBTEPublicKeyWithProof = String;
+pub type EncodedBTEPublicKeyWithProofRef<'a> = &'a str;
+pub type NodeIndex = u64;
+pub type Threshold = u64;
+pub type EpochId = u32;
+
+#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq)]
+#[serde(rename_all = "snake_case")]
+pub struct Epoch {
+    pub id: EpochId,
+    pub state: EpochState,
+    pub state_duration: EpochStateDuration,
+
+    // TODO: need to ponder a bit whether it's actually a property of a particular epoch
+    pub system_threshold: Threshold,
+}
+
+impl Ord for Epoch {
+    // we don't care about `system_threshold` when ordering
+    fn cmp(&self, other: &Self) -> Ordering {
+        if self.id != other.id {
+            self.id.cmp(&other.id)
+        } else {
+            self.state.cmp(&other.state)
+        }
+    }
+}
+
+impl PartialOrd for Epoch {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Display for Epoch {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "Epoch {} at state {}", self.id, self.state)
+    }
+}
+
+impl Epoch {
+    pub fn next_state(
+        &self,
+        current_time: Option<BlockHeight>,
+        end_time: Option<BlockHeight>,
+    ) -> Option<Self> {
+        let mut advance_epoch = false;
+        let state = match self.state.next() {
+            Some(next_state) => next_state,
+            None => {
+                advance_epoch = true;
+                EpochState::PublicKeySubmission
+            }
+        };
+
+        let id = if advance_epoch { self.id + 1 } else { self.id };
+
+        let new_state_start = current_time.unwrap_or(self.state_duration.finish_by?);
+
+        Some(Epoch {
+            id,
+            state,
+            state_duration: EpochStateDuration {
+                begun_at: new_state_start,
+                finish_by: end_time,
+            },
+            system_threshold: self.system_threshold,
+        })
+    }
+}
+
+// currently (it is still extremely likely to change, we might be able to get rid of verification key-related complaints),
+// the epoch can be in the following states (in order):
+// 1. PublicKeySubmission -> potential dealers are submitting their BTE and ed25519 public keys to participate in dealing exchange
+// 2. DealingExchange -> the actual (off-chain) dealing exchange is happening
+// 3. ComplaintSubmission -> receivers submitting evidence of other dealers sending malformed data
+// 4. ComplaintVoting -> (if any complaints were submitted) receivers voting on the validity of the evidence provided
+// 5. VerificationKeySubmission -> receivers submitting their partial (and master) verification keys
+// 6. VerificationKeyMismatchSubmission -> receivers / watchers raising issue that the submitted VK are mismatched with their local derivations
+// 7. VerificationKeyMismatchVoting -> (if any complaints were submitted) receivers voting on received mismatches
+// 8. InProgress -> all receivers have all their secrets derived and all is good
+//
+// Note: It's important that the variant ordering is not changed otherwise it would mess up the derived `PartialOrd`
+#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq, Ord, PartialOrd)]
+#[serde(rename_all = "snake_case")]
+pub enum EpochState {
+    PublicKeySubmission,
+    DealingExchange,
+    ComplaintSubmission,
+    ComplaintVoting,
+    VerificationKeySubmission,
+    VerificationKeyMismatchSubmission,
+    VerificationKeyMismatchVoting,
+    InProgress,
+}
+
+impl Display for EpochState {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            EpochState::PublicKeySubmission => write!(f, "PublicKeySubmission"),
+            EpochState::DealingExchange => write!(f, "DealingExchange"),
+            EpochState::ComplaintSubmission => write!(f, "ComplaintSubmission"),
+            EpochState::ComplaintVoting => write!(f, "ComplaintVoting"),
+            EpochState::VerificationKeySubmission => write!(f, "VerificationKeySubmission"),
+            EpochState::VerificationKeyMismatchSubmission => {
+                write!(f, "VerificationKeyMismatchSubmission")
+            }
+            EpochState::VerificationKeyMismatchVoting => {
+                write!(f, "VerificationKeyMismatchVoting")
+            }
+            EpochState::InProgress => write!(f, "InProgress"),
+        }
+    }
+}
+
+impl EpochState {
+    pub fn next(self) -> Option<Self> {
+        match self {
+            EpochState::PublicKeySubmission => Some(EpochState::DealingExchange),
+            EpochState::DealingExchange => Some(EpochState::ComplaintSubmission),
+            EpochState::ComplaintSubmission => Some(EpochState::ComplaintVoting),
+            EpochState::ComplaintVoting => Some(EpochState::VerificationKeySubmission),
+            EpochState::VerificationKeySubmission => {
+                Some(EpochState::VerificationKeyMismatchSubmission)
+            }
+            EpochState::VerificationKeyMismatchSubmission => {
+                Some(EpochState::VerificationKeyMismatchVoting)
+            }
+            EpochState::VerificationKeyMismatchVoting => Some(EpochState::InProgress),
+            EpochState::InProgress => None,
+        }
+    }
+
+    pub fn all_until(&self, end: Self) -> Vec<Self> {
+        let mut states = vec![*self];
+        while states.last().unwrap() != &end {
+            let next_state = states.last().unwrap().next().expect("somehow reached the end of state diff -> this should be impossible under any circumstances!");
+            states.push(next_state);
+        }
+
+        states
+    }
+}
+
+#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq, Ord, PartialOrd)]
+pub struct EpochStateDuration {
+    pub begun_at: BlockHeight,
+    pub finish_by: Option<BlockHeight>,
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[serde(rename_all = "snake_case")]
+pub struct MinimumDepositResponse {
+    pub amount: Coin,
+}
+
+impl MinimumDepositResponse {
+    pub fn new(amount: Coin) -> Self {
+        MinimumDepositResponse { amount }
+    }
+}
@@ -7,4 +7,15 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-cosmwasm-std = "1.0.0"
+bs58 = "0.4.0"
+cosmwasm-std = "1.0.0-beta8"
+schemars = "0.8"
+serde = { version = "1.0.103", default-features = false, features = ["derive"] }
+
+
+blake3 = { version = "1.3.1", features = ["traits-preview"], optional = true }
+digest = { version = "0.10.3", optional = true }
+generic-array = { version = "0.14.5", features = ["serde"], optional = true }
+
+[features]
+committable_trait = ["blake3", "digest", "generic-array"]
@@ -0,0 +1,186 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(feature = "committable_trait")]
+pub use digest::{Digest, Output};
+use schemars::JsonSchema;
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use std::fmt::{Display, Formatter};
+#[cfg(feature = "committable_trait")]
+use std::marker::PhantomData;
+use std::ops::Deref;
+
+// some sane upper-bound size on commitment sizes
+// currently set to 1024bits
+pub const MAX_COMMITMENT_SIZE: usize = 128;
+
+// TODO: if we are to use commitments for different types, it might make sense to introduce something like
+// CommitmentTypeId field on the below for distinguishing different ones. it would somehow become part of the trait
+#[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, JsonSchema)]
+pub struct ContractSafeCommitment(Vec<u8>);
+
+impl Deref for ContractSafeCommitment {
+    type Target = Vec<u8>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl Display for ContractSafeCommitment {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        if !self.0.is_empty() {
+            write!(f, "0x")?;
+        }
+        for byte in self.0.iter().take(MAX_COMMITMENT_SIZE) {
+            write!(f, "{:02X}", byte)?;
+        }
+        // just some sanity safeguards
+        if self.0.len() > MAX_COMMITMENT_SIZE {
+            write!(f, "...")?;
+        }
+        Ok(())
+    }
+}
+
+// since cosmwasm stores everything with byte representation of stringified json, it's actually more efficient
+// to serialize this as a string as opposed to keeping it as vector of bytes.
+// for example vec![255,255] would have string representation of "[255,255]" and will be serialized to
+// [91, 50, 53, 53, 44, 50, 53, 53, 93]. the equivalent base58 encoded string `"LUv"` will be serialized to
+// [34, 76, 85, 118, 34]
+//
+// the difference between base58 and base64 is rather minimal and I've gone with base58 for consistency sake
+impl Serialize for ContractSafeCommitment {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_str(&bs58::encode(&self.0).into_string())
+    }
+}
+
+impl<'de> Deserialize<'de> for ContractSafeCommitment {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let s = <String>::deserialize(deserializer)?;
+        let bytes = bs58::decode(&s)
+            .into_vec()
+            .map_err(serde::de::Error::custom)?;
+        Ok(ContractSafeCommitment(bytes))
+    }
+}
+
+#[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]
+pub struct UnsupportedCommitmentSize;
+
+#[cfg(feature = "committable_trait")]
+#[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]
+pub struct InconsistentCommitmentSize;
+
+#[cfg(feature = "committable_trait")]
+pub type DefaultHasher = blake3::Hasher;
+
+#[cfg(feature = "committable_trait")]
+pub trait Committable {
+    type DigestAlgorithm: Digest;
+
+    fn commitment_size() -> usize {
+        <Self::DigestAlgorithm as Digest>::output_size()
+    }
+
+    fn to_bytes(&self) -> Vec<u8>;
+
+    fn produce_commitment(&self) -> MessageCommitment<Self> {
+        MessageCommitment {
+            commitment: Self::DigestAlgorithm::digest(self.to_bytes()),
+            _message_type: Default::default(),
+        }
+    }
+
+    fn verify_commitment(&self, commitment: &MessageCommitment<Self>) -> bool {
+        let recomputed = self.produce_commitment();
+        recomputed.commitment == commitment.commitment
+    }
+}
+
+#[cfg(feature = "committable_trait")]
+#[derive(Debug, Serialize, Deserialize)]
+pub struct MessageCommitment<T>
+where
+    T: ?Sized + Committable,
+{
+    commitment: Output<T::DigestAlgorithm>,
+
+    #[serde(skip)]
+    _message_type: PhantomData<T>,
+}
+
+#[cfg(feature = "committable_trait")]
+impl<T> Clone for MessageCommitment<T>
+where
+    T: ?Sized + Committable,
+{
+    fn clone(&self) -> Self {
+        MessageCommitment {
+            commitment: self.commitment.clone(),
+            _message_type: Default::default(),
+        }
+    }
+}
+
+#[cfg(feature = "committable_trait")]
+impl<T> MessageCommitment<T>
+where
+    T: ?Sized + Committable,
+{
+    pub fn value(&self) -> &[u8] {
+        self.commitment.as_ref()
+    }
+
+    pub fn unchecked_set_value(value: &[u8]) -> Self {
+        MessageCommitment {
+            commitment: Output::<T::DigestAlgorithm>::clone_from_slice(value),
+            _message_type: Default::default(),
+        }
+    }
+
+    pub fn new(message: &T) -> MessageCommitment<T> {
+        message.produce_commitment()
+    }
+
+    pub fn contract_safe_commitment(&self) -> ContractSafeCommitment {
+        self.into()
+    }
+
+    pub fn is_same_as(&self, other: &ContractSafeCommitment) -> bool {
+        self.commitment.as_slice() == other.0
+    }
+}
+
+#[cfg(feature = "committable_trait")]
+impl<'a, T> From<&'a MessageCommitment<T>> for ContractSafeCommitment
+where
+    T: ?Sized + Committable,
+{
+    fn from(commitment: &'a MessageCommitment<T>) -> Self {
+        ContractSafeCommitment(commitment.value().to_vec())
+    }
+}
+
+#[cfg(feature = "committable_trait")]
+impl<'a, T> TryFrom<&'a ContractSafeCommitment> for MessageCommitment<T>
+where
+    T: ?Sized + Committable,
+{
+    type Error = InconsistentCommitmentSize;
+
+    fn try_from(value: &'a ContractSafeCommitment) -> Result<Self, Self::Error> {
+        if value.len() != <T::DigestAlgorithm as digest::Digest>::output_size() {
+            Err(InconsistentCommitmentSize)
+        } else {
+            Ok(MessageCommitment::unchecked_set_value(value))
+        }
+    }
+}
@@ -1,4 +1,5 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

+pub mod commitment;
 pub mod events;
@@ -7,7 +7,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-cosmwasm-std = "1.0.0"
+cosmwasm-std = "1.0.0-beta8"

 serde = { version = "1.0", features = ["derive"] }
 serde_repr = "0.1"
@@ -18,13 +18,12 @@ fixed = { version = "1.1", features = ["serde"] }
 az = "1.1"
 log = "0.4.14"
 time = { version = "0.3.6", features = ["parsing", "formatting"] }
-ts-rs = "6.1.2"

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

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

 [features]
 default = []
-generate-ts = []
@@ -23,9 +23,7 @@ pub const CHANGE_REWARDED_SET_EVENT_TYPE: &str = "change_rewarded_set";
 pub const ADVANCE_INTERVAL_EVENT_TYPE: &str = "advance_interval";
 pub const ADVANCE_EPOCH_EVENT_TYPE: &str = "advance_epoch";
 pub const COMPOUND_DELEGATOR_REWARD_EVENT_TYPE: &str = "compound_delegator_reward";
-pub const CLAIM_DELEGATOR_REWARD_EVENT_TYPE: &str = "claim_delegator_reward";
 pub const COMPOUND_OPERATOR_REWARD_EVENT_TYPE: &str = "compound_operator_reward";
-pub const CLAIM_OPERATOR_REWARD_EVENT_TYPE: &str = "claim_operator_reward";
 pub const SNAPSHOT_MIXNODES_EVENT: &str = "snapshot_mixnodes";

 // attributes that are used in multiple places
@@ -153,11 +151,6 @@ pub fn new_compound_operator_reward_event(owner: &Addr, amount: Uint128) -> Even
    event.add_attribute(AMOUNT_KEY, amount.to_string())
 }

-pub fn new_claim_operator_reward_event(owner: &Addr, amount: Uint128) -> Event {
-    let event = Event::new(CLAIM_OPERATOR_REWARD_EVENT_TYPE).add_attribute(OWNER_KEY, owner);
-    event.add_attribute(AMOUNT_KEY, amount.to_string())
-}
-
 pub fn new_compound_delegator_reward_event(
    delegator: &Addr,
    proxy: &Option<Addr>,
@@ -178,26 +171,6 @@ pub fn new_compound_delegator_reward_event(
        .add_attribute(DELEGATOR_KEY, delegator)
 }

-pub fn new_claim_delegator_reward_event(
-    delegator: &Addr,
-    proxy: &Option<Addr>,
-    amount: Uint128,
-    mix_identity: IdentityKeyRef<'_>,
-) -> Event {
-    let mut event =
-        Event::new(CLAIM_DELEGATOR_REWARD_EVENT_TYPE).add_attribute(DELEGATOR_KEY, delegator);
-
-    if let Some(proxy) = proxy {
-        event = event.add_attribute(PROXY_KEY, proxy)
-    }
-
-    // coin implements Display trait and we use that implementation here
-    event
-        .add_attribute(AMOUNT_KEY, amount.to_string())
-        .add_attribute(DELEGATION_TARGET_KEY, mix_identity)
-        .add_attribute(DELEGATOR_KEY, delegator)
-}
-
 pub fn new_undelegation_event(
    delegator: &Addr,
    proxy: &Option<Addr>,
@@ -8,6 +8,11 @@ use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
 use std::fmt::Display;

+#[cfg_attr(test, derive(ts_rs::TS))]
+#[cfg_attr(
+    test,
+    ts(export, export_to = "../../../nym-wallet/src/types/rust/gateway.ts")
+)]
 #[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema)]
 pub struct Gateway {
    pub host: String,
@@ -14,10 +14,13 @@ use serde_repr::{Deserialize_repr, Serialize_repr};
 use std::cmp::Ordering;
 use std::fmt::Display;

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

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

-pub struct RewardEstimate {
-    pub total_node_reward: u64,
-    pub operator_reward: u64,
-    pub delegators_reward: u64,
-    pub node_profit: u64,
-    pub operator_cost: u64,
-}
-
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixNodeBond {
    pub pledge_amount: Coin,
@@ -410,80 +410,63 @@ impl MixNodeBond {
            / U128::from_num(circulating_supply)
    }

-    pub fn lambda_ticked(&self, params: &RewardParams) -> U128 {
-        // Ratio of a bond to the token circulating supply
-        self.lambda(params).min(params.one_over_k())
-    }
-
    pub fn lambda(&self, params: &RewardParams) -> U128 {
        // Ratio of a bond to the token circulating supply
-        self.pledge_to_circulating_supply(params.circulating_supply())
-    }
-
-    pub fn sigma_ticked(&self, params: &RewardParams) -> U128 {
-        // Ratio of a delegation to the the token circulating supply
-        self.sigma(params).min(params.one_over_k())
+        let pledge_to_circulating_supply_ratio =
+            self.pledge_to_circulating_supply(params.circulating_supply());
+        pledge_to_circulating_supply_ratio.min(params.one_over_k())
    }

    pub fn sigma(&self, params: &RewardParams) -> U128 {
        // Ratio of a delegation to the the token circulating supply
-        self.total_bond_to_circulating_supply(params.circulating_supply())
+        let total_bond_to_circulating_supply_ratio =
+            self.total_bond_to_circulating_supply(params.circulating_supply());
+        total_bond_to_circulating_supply_ratio.min(params.one_over_k())
    }

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

-        Ok(RewardEstimate {
-            total_node_reward: total_node_reward.try_into()?,
-            operator_reward: operator_reward.try_into()?,
-            delegators_reward: delegators_reward.try_into()?,
-            node_profit: node_profit.try_into()?,
-            operator_cost: operator_cost.try_into()?,
-        })
+        Ok((
+            total_node_reward.try_into()?,
+            operator_reward.try_into()?,
+            delegators_reward.try_into()?,
+        ))
    }

-    // keybase://chat/nymtech#dev-core/14473
    pub fn reward(&self, params: &RewardParams) -> NodeRewardResult {
-        let lambda_ticked = self.lambda_ticked(params);
-        let sigma_ticked = self.sigma_ticked(params);
+        let lambda = self.lambda(params);
+        let sigma = self.sigma(params);

        let reward = params.performance()
            * params.epoch_reward_pool()
-            * (sigma_ticked * params.omega()
-                + params.alpha() * lambda_ticked * sigma_ticked * params.rewarded_set_size())
+            * (sigma * params.omega()
+                + params.alpha() * lambda * sigma * params.rewarded_set_size())
            / (ONE + params.alpha());

-        // we only need regular lambda and sigma to calculate operator and delegator rewards
        NodeRewardResult {
            reward,
-            lambda: self.lambda(params),
-            sigma: self.sigma(params),
+            lambda,
+            sigma,
        }
    }

    pub fn node_profit(&self, params: &RewardParams) -> U128 {
-        self.reward(params)
-            .reward()
-            .saturating_sub(params.node.operator_cost())
+        if self.reward(params).reward() < params.node.operator_cost() {
+            U128::from_num(0u128)
+        } else {
+            self.reward(params).reward() - params.node.operator_cost()
+        }
    }

    pub fn operator_reward(&self, params: &RewardParams) -> u128 {
@@ -491,9 +474,11 @@ impl MixNodeBond {
        if reward.sigma == 0 {
            return 0;
        }
-
-        let profit = reward.reward.saturating_sub(params.node.operator_cost());
-
+        let profit = if reward.reward < params.node.operator_cost() {
+            U128::from_num(0u128)
+        } else {
+            reward.reward - params.node.operator_cost()
+        };
        let operator_base_reward = reward.reward.min(params.node.operator_cost());
        // Div by zero checked above
        let operator_reward = (self.profit_margin()
@@ -99,17 +99,6 @@ pub enum ExecuteMsg {
    },
    // AdvanceCurrentInterval {},
    AdvanceCurrentEpoch {},
-    ClaimOperatorReward {},
-    ClaimOperatorRewardOnBehalf {
-        owner: String,
-    },
-    ClaimDelegatorReward {
-        mix_identity: IdentityKey,
-    },
-    ClaimDelegatorRewardOnBehalf {
-        mix_identity: IdentityKey,
-        owner: String,
-    },
 }

 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
@@ -42,13 +42,16 @@ impl NodeEpochRewards {
    }

    pub fn operator_cost(&self) -> U128 {
-        self.params.operator_cost()
+        U128::from_num(self.params.uptime.u128() / 100u128 * DEFAULT_OPERATOR_INTERVAL_COST as u128)
    }

    pub fn node_profit(&self) -> U128 {
        let reward = U128::from_num(self.reward().u128());
-        // if operating cost is higher then the reward node profit is 0
-        reward.saturating_sub(self.operator_cost())
+        if reward < self.operator_cost() {
+            U128::from_num(0u128)
+        } else {
+            reward - self.operator_cost()
+        }
    }

    pub fn operator_reward(&self, profit_margin: U128) -> Result<Uint128, MixnetContractError> {
@@ -178,15 +181,11 @@ impl NodeRewardParams {
    }

    pub fn operator_cost(&self) -> U128 {
-        self.performance() * U128::from_num(DEFAULT_OPERATOR_INTERVAL_COST)
+        U128::from_num(self.uptime.u128() / 100u128 * DEFAULT_OPERATOR_INTERVAL_COST as u128)
    }

-    pub fn uptime(&self) -> Uint128 {
-        self.uptime
-    }
-
-    pub fn performance(&self) -> U128 {
-        U128::from_num(self.uptime.u128()) / U128::from_num(100)
+    pub fn uptime(&self) -> u128 {
+        self.uptime.u128()
    }

    pub fn set_reward_blockstamp(&mut self, blockstamp: u64) {
@@ -237,7 +236,7 @@ impl RewardParams {
    }

    pub fn performance(&self) -> U128 {
-        self.node.performance()
+        U128::from_num(self.node.uptime.u128()) / U128::from_num(100)
    }

    pub fn set_reward_blockstamp(&mut self, blockstamp: u64) {
@@ -260,8 +259,8 @@ impl RewardParams {
        self.node.reward_blockstamp
    }

-    pub fn uptime(&self) -> Uint128 {
-        self.node.uptime()
+    pub fn uptime(&self) -> u128 {
+        self.node.uptime.u128()
    }

    pub fn one_over_k(&self) -> U128 {
@@ -1 +0,0 @@
-pub mod msg;
@@ -6,13 +6,12 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-cosmwasm-std = "1.0.0"
+cosmwasm-std = "1.0.0-beta8"
 mixnet-contract-common = { path = "../mixnet-contract" }
 serde = { version = "1.0", features = ["derive"] }
 schemars = "0.8"
-cw-storage-plus = "0.13.4"
+cw-storage-plus = "0.13.2"
 config = { path = "../../config" }
-ts-rs = "6.1.2"

-[features]
-generate-ts = []
+[dev-dependencies]
+ts-rs = "6.1.2"
@@ -20,7 +20,6 @@ pub const VESTING_UPDATE_MIXNODE_CONFIG_EVENT_TYPE: &str = "vesting_update_mixno
 pub const TRACK_MIXNODE_UNBOND_EVENT_TYPE: &str = "track_mixnode_unbond";
 pub const TRACK_GATEWAY_UNBOND_EVENT_TYPE: &str = "track_gateway_unbond";
 pub const TRACK_UNDELEGATION_EVENT_TYPE: &str = "track_undelegation";
-pub const TRACK_REWARD_EVENT_TYPE: &str = "track_reaward";

 // attributes that are used in multiple places
 pub const OWNER_KEY: &str = "owner";
@@ -137,7 +136,3 @@ pub fn new_track_gateway_unbond_event() -> Event {
 pub fn new_track_undelegation_event() -> Event {
    Event::new(TRACK_UNDELEGATION_EVENT_TYPE)
 }
-
-pub fn new_track_reward_event() -> Event {
-    Event::new(TRACK_REWARD_EVENT_TYPE)
-}
@@ -5,8 +5,6 @@ use cosmwasm_std::{Coin, Timestamp};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};

-pub use messages::{ExecuteMsg, InitMsg, MigrateMsg, QueryMsg};
-
 pub mod events;
 pub mod messages;

@@ -14,10 +12,10 @@ pub fn one_ucoin() -> Coin {
    Coin::new(1, DENOM)
 }

-#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
+#[cfg_attr(test, derive(ts_rs::TS))]
 #[cfg_attr(
-    feature = "generate-ts",
-    ts(export_to = "ts-packages/types/src/types/rust/Period.ts")
+    test,
+    ts(export, export_to = "../../../nym-wallet/src/types/rust/period.ts")
 )]
 #[derive(Debug, PartialEq, Serialize, Deserialize, Clone, JsonSchema)]
 pub enum Period {
@@ -49,14 +49,6 @@ impl VestingSpecification {
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
-    TrackReward {
-        amount: Coin,
-        address: String,
-    },
-    ClaimOperatorReward {},
-    ClaimDelegatorReward {
-        mix_identity: String,
-    },
    CompoundDelegatorReward {
        mix_identity: String,
    },
@@ -12,9 +12,9 @@ nymcoconut = { path = "../nymcoconut" }
 log = "0.4"
 sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"]}
 thiserror = "1.0"
-tokio = { version = "1.19.1", features = [ "rt-multi-thread", "net", "signal", "fs" ] }
+tokio = { version = "1.4", features = [ "rt-multi-thread", "net", "signal", "fs" ] }


 [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.4", features = ["rt-multi-thread", "macros"] }
@@ -7,7 +7,7 @@ edition = "2021"

 [dependencies]
 bls12_381 = { version = "0.5", default-features = false, features = ["pairings", "alloc", "experimental"] }
-cosmrs = { version = "0.7.0", optional = true }
+cosmrs = { version = "0.4.1", optional = true }
 thiserror = "1.0"
 url = "2.2"

@@ -204,10 +204,7 @@ mod test {
                    .to_base58_string(),
            )
            .unwrap(),
-            encryption::PrivateKey::from_bytes(
-                &encryption::KeyPair::new(&mut rng).private_key().to_bytes(),
-            )
-            .unwrap(),
+            encryption::KeyPair::new(&mut rng).private_key().clone(),
        );
        assert!(!BandwidthVoucher::verify_against_plain(
            &[],
@@ -51,7 +51,12 @@ pub async fn obtain_aggregate_verification_key(
    let mut shares = Vec::with_capacity(validators.len());

    let mut client = validator_client::ApiClient::new(validators[0].clone());
-    for (id, validator_url) in validators.iter().enumerate() {
+    let response = client.get_coconut_verification_key().await?;
+
+    indices.push(1);
+    shares.push(response.key);
+
+    for (id, validator_url) in validators.iter().enumerate().skip(1) {
        client.change_validator_api(validator_url.clone());
        let response = client.get_coconut_verification_key().await?;
        indices.push((id + 1) as u64);
@@ -130,7 +135,14 @@ pub async fn obtain_aggregate_signature(
    let mut validators_partial_vks: Vec<VerificationKey> = Vec::with_capacity(validators.len());

    let mut client = validator_client::ApiClient::new(validators[0].clone());
-    for (id, validator_url) in validators.iter().enumerate() {
+    let validator_partial_vk = client.get_coconut_verification_key().await?;
+    validators_partial_vks.push(validator_partial_vk.key.clone());
+
+    let first =
+        obtain_partial_credential(params, attributes, &client, &validator_partial_vk.key).await?;
+    shares.push(SignatureShare::new(first, 1));
+
+    for (id, validator_url) in validators.iter().enumerate().skip(1) {
        client.change_validator_api(validator_url.clone());
        let validator_partial_vk = client.get_coconut_verification_key().await?;
        validators_partial_vks.push(validator_partial_vk.key.clone());
@@ -181,7 +193,8 @@ pub fn prepare_credential_for_spending(
    Ok(Credential::new(
        PUBLIC_ATTRIBUTES + PRIVATE_ATTRIBUTES,
        theta,
-        voucher_value,
+        voucher_value.to_string(),
        voucher_info,
+        signature,
    ))
 }
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 #[cfg(feature = "coconut")]
-use coconut_interface::CoconutError;
+use coconut_interface::{error::CoconutInterfaceError, CoconutError};
 use crypto::asymmetric::encryption::KeyRecoveryError;
 use validator_client::ValidatorClientError;

@@ -20,6 +20,10 @@ pub enum Error {
    #[error("Ran into a coconut error - {0}")]
    CoconutError(#[from] CoconutError),

+    #[cfg(feature = "coconut")]
+    #[error("Ran into a coconut interface error - {0}")]
+    CoconutInterfaceError(#[from] CoconutInterfaceError),
+
    #[error("Ran into a validator client error - {0}")]
    ValidatorClientError(#[from] ValidatorClientError),

@@ -19,8 +19,6 @@ cipher = { version = "0.4.3", optional = true }
 x25519-dalek = { version = "1.1", optional = true }
 ed25519-dalek = { version = "1.0", optional = true }
 rand = { version = "0.7.3", features = ["wasm-bindgen"], optional = true }
-serde_bytes = { version = "0.11.6", optional = true }
-serde_crate = { version = "1.0", optional = true, default_features = false, package = "serde" }
 subtle-encoding = { version = "0.5", features =  ["bech32-preview"]}

 # internal
@@ -28,11 +26,19 @@ nymsphinx-types = { path = "../nymsphinx/types" }
 pemstore = { path = "../../common/pemstore" }
 config = { path="../../common/config" }

+serde_bytes = { version = "0.11.6", optional = true}
+
+[dependencies.serde_crate]
+version = "1.0"
+optional = true
+default-features = false
+package = "serde"
+
 [dev-dependencies]
 rand_chacha = "0.2"

 [features]
-serde = ["serde_crate", "serde_bytes", "ed25519-dalek/serde", "x25519-dalek/serde"]
+serde = ["serde_crate", "serde_bytes", "ed25519-dalek/serde"]
 asymmetric = ["x25519-dalek", "ed25519-dalek"]
 hashing = ["blake3", "digest", "hkdf", "hmac", "generic-array"]
 symmetric = ["aes", "ctr", "cipher", "generic-array"]
@@ -21,6 +21,7 @@ rand_chacha = "0.3"
 rand_core = "0.6.3"
 sha2 = "0.9"
 serde = "1.0"
+serde_bytes = { version = "0.11.6" }
 serde_derive = "1.0"
 thiserror = "1.0"
 zeroize = { version = "1.4", features = ["zeroize_derive"] }
@@ -14,8 +14,8 @@ use std::collections::HashMap;
 use std::ops::Neg;
 use zeroize::Zeroize;

-#[derive(Debug)]
-#[cfg_attr(test, derive(Clone, PartialEq))]
+#[derive(Debug, Clone)]
+#[cfg_attr(test, derive(PartialEq))]
 pub struct Ciphertexts {
    pub rr: [G1Projective; NUM_CHUNKS],
    pub ss: [G1Projective; NUM_CHUNKS],
@@ -9,6 +9,9 @@ use bls12_381::{G1Projective, G2Projective, Scalar};
 use ff::Field;
 use group::GroupEncoding;
 use rand_core::RngCore;
+use serde::de::Error as SerdeError;
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use serde_bytes::{ByteBuf as SerdeByteBuf, Bytes as SerdeBytes};
 use zeroize::Zeroize;

 #[derive(Debug, Zeroize)]
@@ -344,7 +347,7 @@ impl PublicKey {
    }
 }

-#[derive(Debug)]
+#[derive(Debug, Clone)]
 #[cfg_attr(test, derive(PartialEq))]
 pub struct PublicKeyWithProof {
    pub(crate) key: PublicKey,
@@ -410,6 +413,25 @@ impl PublicKeyWithProof {
    }
 }

+impl Serialize for PublicKeyWithProof {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        SerdeBytes::new(&self.to_bytes()).serialize(serializer)
+    }
+}
+
+impl<'d> Deserialize<'d> for PublicKeyWithProof {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'d>,
+    {
+        let bytes = <SerdeByteBuf>::deserialize(deserializer)?;
+        PublicKeyWithProof::try_from_bytes(bytes.as_ref()).map_err(SerdeError::custom)
+    }
+}
+
 #[derive(Debug, Zeroize)]
 #[zeroize(drop)]
 #[cfg_attr(test, derive(PartialEq))]
@@ -642,6 +664,25 @@ impl DecryptionKey {
    }
 }

+impl Serialize for DecryptionKey {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        SerdeBytes::new(&self.to_bytes()).serialize(serializer)
+    }
+}
+
+impl<'d> Deserialize<'d> for DecryptionKey {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'d>,
+    {
+        let bytes = <SerdeByteBuf>::deserialize(deserializer)?;
+        DecryptionKey::try_from_bytes(bytes.as_ref()).map_err(SerdeError::custom)
+    }
+}
+
 #[cfg(test)]
 mod tests {
    use super::*;
@@ -302,6 +302,12 @@ pub struct Params {
    _h_prepared: G2Prepared,
 }

+impl Default for Params {
+    fn default() -> Self {
+        setup()
+    }
+}
+
 pub fn setup() -> Params {
    let f0 = hash_g2(b"f0", SETUP_DOMAIN);

@@ -67,8 +67,8 @@ impl<'a> Instance<'a> {
    }
 }

-#[derive(Debug)]
-#[cfg_attr(test, derive(Clone, PartialEq))]
+#[derive(Debug, Clone)]
+#[cfg_attr(test, derive(PartialEq))]
 pub struct ProofOfChunking {
    y0: G1Projective,
    bb: Vec<G1Projective>,
@@ -13,7 +13,7 @@ use zeroize::Zeroize;
 const DISCRETE_LOG_DOMAIN: &[u8] =
    b"NYM_COCONUT_NIDKG_V01_CS01_WITH_BLS12381_XMD:SHA-256_SSWU_RO_PROOF_DISCRETE_LOG";

-#[derive(Debug)]
+#[derive(Debug, Clone)]
 #[cfg_attr(test, derive(PartialEq))]
 pub struct ProofOfDiscreteLog {
    pub(crate) rand_commitment: G1Projective,
@@ -76,8 +76,8 @@ impl<'a> Instance<'a> {
    }
 }

-#[derive(Debug)]
-#[cfg_attr(test, derive(Clone, PartialEq))]
+#[derive(Debug, Clone)]
+#[cfg_attr(test, derive(PartialEq))]
 pub struct ProofOfSecretSharing {
    ff: G1Projective,
    aa: G2Projective,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jędrzej Stuczyński	f66d87525c	pausing implementation	2022-05-23 11:44:13 +01:00
Jędrzej Stuczyński	625c9b376f	More dealing action And actually receiving broadcasted data from other dealers !	2022-05-20 17:23:15 +01:00
Jędrzej Stuczyński	9ceae4667a	Fixed comparing dealers addresses to only use ip	2022-05-20 17:21:22 +01:00
Jędrzej Stuczyński	dc2a386cd6	Storing and retrieving epoch dealings commitments	2022-05-19 17:36:49 +01:00
Jędrzej Stuczyński	34b1fc8989	Validator API-side logic for dealing broadcast	2022-05-19 15:11:41 +01:00
Jędrzej Stuczyński	487a3a6cd8	Work on dealing commitments	2022-05-17 17:20:39 +01:00
Jędrzej Stuczyński	b919bd3d35	Recovering assigned node index	2022-05-17 12:42:45 +01:00
Jędrzej Stuczyński	3b14511e16	Fixed condition for pushing new dealers	2022-05-16 17:21:15 +01:00
Jędrzej Stuczyński	11b9e6da43	Fixed dealer remova loging	2022-05-16 17:21:04 +01:00
Jędrzej Stuczyński	aee491173d	Fixed plaintext encoding	2022-05-16 17:08:41 +01:00
Jędrzej Stuczyński	7d92f0b70a	Fixed arguments order	2022-05-16 17:08:25 +01:00
Jędrzej Stuczyński	00421c8b06	decoding validator address when validating dealer eligibility	2022-05-16 16:52:28 +01:00
Jędrzej Stuczyński	1165a61ca6	Actually attempting to register dealer keys	2022-05-13 17:29:21 +01:00
Jędrzej Stuczyński	106e179f6c	... and bte key	2022-05-13 17:15:07 +01:00
Jędrzej Stuczyński	c3034738f5	changed signature verification to also include host	2022-05-13 17:09:27 +01:00
Jędrzej Stuczyński	e23f0bb952	Dont push empty dealer set changes	2022-05-13 16:21:29 +01:00
Jędrzej Stuczyński	8bc12bc079	full event propagation and execution of dkg key submission	2022-05-13 16:20:34 +01:00
Jędrzej Stuczyński	34aca1d4bc	Queries for blacklisted dealers	2022-05-13 15:52:22 +01:00
Jędrzej Stuczyński	a3d6fc23f8	Added data field to ExecuteResult	2022-05-13 13:57:31 +01:00
Jędrzej Stuczyński	3328e06f45	Changed initialisation to ensure public key submission step takes non-zero number of blocks	2022-05-13 12:23:25 +01:00
Jędrzej Stuczyński	0e853e7f32	fixed startup	2022-05-13 12:16:04 +01:00
Jędrzej Stuczyński	7844a583bf	setting internal dkg contract address	2022-05-13 12:08:11 +01:00
Jędrzej Stuczyński	4c4f9d7739	Using correct page limit for getting dealers	2022-05-12 16:07:03 +01:00
Jędrzej Stuczyński	691049b85b	Temporary junky setup of all dkg components	2022-05-12 16:03:22 +01:00
Jędrzej Stuczyński	50f26940be	Added utility dkg contract message to reset the entire state	2022-05-12 15:10:56 +01:00
Jędrzej Stuczyński	9f4029eb85	Added additional log statements for future debugging purposes	2022-05-12 11:28:42 +01:00
Jędrzej Stuczyński	fb09e97eb6	Logic for processing dealer set changes	2022-05-12 11:12:02 +01:00
Jędrzej Stuczyński	1318b4425d	Initial event emission by the contract watcher	2022-05-11 12:15:28 +01:00
Jędrzej Stuczyński	43f1194268	Parsing of dealer details	2022-05-11 12:14:39 +01:00
Jędrzej Stuczyński	bd216453cc	Querying contract for the current(and past) set of dkg dealers	2022-05-10 15:05:21 +01:00
Jędrzej Stuczyński	7271d19afa	Adding sample ExecuteMsg to DkgClient trait	2022-05-09 12:29:59 +01:00
Jędrzej Stuczyński	f85ac03cda	Stub for DkgClient	2022-05-06 10:19:11 +01:00
Jędrzej Stuczyński	ff9cdba941	Ability to serialize DkgState	2022-05-05 16:20:46 +01:00
Jędrzej Stuczyński	48e5fcd244	Serde for dkg types via serde_bytes	2022-05-05 16:19:16 +01:00
Jędrzej Stuczyński	9d84e15a92	Showing better errors for critical failures	2022-05-05 16:12:26 +01:00
Jędrzej Stuczyński	160046b359	Further organising	2022-05-05 14:40:56 +01:00
Jędrzej Stuczyński	72665d3878	Actually handling dkg requests	2022-05-05 12:23:17 +01:00
Jędrzej Stuczyński	5fb7ebeb63	Reorganised accessing state	2022-05-05 12:17:41 +01:00
Jędrzej Stuczyński	3963aebc97	Simplified error response handling	2022-05-05 11:02:26 +01:00
Jędrzej Stuczyński	6554916fae	Merge branch 'develop' into feature/integrated-hybrid-dkg	2022-05-05 10:07:46 +01:00
Jędrzej Stuczyński	d71f860751	Changes to serialization + playing around with the concept of event dispatcher	2022-05-03 15:30:33 +01:00
Jędrzej Stuczyński	6541d4e0d3	WIP	2022-04-28 09:13:43 +01:00
Jędrzej Stuczyński	1efc0847b5	Header deserialization	2022-04-27 10:18:55 +01:00
Jędrzej Stuczyński	1f0360c828	Initial building blocks for the networking part	2022-04-26 17:11:10 +01:00
Jędrzej Stuczyński	0ff602c7a7	Merge branch 'develop' into feature/integrated-hybrid-dkg	2022-04-26 10:57:50 +01:00
Jędrzej Stuczyński	c541977c40	temporary epoch storage	2022-04-25 09:48:54 +01:00
Jędrzej Stuczyński	2dfb60e296	Merge with develop	2022-04-21 14:01:47 +01:00
Jędrzej Stuczyński	0d963aeb1f	Advancing epoch state	2022-04-20 11:27:13 +01:00
Jędrzej Stuczyński	10d2a6eb8b	Fixed test fixtures	2022-04-19 12:23:54 +01:00
Jędrzej Stuczyński	d148726b4b	Current epoch queries	2022-04-19 12:20:08 +01:00
Jędrzej Stuczyński	ac7ed0d0dd	Setting initial DKG Epoch on init	2022-04-19 11:51:28 +01:00
Jędrzej Stuczyński	4f561ba53b	Moved dealers related parts to separate module	2022-04-19 11:36:51 +01:00
Jędrzej Stuczyński	9f39aec198	Type alias for EpochId	2022-04-19 11:33:49 +01:00
Jędrzej Stuczyński	22f4daaee4	Utility for removing dealers	2022-04-19 11:06:40 +01:00
Jędrzej Stuczyński	e9096bcfc4	Added indices on node index for past and current dealers	2022-04-19 11:06:33 +01:00
Jędrzej Stuczyński	77320e12c4	Copy for Blacklisting	2022-04-19 11:03:59 +01:00
Jędrzej Stuczyński	67a9334328	Blacklisting related utility	2022-04-13 17:05:12 +01:00
Jędrzej Stuczyński	24f4b19e51	Initial logic for adding new dealer contains bunch of placeholder assumptions	2022-04-13 15:01:25 +01:00
Jędrzej Stuczyński	9d2b7d6940	Checking for valid dealer + blacklisting	2022-04-13 11:57:23 +01:00
Jędrzej Stuczyński	1a8058aff5	Scafolding for DKG contract	2022-04-12 16:59:08 +01:00