feat(wallet): add generic dialog component

2022-07-04 19:45:36 +02:00 · 2022-07-04 19:35:56 +02:00 · 2022-07-04 19:33:02 +02:00 · 2022-07-04 19:25:03 +02:00
493 changed files with 25191 additions and 16115 deletions
@@ -19,10 +19,10 @@
 Cargo.* @durch @futurechimp @jstuczyn @neacsu @octol

 # JS rules:
-*.js @mmsinclair @fmtabbara
-*.ts @mmsinclair @fmtabbara
-*.tsx @mmsinclair @fmtabbara
-*.jsx @mmsinclair @fmtabbara
+*.js @mmsinclair @fmtabbara @Aid19801
+*.ts @mmsinclair @fmtabbara @Aid19801
+*.tsx @mmsinclair @fmtabbara @Aid19801
+*.jsx @mmsinclair @fmtabbara @Aid19801

 # Something looking like possible documentation rules:
 *.md @mfahampshire
@@ -1,7 +1,6 @@
 name: CI for Network Explorer

 on:
-  workflow_dispatch:
  push:
    paths:
      - 'explorer/**'
@@ -76,14 +75,3 @@ jobs:
      uses: docker://keybaseio/client:stable-node
      with:
        args: .github/workflows/support-files/notifications/entry_point.sh
-    - name: Deploy
-      if: github.event_name == 'workflow_dispatch'
-      uses: easingthemes/ssh-deploy@main
-      env:
-        SSH_PRIVATE_KEY: ${{ secrets.CD_PROD_NE_SSH_PRIVATE_KEY }}
-        ARGS: "-rltgoDzvO --delete"
-        SOURCE: "explorer/dist/"
-        REMOTE_HOST: ${{ secrets.CD_PROD_NE_REMOTE_HOST }}
-        REMOTE_USER: ${{ secrets.CD_PROD_NE_REMOTE_USER }}
-        TARGET: ${{ secrets.CD_PROD_NE_REMOTE_TARGET }}
-        EXCLUDE: "/dist/, /node_modules/"
@@ -1,50 +0,0 @@
-[
-  {
-    "os":"ubuntu-latest",
-    "rust":"stable",
-    "runOnEvent":"workflow_dispatch"
-  },
-
-  {
-    "os":"windows-latest",
-    "rust":"stable",
-    "runOnEvent":"workflow_dispatch"
-  },
-  {
-    "os":"macos-latest",
-    "rust":"stable",
-    "runOnEvent":"workflow_dispatch"
-  },
-
-  {
-    "os":"ubuntu-latest",
-    "rust":"beta",
-    "runOnEvent":"workflow_dispatch"
-  },
-  {
-    "os":"windows-latest",
-    "rust":"beta",
-    "runOnEvent":"workflow_dispatch"
-  },
-  {
-    "os":"macos-latest",
-    "rust":"beta",
-    "runOnEvent":"workflow_dispatch"
-  },
-
-  {
-    "os":"ubuntu-latest",
-    "rust":"nightly",
-    "runOnEvent":"workflow_dispatch"
-  },
-  {
-    "os":"windows-latest",
-    "rust":"nightly",
-    "runOnEvent":"workflow_dispatch"
-  },
-  {
-    "os":"macos-latest",
-    "rust":"nightly",
-    "runOnEvent":"workflow_dispatch"
-  }
-]
@@ -1,174 +0,0 @@
-name: Nightly builds on dispatch
-
-on: workflow_dispatch
-jobs:
-  matrix_prep:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      # creates the matrix strategy from nightly_build_matrix_includes.json
-      - uses: actions/checkout@v2
-      - id: set-matrix
-        uses: JoshuaTheMiller/conditional-build-matrix@main
-        with:
-          inputFile: '.github/workflows/nightly_build_matrix_on_dispatch.json'
-          filter: '[?runOnEvent==`${{ github.event_name }}` || runOnEvent==`always`]'
-  build:
-    needs: matrix_prep
-    strategy:
-      matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.rust == 'nightly' || matrix.rust == 'beta' || matrix.rust == 'stable' }}
-    steps:
-      - name: Install Dependencies (Linux)
-        run: sudo apt-get update && sudo apt-get install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools
-        if: matrix.os == 'ubuntu-latest'
-
-      - name: Check out repository code
-        uses: actions/checkout@v2
-
-      - name: Install rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ matrix.rust }}
-          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
-
-      - name: Reclaim some disk space (because Windows is being annoying)
-        uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' }}
-        with:
-          command: clean
-
-      - name: Run expensive tests
-        if: github.ref == 'refs/heads/develop' || github.event.pull_request.base.ref == 'develop' || github.event.pull_request.base.ref == 'master'
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --workspace --all-features -- --ignored
-
-      - name: Check formatting
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-
-      - name: Reclaim some disk space (because Windows is being annoying)
-        uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' }}
-        with:
-          command: clean
-
-      - 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
-        if: ${{ matrix.rust != 'nightly' }}
-        with:
-          command: clippy
-          args: --workspace --all-targets -- -D warnings
-
-      - name: Reclaim some disk space
-        uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-latest' }}
-        with:
-          command: clean
-
-      # COCONUT stuff
-      - 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: Reclaim some disk space (because Windows is being annoying)
-        uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' }}
-        with:
-          command: clean
-
-      - name: Run clippy with coconut enabled
-        uses: actions-rs/cargo@v1
-        if: ${{ matrix.rust != 'nightly' }}
-        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
-    steps:
-      - name: Collect jobs status
-        uses: technote-space/workflow-conclusion-action@v2
-      - name: Check out repository code
-        uses: actions/checkout@v2
-      - name: Keybase - Node Install
-        if: env.WORKFLOW_CONCLUSION == 'failure'
-        run: npm install
-        working-directory: .github/workflows/support-files
-      - name: Keybase - Send Notification
-        if: env.WORKFLOW_CONCLUSION == 'failure'
-        env:
-          NYM_NOTIFICATION_KIND: nightly
-          NYM_PROJECT_NAME: "Nym nightly build"
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
-          GIT_BRANCH: "${GITHUB_REF##*/}"
-          KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
-          KEYBASE_NYMBOT_PAPERKEY: "${{ secrets.KEYBASE_NYMBOT_PAPERKEY }}"
-          KEYBASE_NYMBOT_TEAM: "${{ secrets.KEYBASE_NYMBOT_TEAM }}"
-          KEYBASE_NYM_CHANNEL: "ci-nightly"
-          IS_SUCCESS: "${{ env.WORKFLOW_CONCLUSION == 'success' }}"
-        uses: docker://keybaseio/client:stable-node
-        with:
-          args: .github/workflows/support-files/notifications/entry_point.sh
@@ -8,6 +8,8 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 ### Added

 - socks5 client/websocket client: add `--force-register-gateway` flag, useful when rerunning init ([#1353])
+- nym-connect: initial proof-of-concept of a UI around the socks5 client was added
+- nym-connect: add ability to select network requester and gateway ([#1427]).
 - all: added network compilation target to `--help` (or `--version`) commands ([#1256]).
 - explorer-api: learned how to sum the delegations by owner in a new endpoint.
 - explorer-api: add apy values to `mix_nodes` endpoint
@@ -20,12 +22,9 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - validator-api: Added new endpoints for coconut spending flow and communications with coconut & multisig contracts ([#1261])
 - validator-api: add `uptime`, `estimated_operator_apy`, `estimated_delegators_apy` to `/mixnodes/detailed` endpoint ([#1393])
 - network-statistics: a new mixnet service that aggregates and exposes anonymized data about mixnet services ([#1328])
+- wallet: when simulating gas costs, an automatic adjustment is being used ([#1388]).
 - mixnode: Added basic mixnode hardware reporting to the HTTP API ([#1308]).
 - validator-api: endpoint, in coconut mode, for returning the validator-api cosmos address ([#1404]).
- validator-client: add `denom` argument and add simple test for querying an account balance
- gateway, validator-api: Checks for coconut credential double spending attempts, taking the coconut bandwidth contract as source of truth ([#1457])
- coconut-bandwidth-contract: Record the state of a coconut credential; create specific proposal for releasing funds ([#1457])
- add validator-client script rust binary /tools/validator-client-scripts

 ### Fixed

@@ -36,23 +35,15 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - native & socks5 clients: rerun init will now reuse previous gateway configuration instead of failing ([#1353])
 - native & socks5 clients: deduplicate big chunks of init logic
 - validator: fixed local docker-compose setup to work on Apple M1 ([#1329])
- explorer-api: listen out for SIGTERM and SIGQUIT too, making it play nicely as a system service ([#1482]).
- network-requester: fix filter for suffix-only domains ([#1487])

 ### Changed

+- nym-connect: reuse config id instead of creating a new id on each connection.
 - validator-client: created internal `Coin` type that replaces coins from `cosmrs` and `cosmwasm` for API entrypoints [[#1295]]
 - all: updated all `cosmwasm`-related dependencies to `1.0.0` and `cw-storage-plus` to `0.13.4` [[#1318]]
 - all: updated `rocket` to `0.5.0-rc.2`.
 - network-requester: allow to voluntarily store and send statistical data about the number of bytes the proxied server serves ([#1328])
 - gateway: allow to voluntarily send statistical data about the number of active inboxes served by a gateway ([#1376])
- gateway & mixnode: move detailed build info back to `--version` from `--help`.
- socks5 client/websocket client: upgrade to latest clap and switched to declarative commandline parsing.
- validator-api: fee payment for multisig operations comes from the gateway account instead of the validator APIs' accounts ([#1419])
- multisig-contract: Limit the proposal creating functionality to one address (coconut-bandwidth-contract address) ([#1457])
- All binaries and cosmwasm blobs are configured at runtime now; binaries are configured using environment variables or .env files and contracts keep the configuration parameters in storage ([#1463])
- gateway, network-statistics: include gateway id in the sent statistical data ([#1478])
-

 [#1249]: https://github.com/nymtech/nym/pull/1249
 [#1256]: https://github.com/nymtech/nym/pull/1256
@@ -70,37 +61,11 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 [#1329]: https://github.com/nymtech/nym/pull/1329
 [#1353]: https://github.com/nymtech/nym/pull/1353
 [#1376]: https://github.com/nymtech/nym/pull/1376
+[#1388]: https://github.com/nymtech/nym/pull/1388
 [#1393]: https://github.com/nymtech/nym/pull/1393
 [#1404]: https://github.com/nymtech/nym/pull/1404
-[#1419]: https://github.com/nymtech/nym/pull/1419
-[#1457]: https://github.com/nymtech/nym/pull/1457
-[#1463]: https://github.com/nymtech/nym/pull/1463
-[#1478]: https://github.com/nymtech/nym/pull/1478
-[#1482]: https://github.com/nymtech/nym/pull/1482
-[#1487]: https://github.com/nymtech/nym/pull/1487
-
-## [nym-connect-v1.0.1](https://github.com/nymtech/nym/tree/nym-connect-v1.0.1) (2022-07-22)
-
-### Added
-
- nym-connect: initial proof-of-concept of a UI around the socks5 client was added
- nym-connect: add ability to select network requester and gateway ([#1427])
- nym-connect: add ability to export gateway keys as JSON
- nym-connect: add auto updater
-
-### Changed
-
- nym-connect: reuse config id instead of creating a new id on each connection
-
 [#1427]: https://github.com/nymtech/nym/pull/1427

-## [nym-wallet-v1.0.7](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.7) (2022-07-11)
-
- wallet: dark mode
- wallet: when simulating gas costs, an automatic adjustment is being used ([#1388]).
-
-[#1388]: https://github.com/nymtech/nym/pull/1388
-
 ## [nym-contracts-v1.0.1](https://github.com/nymtech/nym/tree/nym-contracts-v1.0.1) (2022-06-22)

 ### Added
@@ -568,16 +568,16 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "3.2.8"
+version = "3.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190814073e85d238f31ff738fcb0bf6910cedeb73376c87cd69291028966fd83"
+checksum = "71c47df61d9e16dc010b55dba1952a57d8c215dbb533fd13cdd13369aac73b1c"
 dependencies = [
 "atty",
 "bitflags",
 "clap_derive",
- "clap_lex",
 "indexmap",
- "once_cell",
+ "lazy_static",
+ "os_str_bytes",
 "strsim 0.10.0",
 "termcolor",
 "textwrap 0.15.0",
@@ -585,9 +585,9 @@ dependencies = [

 [[package]]
 name = "clap_derive"
-version = "3.2.7"
+version = "3.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759bf187376e1afa7b85b959e6a664a3e7a95203415dba952ad19139e798f902"
+checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1"
 dependencies = [
 "heck 0.4.0",
 "proc-macro-error",
@@ -596,15 +596,6 @@ dependencies = [
 "syn",
 ]

-[[package]]
-name = "clap_lex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
-]
-
 [[package]]
 name = "client-core"
 version = "1.0.1"
@@ -644,7 +635,6 @@ name = "coconut-bandwidth-contract-common"
 version = "0.1.0"
 dependencies = [
 "cosmwasm-std",
- "multisig-contract-common",
 "schemars",
 "serde",
 ]
@@ -783,8 +773,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"

 [[package]]
 name = "cosmos-sdk-proto"
-version = "0.12.3"
-source = "git+https://github.com/neacsu/cosmos-rust?branch=neacsu/feegrant_support#f63ded63ec13e753ebe8bdafe9dc503df265d67d"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f109fe191e73898d74b8020c50f86018364ad19bc30318aa074616c382b52856"
 dependencies = [
 "prost 0.10.3",
 "prost-types 0.10.1",
@@ -793,8 +784,9 @@ dependencies = [

 [[package]]
 name = "cosmrs"
-version = "0.7.1"
-source = "git+https://github.com/neacsu/cosmos-rust?branch=neacsu/feegrant_support#f63ded63ec13e753ebe8bdafe9dc503df265d67d"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8413275b23cb5a0734d9d1e3e33f0b5b94547c1e94776dbc3149dbf46588a533"
 dependencies = [
 "bip32",
 "cosmos-sdk-proto",
@@ -892,7 +884,7 @@ dependencies = [
 "async-trait",
 "bip39",
 "cfg-if 0.1.10",
- "clap 3.2.8",
+ "clap 3.1.8",
 "coconut-interface",
 "credential-storage",
 "credentials",
@@ -928,6 +920,7 @@ dependencies = [
 "coconut-interface",
 "cosmrs",
 "crypto",
+ "network-defaults",
 "rand 0.7.3",
 "thiserror",
 "url",
@@ -1590,7 +1583,6 @@ name = "explorer-api"
 version = "1.0.1"
 dependencies = [
 "chrono",
- "clap 3.2.8",
 "humantime-serde",
 "isocountry",
 "itertools",
@@ -1606,7 +1598,6 @@ dependencies = [
 "schemars",
 "serde",
 "serde_json",
- "task",
 "thiserror",
 "tokio",
 "validator-client",
@@ -2872,6 +2863,7 @@ dependencies = [
 "cosmwasm-std",
 "fixed",
 "log",
+ "network-defaults",
 "schemars",
 "serde",
 "serde_repr",
@@ -2968,7 +2960,6 @@ name = "network-defaults"
 version = "0.1.0"
 dependencies = [
 "cfg-if 1.0.0",
- "dotenv",
 "hex-literal",
 "once_cell",
 "serde",
@@ -3058,7 +3049,7 @@ dependencies = [
 name = "nym-client"
 version = "1.0.1"
 dependencies = [
- "clap 3.2.8",
+ "clap 2.34.0",
 "client-core",
 "coconut-interface",
 "config",
@@ -3066,6 +3057,7 @@ dependencies = [
 "credentials",
 "crypto",
 "dirs",
+ "dotenv",
 "futures",
 "gateway-client",
 "gateway-requests",
@@ -3097,7 +3089,7 @@ dependencies = [
 "bandwidth-claim-contract",
 "bip39",
 "bs58",
- "clap 3.2.8",
+ "clap 3.1.8",
 "coconut-interface",
 "colored",
 "config",
@@ -3142,7 +3134,7 @@ version = "1.0.1"
 dependencies = [
 "anyhow",
 "bs58",
- "clap 3.2.8",
+ "clap 3.1.8",
 "colored",
 "config",
 "crypto",
@@ -3224,7 +3216,7 @@ dependencies = [
 name = "nym-socks5-client"
 version = "1.0.1"
 dependencies = [
- "clap 3.2.8",
+ "clap 2.34.0",
 "client-core",
 "coconut-interface",
 "config",
@@ -3232,6 +3224,7 @@ dependencies = [
 "credentials",
 "crypto",
 "dirs",
+ "dotenv",
 "futures",
 "gateway-client",
 "gateway-requests",
@@ -3298,8 +3291,6 @@ dependencies = [
 "credential-storage",
 "credentials",
 "crypto",
- "cw-utils",
- "cw3",
 "dirs",
 "dotenv",
 "futures",
@@ -3509,9 +3500,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.13.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
+checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"

 [[package]]
 name = "oorandom"
@@ -3576,6 +3567,9 @@ name = "os_str_bytes"
 version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
+dependencies = [
+ "memchr",
+]

 [[package]]
 name = "pairing"
@@ -5389,6 +5383,7 @@ version = "1.0.1"
 dependencies = [
 "async-trait",
 "log",
+ "network-defaults",
 "reqwest",
 "serde",
 "serde_json",
@@ -5397,15 +5392,6 @@ dependencies = [
 "tokio",
 ]

-[[package]]
-name = "streaming-stats"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0d670ce4e348a2081843569e0f79b21c99c91bb9028b3b3ecb0f050306de547"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "stringprep"
 version = "0.1.2"
@@ -6293,29 +6279,6 @@ dependencies = [
 "vesting-contract-common",
 ]

-[[package]]
-name = "validator-client-scripts"
-version = "0.1.0"
-dependencies = [
- "base64",
- "bip39",
- "bs58",
- "clap 3.2.8",
- "csv",
- "dotenv",
- "log",
- "mixnet-contract-common",
- "network-defaults",
- "pretty_env_logger",
- "serde",
- "serde_json",
- "streaming-stats",
- "tokio",
- "url",
- "validator-client",
- "vesting-contract-common",
-]
-
 [[package]]
 name = "valuable"
 version = "0.1.0"
@@ -6368,6 +6331,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 name = "vesting-contract"
 version = "1.0.1"
 dependencies = [
+ "config",
 "cosmwasm-std",
 "cw-storage-plus",
 "mixnet-contract-common",
@@ -68,8 +68,7 @@ members = [
    "service-providers/network-statistics",
    "validator-api",
    "validator-api/validator-api-requests",
-    "tools/ts-rs-cli",
-    "tools/validator-client-scripts"
+    "tools/ts-rs-cli"
 ]

 default-members = [
@@ -1,5 +1,5 @@
-test: clippy-all cargo-test wasm fmt
 test-all: test cargo-test-expensive
+test: build clippy-all cargo-test wasm fmt
 no-clippy: build cargo-test wasm fmt
 happy: fmt clippy-happy test
 clippy-all: clippy-all-main clippy-all-contracts clippy-all-wallet clippy-all-connect
@@ -69,9 +69,6 @@ build-wallet:
 build-connect:
 	cargo build --manifest-path nym-connect/Cargo.toml --workspace

-build-validator-scripts:
-	cargo build --release --manifest-path tools/validator-client-scripts/Cargo.toml
-
 fmt-main:
 	cargo fmt --all

@@ -1,6 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

+use config::defaults::*;
 use config::NymConfig;
 use serde::{Deserialize, Serialize};
 use std::marker::PhantomData;
@@ -365,7 +366,7 @@ impl<T: NymConfig> Default for Client<T> {
            version: env!("CARGO_PKG_VERSION").to_string(),
            id: "".to_string(),
            disabled_credentials_mode: true,
-            validator_api_urls: vec![],
+            validator_api_urls: default_api_endpoints(),
            private_identity_key_file: Default::default(),
            public_identity_key_file: Default::default(),
            private_encryption_key_file: Default::default(),
@@ -4,7 +4,7 @@
 use crate::error::Result;
 use crate::{MNEMONIC, NYMD_URL};
 use bip39::Mnemonic;
-use network_defaults::{NymNetworkDetails, VOUCHER_INFO};
+use network_defaults::{DEFAULT_NETWORK, MIX_DENOM, VOUCHER_INFO};
 use std::str::FromStr;
 use url::Url;
 use validator_client::nymd;
@@ -13,23 +13,18 @@ use validator_client::nymd::{Coin, Fee, NymdClient, SigningNymdClient};

 pub(crate) struct Client {
    nymd_client: NymdClient<SigningNymdClient>,
-    mix_denom_base: String,
 }

 impl Client {
    pub fn new() -> Self {
        let nymd_url = Url::from_str(NYMD_URL).unwrap();
        let mnemonic = Mnemonic::from_str(MNEMONIC).unwrap();
-        let network_details = NymNetworkDetails::new_from_env();
-        let config = nymd::Config::try_from_nym_network_details(&network_details)
+        let config = nymd::Config::try_from_nym_network_details(&DEFAULT_NETWORK.details())
            .expect("failed to construct valid validator client config with the provided network");
        let nymd_client =
            NymdClient::connect_with_mnemonic(config, nymd_url.as_ref(), mnemonic, None).unwrap();

-        Client {
-            nymd_client,
-            mix_denom_base: network_details.chain_details.mix_denom.base,
-        }
+        Client { nymd_client }
    }

    pub async fn deposit(
@@ -39,7 +34,7 @@ impl Client {
        encryption_key: String,
        fee: Option<Fee>,
    ) -> Result<String> {
-        let amount = Coin::new(amount as u128, self.mix_denom_base.clone());
+        let amount = Coin::new(amount as u128, MIX_DENOM.base.to_string());
        Ok(self
            .nymd_client
            .deposit(
@@ -2,7 +2,6 @@
 name = "nym-client"
 version = "1.0.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
-description = "Implementation of the Nym Client"
 edition = "2021"
 rust-version = "1.56"

@@ -20,8 +19,9 @@ futures = "0.3" # bunch of futures stuff, however, now that I think about it, it
 # and the single instance of abortable we have should really be refactored anyway
 url = "2.2"

-clap = { version = "3.2.8", features = ["cargo", "derive"] }
+clap = "2.33.0" # for the command line arguments
 dirs = "4.0"
+dotenv = "0.15.0" # for obtaining environmental variables (only used for RUST_LOG for time being)
 log = "0.4" # self explanatory
 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
@@ -1,100 +1,88 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use clap::Args;
+use clap::{App, Arg, ArgMatches};
 use client_core::config::GatewayEndpoint;
 use config::NymConfig;

-use crate::{
-    client::config::Config,
-    commands::{override_config, OverrideConfig},
+use crate::client::config::Config;
+use crate::commands::override_config;
+#[cfg(feature = "eth")]
+#[cfg(not(feature = "coconut"))]
+use crate::commands::{
+    DEFAULT_ETH_ENDPOINT, DEFAULT_ETH_PRIVATE_KEY, ENABLED_CREDENTIALS_MODE_ARG_NAME,
+    ETH_ENDPOINT_ARG_NAME, ETH_PRIVATE_KEY_ARG_NAME,
 };

-#[cfg(all(feature = "eth", not(feature = "coconut")))]
-use crate::commands::{DEFAULT_ETH_ENDPOINT, DEFAULT_ETH_PRIVATE_KEY};
+pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
+    let app = App::new("init")
+        .about("Initialise a Nym client. Do this first!")
+        .arg(Arg::with_name("id")
+            .long("id")
+            .help("Id of the nym-mixnet-client we want to create config for.")
+            .takes_value(true)
+            .required(true)
+        )
+        .arg(Arg::with_name("gateway")
+            .long("gateway")
+            .help("Id of the gateway we are going to connect to.")
+            .takes_value(true)
+        )
+        .arg(Arg::with_name("force-register-gateway")
+            .long("force-register-gateway")
+            .help("Force register gateway. WARNING: this will overwrite any existing keys for the given id, potentially causing loss of access.")
+            .takes_value(false)
+        )
+        .arg(Arg::with_name("validators")
+                 .long("validators")
+                 .help("Comma separated list of rest endpoints of the validators")
+                 .takes_value(true),
+        )
+        .arg(Arg::with_name("disable-socket")
+            .long("disable-socket")
+            .help("Whether to not start the websocket")
+        )
+        .arg(Arg::with_name("port")
+            .short("p")
+            .long("port")
+            .help("Port for the socket (if applicable) to listen on in all subsequent runs")
+            .takes_value(true)
+        )
+        .arg(Arg::with_name("fastmode")
+            .long("fastmode")
+            .hidden(true) // this will prevent this flag from being displayed in `--help`
+            .help("Mostly debug-related option to increase default traffic rate so that you would not need to modify config post init")
+        );
+    #[cfg(feature = "eth")]
+    #[cfg(not(feature = "coconut"))]
+        let app = app
+        .arg(
+            Arg::with_name(ENABLED_CREDENTIALS_MODE_ARG_NAME)
+                .long(ENABLED_CREDENTIALS_MODE_ARG_NAME)
+                .help("Set this client to work in a disabled credentials mode that would attempt to use gateway without bandwidth credential requirement. If this value is set, --eth_endpoint and --eth_private_key don't need to be set.")
+                .conflicts_with_all(&[ETH_ENDPOINT_ARG_NAME, ETH_PRIVATE_KEY_ARG_NAME])
+        )
+        .arg(Arg::with_name(ETH_ENDPOINT_ARG_NAME)
+            .long(ETH_ENDPOINT_ARG_NAME)
+            .help("URL of an Ethereum full node that we want to use for getting bandwidth tokens from ERC20 tokens. If you don't want to set this value, use --testnet-mode instead")
+            .takes_value(true)
+            .default_value_if(ENABLED_CREDENTIALS_MODE_ARG_NAME, None, DEFAULT_ETH_ENDPOINT)
+            .required(true))
+        .arg(Arg::with_name(ETH_PRIVATE_KEY_ARG_NAME)
+            .long(ETH_PRIVATE_KEY_ARG_NAME)
+            .help("Ethereum private key used for obtaining bandwidth tokens from ERC20 tokens. If you don't want to set this value, use --testnet-mode instead")
+            .takes_value(true)
+            .default_value_if(ENABLED_CREDENTIALS_MODE_ARG_NAME, None, DEFAULT_ETH_PRIVATE_KEY)
+            .required(true)
+        );

-#[derive(Args, Clone)]
-pub(crate) struct Init {
-    /// Id of the nym-mixnet-client we want to create config for.
-    #[clap(long)]
-    id: String,
-
-    /// Id of the gateway we are going to connect to.
-    #[clap(long)]
-    gateway: Option<String>,
-
-    /// Force register gateway. WARNING: this will overwrite any existing keys for the given id,
-    /// potentially causing loss of access.
-    #[clap(long)]
-    force_register_gateway: bool,
-
-    /// Comma separated list of rest endpoints of the validators
-    #[clap(long)]
-    validators: Option<String>,
-
-    /// Whether to not start the websocket
-    #[clap(long)]
-    disable_socket: bool,
-
-    /// Port for the socket (if applicable) to listen on in all subsequent runs
-    #[clap(short, long)]
-    port: Option<u16>,
-
-    /// Mostly debug-related option to increase default traffic rate so that you would not need to
-    /// modify config post init
-    #[clap(long, hidden = true)]
-    fastmode: bool,
-
-    /// Set this client to work in a enabled credentials mode that would attempt to use gateway
-    /// with bandwidth credential requirement. If this value is set, --eth-endpoint and
-    /// --eth-private_key don't need to be set.
-    #[cfg(all(feature = "eth", not(feature = "coconut")))]
-    #[clap(long, conflicts_with_all = &["eth-endpoint", "eth-private-key"])]
-    enabled_credentials_mode: bool,
-
-    /// URL of an Ethereum full node that we want to use for getting bandwidth tokens from ERC20
-    /// tokens. If you don't want to set this value, use --enabled-credentials-mode instead
-    #[cfg(all(feature = "eth", not(feature = "coconut")))]
-    #[clap(
-        long,
-        default_value_if("enabled-credentials-mode", None, Some(DEFAULT_ETH_ENDPOINT))
-    )]
-    eth_endpoint: String,
-
-    /// Ethereum private key used for obtaining bandwidth tokens from ERC20 tokens. If you don't
-    /// want to set this value, use --enabled-credentials-mode instead")
-    #[cfg(all(feature = "eth", not(feature = "coconut")))]
-    #[clap(
-        long,
-        default_value_if("enabled-credentials-mode", None, Some(DEFAULT_ETH_PRIVATE_KEY))
-    )]
-    eth_private_key: String,
+    app
 }

-impl From<Init> for OverrideConfig {
-    fn from(init_config: Init) -> Self {
-        OverrideConfig {
-            validators: init_config.validators,
-            disable_socket: init_config.disable_socket,
-            port: init_config.port,
-            fastmode: init_config.fastmode,
-
-            #[cfg(all(feature = "eth", not(feature = "coconut")))]
-            enabled_credentials_mode: init_config.enabled_credentials_mode,
-
-            #[cfg(all(feature = "eth", not(feature = "coconut")))]
-            eth_private_key: Some(init_config.eth_private_key),
-
-            #[cfg(all(feature = "eth", not(feature = "coconut")))]
-            eth_endpoint: Some(init_config.eth_endpoint),
-        }
-    }
-}
-
-pub(crate) async fn execute(args: &Init) {
+pub async fn execute(matches: ArgMatches<'static>) {
    println!("Initialising client...");

-    let id = &args.id;
+    let id = matches.value_of("id").unwrap(); // required for now

    let already_init = Config::default_config_file_path(Some(id)).exists();
    if already_init {
@@ -107,7 +95,7 @@ pub(crate) async fn execute(args: &Init) {

    // Usually you only register with the gateway on the first init, however you can force
    // re-registering if wanted.
-    let user_wants_force_register = args.force_register_gateway;
+    let user_wants_force_register = matches.is_present("force-register-gateway");

    // If the client was already initialized, don't generate new keys and don't re-register with
    // the gateway (because this would create a new shared key).
@@ -115,11 +103,14 @@ pub(crate) async fn execute(args: &Init) {
    let register_gateway = !already_init || user_wants_force_register;

    // Attempt to use a user-provided gateway, if possible
-    let user_chosen_gateway_id = args.gateway.as_deref();
+    let user_chosen_gateway_id = matches.value_of("gateway");

    let mut config = Config::new(id);
-    let override_config_fields = OverrideConfig::from(args.clone());
-    config = override_config(config, override_config_fields);
+
+    config = override_config(config, &matches);
+    if matches.is_present("fastmode") {
+        config.get_base_mut().set_high_default_traffic_volume();
+    }

    let gateway = setup_gateway(id, register_gateway, user_chosen_gateway_id, &config).await;
    config.get_base_mut().with_gateway_endpoint(gateway);
@@ -2,9 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::client::config::{Config, SocketType};
-use clap::{Parser, Subcommand};
+use clap::ArgMatches;
 use url::Url;

+pub(crate) const ENABLED_CREDENTIALS_MODE_ARG_NAME: &str = "enabled-credentials-mode";
+#[cfg(not(feature = "coconut"))]
+pub(crate) const ETH_ENDPOINT_ARG_NAME: &str = "eth_endpoint";
+#[cfg(not(feature = "coconut"))]
+pub(crate) const ETH_PRIVATE_KEY_ARG_NAME: &str = "eth_private_key";
 #[cfg(not(feature = "coconut"))]
 pub(crate) const DEFAULT_ETH_ENDPOINT: &str =
    "https://rinkeby.infura.io/v3/00000000000000000000000000000000";
@@ -16,87 +21,6 @@ pub(crate) mod init;
 pub(crate) mod run;
 pub(crate) mod upgrade;

-fn long_version() -> String {
-    format!(
-        r#"
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-"#,
-        "Build Timestamp:",
-        env!("VERGEN_BUILD_TIMESTAMP"),
-        "Build Version:",
-        env!("VERGEN_BUILD_SEMVER"),
-        "Commit SHA:",
-        env!("VERGEN_GIT_SHA"),
-        "Commit Date:",
-        env!("VERGEN_GIT_COMMIT_TIMESTAMP"),
-        "Commit Branch:",
-        env!("VERGEN_GIT_BRANCH"),
-        "rustc Version:",
-        env!("VERGEN_RUSTC_SEMVER"),
-        "rustc Channel:",
-        env!("VERGEN_RUSTC_CHANNEL"),
-        "cargo Profile:",
-        env!("VERGEN_CARGO_PROFILE"),
-    )
-}
-
-fn long_version_static() -> &'static str {
-    Box::leak(long_version().into_boxed_str())
-}
-
-#[derive(Parser)]
-#[clap(author = "Nymtech", version, long_version = long_version_static(), about)]
-pub(crate) struct Cli {
-    /// Path pointing to an env file that configures the client.
-    #[clap(long)]
-    pub(crate) config_env_file: Option<std::path::PathBuf>,
-
-    #[clap(subcommand)]
-    command: Commands,
-}
-
-#[derive(Subcommand)]
-pub(crate) enum Commands {
-    /// Initialise a Nym client. Do this first!
-    Init(init::Init),
-    /// Run the Nym client with provided configuration client optionally overriding set parameters
-    Run(run::Run),
-    /// Try to upgrade the client
-    Upgrade(upgrade::Upgrade),
-}
-
-// Configuration that can be overridden.
-pub(crate) struct OverrideConfig {
-    validators: Option<String>,
-    disable_socket: bool,
-    port: Option<u16>,
-    fastmode: bool,
-
-    #[cfg(all(feature = "eth", not(feature = "coconut")))]
-    enabled_credentials_mode: bool,
-
-    #[cfg(all(feature = "eth", not(feature = "coconut")))]
-    eth_private_key: Option<String>,
-
-    #[cfg(all(feature = "eth", not(feature = "coconut")))]
-    eth_endpoint: Option<String>,
-}
-
-pub(crate) async fn execute(args: &Cli) {
-    match &args.command {
-        Commands::Init(m) => init::execute(m).await,
-        Commands::Run(m) => run::execute(m).await,
-        Commands::Upgrade(m) => upgrade::execute(m),
-    }
-}
-
 fn parse_validators(raw: &str) -> Vec<Url> {
    raw.split(',')
        .map(|raw_validator| {
@@ -108,64 +32,45 @@ fn parse_validators(raw: &str) -> Vec<Url> {
        .collect()
 }

-pub(crate) fn override_config(mut config: Config, args: OverrideConfig) -> Config {
-    if let Some(raw_validators) = args.validators {
+pub(crate) fn override_config(mut config: Config, matches: &ArgMatches<'_>) -> Config {
+    if let Some(raw_validators) = matches.value_of("validators") {
        config
            .get_base_mut()
-            .set_custom_validator_apis(parse_validators(&raw_validators));
-    } else if std::env::var(network_defaults::var_names::CONFIGURED).is_ok() {
-        let raw_validators = std::env::var(network_defaults::var_names::API_VALIDATOR)
-            .expect("api validator not set");
-        config
-            .get_base_mut()
-            .set_custom_validator_apis(parse_validators(&raw_validators));
+            .set_custom_validator_apis(parse_validators(raw_validators));
    }

-    if args.disable_socket {
+    if matches.is_present("disable-socket") {
        config = config.with_socket(SocketType::None);
    }

-    if let Some(port) = args.port {
-        config = config.with_port(port);
+    if let Some(port) = matches.value_of("port").map(str::parse) {
+        if let Err(err) = port {
+            // if port was overridden, it must be parsable
+            panic!("Invalid port value provided - {:?}", err);
+        }
+        config = config.with_port(port.unwrap());
    }

-    #[cfg(all(not(feature = "eth"), not(feature = "coconut")))]
-    {
+    #[cfg(not(feature = "coconut"))]
+    if let Some(eth_endpoint) = matches.value_of(ETH_ENDPOINT_ARG_NAME) {
+        config.get_base_mut().with_eth_endpoint(eth_endpoint);
+    } else if !cfg!(feature = "eth") {
        config
            .get_base_mut()
-            .with_eth_endpoint(DEFAULT_ETH_ENDPOINT.to_string());
+            .with_eth_endpoint(DEFAULT_ETH_ENDPOINT);
+    }
+    #[cfg(not(feature = "coconut"))]
+    if let Some(eth_private_key) = matches.value_of(ETH_PRIVATE_KEY_ARG_NAME) {
+        config.get_base_mut().with_eth_private_key(eth_private_key);
+    } else if !cfg!(feature = "eth") {
        config
            .get_base_mut()
-            .with_eth_private_key(DEFAULT_ETH_PRIVATE_KEY.to_string());
+            .with_eth_private_key(DEFAULT_ETH_PRIVATE_KEY);
    }

-    #[cfg(all(feature = "eth", not(feature = "coconut")))]
-    {
-        if args.enabled_credentials_mode {
-            config.get_base_mut().with_disabled_credentials(false)
-        }
-        if let Some(eth_endpoint) = args.eth_endpoint {
-            config.get_base_mut().with_eth_endpoint(eth_endpoint);
-        }
-        if let Some(eth_private_key) = args.eth_private_key {
-            config.get_base_mut().with_eth_private_key(eth_private_key);
-        }
-    }
-
-    if args.fastmode {
-        config.get_base_mut().set_high_default_traffic_volume();
+    if matches.is_present(ENABLED_CREDENTIALS_MODE_ARG_NAME) {
+        config.get_base_mut().with_disabled_credentials(false)
    }

    config
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use clap::CommandFactory;
-
-    #[test]
-    fn verify_cli() {
-        Cli::command().debug_assert();
-    }
-}
@@ -1,77 +1,68 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::{
-    client::{config::Config, NymClient},
-    commands::{override_config, OverrideConfig},
+use crate::client::config::Config;
+use crate::client::NymClient;
+use crate::commands::override_config;
+#[cfg(feature = "eth")]
+#[cfg(not(feature = "coconut"))]
+use crate::commands::{
+    ENABLED_CREDENTIALS_MODE_ARG_NAME, ETH_ENDPOINT_ARG_NAME, ETH_PRIVATE_KEY_ARG_NAME,
 };
-
-use clap::Args;
+use clap::{App, Arg, ArgMatches};
 use config::NymConfig;
 use log::*;
 use version_checker::is_minor_version_compatible;

-#[derive(Args, Clone)]
-pub(crate) struct Run {
-    /// Id of the nym-mixnet-client we want to run.
-    #[clap(long)]
-    id: String,
+pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
+    let app = App::new("run")
+        .about("Run the Nym client with provided configuration client optionally overriding set parameters")
+        .arg(Arg::with_name("id")
+            .long("id")
+            .help("Id of the nym-mixnet-client we want to run.")
+            .takes_value(true)
+            .required(true)
+        )
+        // the rest of arguments are optional, they are used to override settings in config file
+        .arg(Arg::with_name("validators")
+                .long("validators")
+                .help("Comma separated list rest rest endpoints of the validators")
+                .takes_value(true),
+        )
+        .arg(Arg::with_name("gateway")
+            .long("gateway")
+            .help("Id of the gateway we want to connect to. If overridden, it is user's responsibility to ensure prior registration happened")
+            .takes_value(true)
+        )
+        .arg(Arg::with_name("disable-socket")
+            .long("disable-socket")
+            .help("Whether to not start the websocket")
+        )
+        .arg(Arg::with_name("port")
+            .short("p")
+            .long("port")
+            .help("Port for the socket (if applicable) to listen on")
+            .takes_value(true)
+        );
+    #[cfg(feature = "eth")]
+    #[cfg(not(feature = "coconut"))]
+        let app = app
+        .arg(
+            Arg::with_name(ENABLED_CREDENTIALS_MODE_ARG_NAME)
+                .long(ENABLED_CREDENTIALS_MODE_ARG_NAME)
+                .help("Set this client to work in a enabled credentials mode that would attempt to use gateway with bandwidth credential requirement. If this value is set, --eth_endpoint and --eth_private_key don't need to be set.")
+                .conflicts_with_all(&[ETH_ENDPOINT_ARG_NAME, ETH_PRIVATE_KEY_ARG_NAME])
+        )
+        .arg(Arg::with_name(ETH_ENDPOINT_ARG_NAME)
+            .long(ETH_ENDPOINT_ARG_NAME)
+            .help("URL of an Ethereum full node that we want to use for getting bandwidth tokens from ERC20 tokens. If you don't want to set this value, use --testnet-mode instead")
+            .takes_value(true))
+        .arg(Arg::with_name(ETH_PRIVATE_KEY_ARG_NAME)
+            .long(ETH_PRIVATE_KEY_ARG_NAME)
+            .help("Ethereum private key used for obtaining bandwidth tokens from ERC20 tokens. If you don't want to set this value, use --testnet-mode instead")
+            .takes_value(true));

-    /// Comma separated list of rest endpoints of the validators
-    #[clap(long)]
-    validators: Option<String>,
-
-    /// Id of the gateway we want to connect to. If overridden, it is user's responsibility to
-    /// ensure prior registration happened
-    #[clap(long)]
-    gateway: Option<String>,
-
-    /// Whether to not start the websocket
-    #[clap(long)]
-    disable_socket: bool,
-
-    /// Port for the socket to listen on
-    #[clap(short, long)]
-    port: Option<u16>,
-
-    /// Set this client to work in a enabled credentials mode that would attempt to use gateway
-    /// with bandwidth credential requirement. If this value is set, --eth-endpoint and
-    /// --eth-private-key don't need to be set.
-    #[cfg(all(feature = "eth", not(feature = "coconut")))]
-    #[clap(long, conflicts_with_all = &["eth-endpoint", "eth-private-key"])]
-    enabled_credentials_mode: bool,
-
-    /// URL of an Ethereum full node that we want to use for getting bandwidth tokens from ERC20
-    /// tokens. If you don't want to set this value, use --enabled-credentials-mode instead
-    #[cfg(all(feature = "eth", not(feature = "coconut")))]
-    #[clap(long)]
-    eth_endpoint: Option<String>,
-
-    /// Ethereum private key used for obtaining bandwidth tokens from ERC20 tokens. If you don't
-    /// want to set this value, use --enabled-credentials-mode instead")
-    #[cfg(all(feature = "eth", not(feature = "coconut")))]
-    #[clap(long)]
-    eth_private_key: Option<String>,
-}
-
-impl From<Run> for OverrideConfig {
-    fn from(run_config: Run) -> Self {
-        OverrideConfig {
-            validators: run_config.validators,
-            disable_socket: run_config.disable_socket,
-            port: run_config.port,
-            fastmode: false,
-
-            #[cfg(all(feature = "eth", not(feature = "coconut")))]
-            enabled_credentials_mode: run_config.enabled_credentials_mode,
-
-            #[cfg(all(feature = "eth", not(feature = "coconut")))]
-            eth_private_key: run_config.eth_private_key,
-
-            #[cfg(all(feature = "eth", not(feature = "coconut")))]
-            eth_endpoint: run_config.eth_endpoint,
-        }
-    }
+    app
 }

 // this only checks compatibility between config the binary. It does not take into consideration
@@ -93,8 +84,8 @@ fn version_check(cfg: &Config) -> bool {
    }
 }

-pub(crate) async fn execute(args: &Run) {
-    let id = &args.id;
+pub async fn execute(matches: ArgMatches<'static>) {
+    let id = matches.value_of("id").unwrap();

    let mut config = match Config::load_from_file(Some(id)) {
        Ok(cfg) => cfg,
@@ -104,8 +95,7 @@ pub(crate) async fn execute(args: &Run) {
        }
    };

-    let override_config_fields = OverrideConfig::from(args.clone());
-    config = override_config(config, override_config_fields);
+    config = override_config(config, &matches);

    if !version_check(&config) {
        error!("failed the local version check");
@@ -2,13 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::client::config::{Config, MISSING_VALUE};
-
+use clap::{App, Arg, ArgMatches};
+use config::defaults::default_api_endpoints;
 use config::NymConfig;
-use version_checker::Version;
-
-use clap::Args;
 use std::fmt::Display;
 use std::process;
+use version_checker::Version;

 #[allow(dead_code)]
 fn fail_upgrade<D1: Display, D2: Display>(from_version: D1, to_version: D2) -> ! {
@@ -50,11 +49,14 @@ fn unsupported_upgrade(current_version: &Version, config_version: &Version) -> !
    process::exit(1)
 }

-#[derive(Args, Clone)]
-pub(crate) struct Upgrade {
-    /// Id of the nym-client we want to upgrade
-    #[clap(long)]
-    id: String,
+pub fn command_args<'a, 'b>() -> App<'a, 'b> {
+    App::new("upgrade").about("Try to upgrade the client").arg(
+        Arg::with_name("id")
+            .long("id")
+            .help("Id of the nym-client we want to upgrade")
+            .takes_value(true)
+            .required(true),
+    )
 }

 fn parse_config_version(config: &Config) -> Version {
@@ -93,7 +95,7 @@ fn parse_package_version() -> Version {

 fn minor_0_12_upgrade(
    mut config: Config,
-    _matches: &Upgrade,
+    _matches: &ArgMatches<'_>,
    config_version: &Version,
    package_version: &Version,
 ) -> Config {
@@ -105,6 +107,15 @@ fn minor_0_12_upgrade(

    print_start_upgrade(&config_version, &to_version);

+    println!(
+        "Setting validator API endpoints to {:?}",
+        default_api_endpoints()
+    );
+
+    config
+        .get_base_mut()
+        .set_custom_validator_apis(default_api_endpoints());
+
    config
        .get_base_mut()
        .set_custom_version(to_version.to_string().as_ref());
@@ -120,7 +131,7 @@ fn minor_0_12_upgrade(
    config
 }

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

@@ -132,7 +143,7 @@ fn do_upgrade(mut config: Config, args: &Upgrade, package_version: &Version) {
        config = match config_version.major {
            0 => match config_version.minor {
                9 | 10 => outdated_upgrade(&config_version, package_version),
-                11 => minor_0_12_upgrade(config, args, &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),
@@ -140,10 +151,10 @@ fn do_upgrade(mut config: Config, args: &Upgrade, package_version: &Version) {
    }
 }

-pub(crate) fn execute(args: &Upgrade) {
+pub fn execute(matches: &ArgMatches<'_>) {
    let package_version = parse_package_version();

-    let id = &args.id;
+    let id = matches.value_of("id").unwrap();

    let existing_config = Config::load_from_file(Some(id)).unwrap_or_else(|err| {
        eprintln!("failed to load existing config file! - {:?}", err);
@@ -156,5 +167,5 @@ pub(crate) fn execute(args: &Upgrade) {
    }

    // here be upgrade path to 0.9.X and beyond based on version number from config
-    do_upgrade(existing_config, args, &package_version)
+    do_upgrade(existing_config, matches, &package_version)
 }
@@ -1,8 +1,8 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

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

 pub mod client;
 pub mod commands;
@@ -10,12 +10,34 @@ pub mod websocket;

 #[tokio::main]
 async fn main() {
+    dotenv::dotenv().ok();
    setup_logging();
    println!("{}", banner());

-    let args = commands::Cli::parse();
-    setup_env(args.config_env_file.clone());
-    commands::execute(&args).await;
+    let arg_matches = App::new("Nym Client")
+        .version(crate_version!())
+        .long_version(&*long_version())
+        .author("Nymtech")
+        .about("Implementation of the Nym Client")
+        .subcommand(commands::init::command_args())
+        .subcommand(commands::run::command_args())
+        .subcommand(commands::upgrade::command_args())
+        .get_matches();
+
+    execute(arg_matches).await;
+}
+
+async fn execute(matches: ArgMatches<'static>) {
+    match matches.subcommand() {
+        ("init", Some(m)) => commands::init::execute(m.clone()).await,
+        ("run", Some(m)) => commands::run::execute(m.clone()).await,
+        ("upgrade", Some(m)) => commands::upgrade::execute(m),
+        _ => println!("{}", usage()),
+    }
+}
+
+fn usage() -> &'static str {
+    "usage: --help to see available options.\n\n"
 }

 fn banner() -> String {
@@ -35,6 +57,40 @@ fn banner() -> String {
    )
 }

+fn long_version() -> String {
+    format!(
+        r#"
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+"#,
+        "Build Timestamp:",
+        env!("VERGEN_BUILD_TIMESTAMP"),
+        "Build Version:",
+        env!("VERGEN_BUILD_SEMVER"),
+        "Commit SHA:",
+        env!("VERGEN_GIT_SHA"),
+        "Commit Date:",
+        env!("VERGEN_GIT_COMMIT_TIMESTAMP"),
+        "Commit Branch:",
+        env!("VERGEN_GIT_BRANCH"),
+        "rustc Version:",
+        env!("VERGEN_RUSTC_SEMVER"),
+        "rustc Channel:",
+        env!("VERGEN_RUSTC_CHANNEL"),
+        "cargo Profile:",
+        env!("VERGEN_CARGO_PROFILE"),
+        "Network:",
+        DEFAULT_NETWORK
+    )
+}
+
 fn setup_logging() {
    let mut log_builder = pretty_env_logger::formatted_timed_builder();
    if let Ok(s) = ::std::env::var("RUST_LOG") {
@@ -2,7 +2,6 @@
 name = "nym-socks5-client"
 version = "1.0.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
-description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
 edition = "2021"
 rust-version = "1.56"

@@ -11,8 +10,9 @@ name = "nym_socks5"
 path = "src/lib.rs"

 [dependencies]
-clap = { version = "3.2.8", features = ["cargo", "derive"] }
+clap = "2.33.0"
 dirs = "4.0"
+dotenv = "0.15.0"
 futures = "0.3"
 log = "0.4"
 pin-project = "1.0"
@@ -287,15 +287,12 @@ impl NymClient {
    pub async fn run_and_listen(&mut self, mut receiver: Socks5ControlMessageReceiver) {
        self.start().await;
        tokio::select! {
-            message = receiver.next() => {
-                log::debug!("Received message: {:?}", message);
-                match message {
-                    Some(Socks5ControlMessage::Stop) => {
-                        log::info!("Shutting down");
-                        log::info!("Graceful shutdown of tasks not yet implemented, you might see (harmless) panics until then");
-                    }
-                    None => log::debug!("None"),
+            message = receiver.next() =>  match message {
+                Some(Socks5ControlMessage::Stop) => {
+                    log::info!("Received: {:?}", message);
+                    log::info!("Shutting down");
                }
+                None => log::info!("none"),
            }
        }
    }
@@ -1,100 +1,91 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use clap::Args;
+use clap::{App, Arg, ArgMatches};
 use client_core::config::GatewayEndpoint;
 use config::NymConfig;

-use crate::{
-    client::config::Config,
-    commands::{override_config, OverrideConfig},
+use crate::client::config::Config;
+use crate::commands::override_config;
+#[cfg(feature = "eth")]
+#[cfg(not(feature = "coconut"))]
+use crate::commands::{
+    DEFAULT_ETH_ENDPOINT, DEFAULT_ETH_PRIVATE_KEY, ENABLED_CREDENTIALS_MODE_ARG_NAME,
+    ETH_ENDPOINT_ARG_NAME, ETH_PRIVATE_KEY_ARG_NAME,
 };

-#[cfg(all(feature = "eth", not(feature = "coconut")))]
-use crate::commands::{DEFAULT_ETH_ENDPOINT, DEFAULT_ETH_PRIVATE_KEY};
+pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
+    let app = App::new("init")
+        .about("Initialise a Nym client. Do this first!")
+        .arg(Arg::with_name("id")
+            .long("id")
+            .help("Id of the nym-mixnet-client we want to create config for.")
+            .takes_value(true)
+            .required(true)
+        )
+        .arg(Arg::with_name("provider")
+            .long("provider")
+            .help("Address of the socks5 provider to send messages to.")
+            .takes_value(true)
+            .required(true)
+        )
+        .arg(Arg::with_name("gateway")
+            .long("gateway")
+            .help("Id of the gateway we are going to connect to.")
+            .takes_value(true)
+        )
+        .arg(Arg::with_name("force-register-gateway")
+            .long("force-register-gateway")
+            .help("Force register gateway. WARNING: this will overwrite any existing keys for the given id, potentially causing loss of access.")
+            .takes_value(false)
+        )
+        .arg(Arg::with_name("validators")
+                 .long("validators")
+                 .help("Comma separated list of rest endpoints of the validators")
+                 .takes_value(true),
+        )
+        .arg(Arg::with_name("port")
+            .short("p")
+            .long("port")
+            .help("Port for the socket to listen on in all subsequent runs")
+            .takes_value(true)
+        )
+        .arg(Arg::with_name("fastmode")
+            .long("fastmode")
+            .hidden(true) // this will prevent this flag from being displayed in `--help`
+            .help("Mostly debug-related option to increase default traffic rate so that you would not need to modify config post init")
+        );
+    #[cfg(feature = "eth")]
+    #[cfg(not(feature = "coconut"))]
+        let app = app
+        .arg(
+            Arg::with_name(ENABLED_CREDENTIALS_MODE_ARG_NAME)
+                .long(ENABLED_CREDENTIALS_MODE_ARG_NAME)
+                .help("Set this client to work in a enabled credentials mode that would attempt to use gateway with bandwidth credential requirement. If this value is set, --eth_endpoint and --eth_private_key don't need to be set.")
+                .conflicts_with_all(&[ETH_ENDPOINT_ARG_NAME, ETH_PRIVATE_KEY_ARG_NAME])
+        )
+        .arg(Arg::with_name(ETH_ENDPOINT_ARG_NAME)
+            .long(ETH_ENDPOINT_ARG_NAME)
+            .help("URL of an Ethereum full node that we want to use for getting bandwidth tokens from ERC20 tokens. If you don't want to set this value, use --testnet-mode instead")
+            .takes_value(true)
+            .default_value_if(ENABLED_CREDENTIALS_MODE_ARG_NAME, None, DEFAULT_ETH_ENDPOINT)
+            .required(true))
+        .arg(Arg::with_name(ETH_PRIVATE_KEY_ARG_NAME)
+            .long(ETH_PRIVATE_KEY_ARG_NAME)
+            .help("Ethereum private key used for obtaining bandwidth tokens from ERC20 tokens. If you don't want to set this value, use --testnet-mode instead")
+            .takes_value(true)
+            .default_value_if(ENABLED_CREDENTIALS_MODE_ARG_NAME, None, DEFAULT_ETH_PRIVATE_KEY)
+            .required(true)
+        );

-#[derive(Args, Clone)]
-pub(crate) struct Init {
-    /// Id of the nym-mixnet-client we want to create config for.
-    #[clap(long)]
-    id: String,
-
-    /// Address of the socks5 provider to send messages to.
-    #[clap(long)]
-    provider: String,
-
-    /// Id of the gateway we are going to connect to.
-    #[clap(long)]
-    gateway: Option<String>,
-
-    /// Force register gateway. WARNING: this will overwrite any existing keys for the given id,
-    /// potentially causing loss of access.
-    #[clap(long)]
-    force_register_gateway: bool,
-
-    /// Comma separated list of rest endpoints of the validators
-    #[clap(long)]
-    validators: Option<String>,
-
-    /// Port for the socket to listen on in all subsequent runs
-    #[clap(short, long)]
-    port: Option<u16>,
-
-    /// Mostly debug-related option to increase default traffic rate so that you would not need to
-    /// modify config post init
-    #[clap(long, hidden = true)]
-    fastmode: bool,
-
-    /// Set this client to work in a enabled credentials mode that would attempt to use gateway
-    /// with bandwidth credential requirement. If this value is set, --eth-endpoint and
-    /// --eth-private_key don't need to be set.
-    #[cfg(all(feature = "eth", not(feature = "coconut")))]
-    #[clap(long, conflicts_with_all = &["eth-endpoint", "eth-private-key"])]
-    enabled_credentials_mode: bool,
-
-    /// URL of an Ethereum full node that we want to use for getting bandwidth tokens from ERC20
-    /// tokens. If you don't want to set this value, use --enabled-credentials-mode instead
-    #[cfg(all(feature = "eth", not(feature = "coconut")))]
-    #[clap(
-        long,
-        default_value_if("enabled-credentials-mode", None, Some(DEFAULT_ETH_ENDPOINT))
-    )]
-    eth_endpoint: String,
-
-    /// Ethereum private key used for obtaining bandwidth tokens from ERC20 tokens. If you don't
-    /// want to set this value, use --enabled-credentials-mode instead")
-    #[cfg(all(feature = "eth", not(feature = "coconut")))]
-    #[clap(
-        long,
-        default_value_if("enabled-credentials-mode", None, Some(DEFAULT_ETH_PRIVATE_KEY))
-    )]
-    eth_private_key: String,
+    app
 }

-impl From<Init> for OverrideConfig {
-    fn from(init_config: Init) -> Self {
-        OverrideConfig {
-            validators: init_config.validators,
-            port: init_config.port,
-            fastmode: init_config.fastmode,
-
-            #[cfg(all(feature = "eth", not(feature = "coconut")))]
-            enabled_credentials_mode: init_config.enabled_credentials_mode,
-
-            #[cfg(all(feature = "eth", not(feature = "coconut")))]
-            eth_private_key: Some(init_config.eth_private_key),
-
-            #[cfg(all(feature = "eth", not(feature = "coconut")))]
-            eth_endpoint: Some(init_config.eth_endpoint),
-        }
-    }
-}
-
-pub(crate) async fn execute(args: &Init) {
+pub async fn execute(matches: ArgMatches<'static>) {
    println!("Initialising client...");

-    let id = &args.id;
-    let provider_address = &args.provider;
+    let id = matches.value_of("id").unwrap(); // required for now
+    let provider_address = matches.value_of("provider").unwrap();

    let already_init = Config::default_config_file_path(Some(id)).exists();
    if already_init {
@@ -107,7 +98,7 @@ pub(crate) async fn execute(args: &Init) {

    // Usually you only register with the gateway on the first init, however you can force
    // re-registering if wanted.
-    let user_wants_force_register = args.force_register_gateway;
+    let user_wants_force_register = matches.is_present("force-register-gateway");

    // If the client was already initialized, don't generate new keys and don't re-register with
    // the gateway (because this would create a new shared key).
@@ -115,11 +106,14 @@ pub(crate) async fn execute(args: &Init) {
    let register_gateway = !already_init || user_wants_force_register;

    // Attempt to use a user-provided gateway, if possible
-    let user_chosen_gateway_id = args.gateway.as_deref();
+    let user_chosen_gateway_id = matches.value_of("gateway");

    let mut config = Config::new(id, provider_address);
-    let override_config_fields = OverrideConfig::from(args.clone());
-    config = override_config(config, override_config_fields);
+
+    config = override_config(config, &matches);
+    if matches.is_present("fastmode") {
+        config.get_base_mut().set_high_default_traffic_volume();
+    }

    let gateway = setup_gateway(id, register_gateway, user_chosen_gateway_id, &config).await;
    config.get_base_mut().with_gateway_endpoint(gateway);
@@ -2,13 +2,18 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::client::config::Config;
-use clap::{Parser, Subcommand};
+use clap::ArgMatches;
 use url::Url;

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

+pub(crate) const ENABLED_CREDENTIALS_MODE_ARG_NAME: &str = "enabled-credentials-mode";
+#[cfg(not(feature = "coconut"))]
+pub(crate) const ETH_ENDPOINT_ARG_NAME: &str = "eth_endpoint";
+#[cfg(not(feature = "coconut"))]
+pub(crate) const ETH_PRIVATE_KEY_ARG_NAME: &str = "eth_private_key";
 #[cfg(not(feature = "coconut"))]
 pub(crate) const DEFAULT_ETH_ENDPOINT: &str =
    "https://rinkeby.infura.io/v3/00000000000000000000000000000000";
@@ -16,87 +21,7 @@ pub(crate) const DEFAULT_ETH_ENDPOINT: &str =
 pub(crate) const DEFAULT_ETH_PRIVATE_KEY: &str =
    "0000000000000000000000000000000000000000000000000000000000000001";

-fn long_version() -> String {
-    format!(
-        r#"
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-"#,
-        "Build Timestamp:",
-        env!("VERGEN_BUILD_TIMESTAMP"),
-        "Build Version:",
-        env!("VERGEN_BUILD_SEMVER"),
-        "Commit SHA:",
-        env!("VERGEN_GIT_SHA"),
-        "Commit Date:",
-        env!("VERGEN_GIT_COMMIT_TIMESTAMP"),
-        "Commit Branch:",
-        env!("VERGEN_GIT_BRANCH"),
-        "rustc Version:",
-        env!("VERGEN_RUSTC_SEMVER"),
-        "rustc Channel:",
-        env!("VERGEN_RUSTC_CHANNEL"),
-        "cargo Profile:",
-        env!("VERGEN_CARGO_PROFILE"),
-    )
-}
-
-fn long_version_static() -> &'static str {
-    Box::leak(long_version().into_boxed_str())
-}
-
-#[derive(Parser)]
-#[clap(author = "Nymtech", version, long_version = long_version_static(), about)]
-pub(crate) struct Cli {
-    /// Path pointing to an env file that configures the client.
-    #[clap(long)]
-    pub(crate) config_env_file: Option<std::path::PathBuf>,
-
-    #[clap(subcommand)]
-    command: Commands,
-}
-
-#[derive(Subcommand)]
-pub(crate) enum Commands {
-    /// Initialise a Nym client. Do this first!
-    Init(init::Init),
-    /// Run the Nym client with provided configuration client optionally overriding set parameters
-    Run(run::Run),
-    /// Try to upgrade the client
-    Upgrade(upgrade::Upgrade),
-}
-
-// Configuration that can be overridden.
-pub(crate) struct OverrideConfig {
-    validators: Option<String>,
-    port: Option<u16>,
-    fastmode: bool,
-
-    #[cfg(all(feature = "eth", not(feature = "coconut")))]
-    enabled_credentials_mode: bool,
-
-    #[cfg(all(feature = "eth", not(feature = "coconut")))]
-    eth_private_key: Option<String>,
-
-    #[cfg(all(feature = "eth", not(feature = "coconut")))]
-    eth_endpoint: Option<String>,
-}
-
-pub(crate) async fn execute(args: &Cli) {
-    match &args.command {
-        Commands::Init(m) => init::execute(m).await,
-        Commands::Run(m) => run::execute(m).await,
-        Commands::Upgrade(m) => upgrade::execute(m),
-    }
-}
-
-pub fn parse_validators(raw: &str) -> Vec<Url> {
+fn parse_validators(raw: &str) -> Vec<Url> {
    raw.split(',')
        .map(|raw_validator| {
            raw_validator
@@ -107,58 +32,41 @@ pub fn parse_validators(raw: &str) -> Vec<Url> {
        .collect()
 }

-pub(crate) fn override_config(mut config: Config, args: OverrideConfig) -> Config {
-    if let Some(raw_validators) = args.validators {
+pub(crate) fn override_config(mut config: Config, matches: &ArgMatches<'_>) -> Config {
+    if let Some(raw_validators) = matches.value_of("validators") {
        config
            .get_base_mut()
-            .set_custom_validator_apis(parse_validators(&raw_validators));
-    } else if let Ok(raw_validators) = std::env::var(network_defaults::var_names::API_VALIDATOR) {
-        config
-            .get_base_mut()
-            .set_custom_validator_apis(parse_validators(&raw_validators));
+            .set_custom_validator_apis(parse_validators(raw_validators));
    }

-    if let Some(port) = args.port {
-        config = config.with_port(port);
-    }
-
-    #[cfg(all(not(feature = "eth"), not(feature = "coconut")))]
-    {
-        config
-            .get_base_mut()
-            .with_eth_endpoint(DEFAULT_ETH_ENDPOINT.to_string());
-        config
-            .get_base_mut()
-            .with_eth_private_key(DEFAULT_ETH_PRIVATE_KEY.to_string());
-    }
-
-    #[cfg(all(feature = "eth", not(feature = "coconut")))]
-    {
-        if args.enabled_credentials_mode {
-            config.get_base_mut().with_disabled_credentials(false)
-        }
-        if let Some(eth_endpoint) = args.eth_endpoint {
-            config.get_base_mut().with_eth_endpoint(eth_endpoint);
-        }
-        if let Some(eth_private_key) = args.eth_private_key {
-            config.get_base_mut().with_eth_private_key(eth_private_key);
+    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);
        }
+        config = config.with_port(port.unwrap());
    }

-    if args.fastmode {
-        config.get_base_mut().set_high_default_traffic_volume();
+    #[cfg(not(feature = "coconut"))]
+    if let Some(eth_endpoint) = matches.value_of(ETH_ENDPOINT_ARG_NAME) {
+        config.get_base_mut().with_eth_endpoint(eth_endpoint);
+    } else if !cfg!(feature = "eth") {
+        config
+            .get_base_mut()
+            .with_eth_endpoint(DEFAULT_ETH_ENDPOINT);
+    }
+    #[cfg(not(feature = "coconut"))]
+    if let Some(eth_private_key) = matches.value_of(ETH_PRIVATE_KEY_ARG_NAME) {
+        config.get_base_mut().with_eth_private_key(eth_private_key);
+    } else if !cfg!(feature = "eth") {
+        config
+            .get_base_mut()
+            .with_eth_private_key(DEFAULT_ETH_PRIVATE_KEY);
+    }
+
+    if matches.is_present(ENABLED_CREDENTIALS_MODE_ARG_NAME) {
+        config.get_base_mut().with_disabled_credentials(false)
    }

    config
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use clap::CommandFactory;
-
-    #[test]
-    fn verify_cli() {
-        Cli::command().debug_assert();
-    }
-}
@@ -1,80 +1,74 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::{
-    client::{config::Config, NymClient},
-    commands::{override_config, OverrideConfig},
+use crate::client::config::Config;
+use crate::client::NymClient;
+use crate::commands::override_config;
+#[cfg(feature = "eth")]
+#[cfg(not(feature = "coconut"))]
+use crate::commands::{
+    ENABLED_CREDENTIALS_MODE_ARG_NAME, ETH_ENDPOINT_ARG_NAME, ETH_PRIVATE_KEY_ARG_NAME,
 };
-
-use clap::Args;
+use clap::{App, Arg, ArgMatches};
 use config::NymConfig;
 use log::*;
 use version_checker::is_minor_version_compatible;

-#[derive(Args, Clone)]
-pub(crate) struct Run {
-    /// Id of the nym-mixnet-client we want to run.
-    #[clap(long)]
-    id: String,
+pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
+    let app = App::new("run")
+        .about("Run the Nym client with provided configuration client optionally overriding set parameters")
+        .arg(Arg::with_name("id")
+            .long("id")
+            .help("Id of the nym-mixnet-client we want to run.")
+            .takes_value(true)
+            .required(true)
+        )
+        // the rest of arguments are optional, they are used to override settings in config file
+        .arg(Arg::with_name("config")
+            .long("config")
+            .help("Custom path to the nym-mixnet-client configuration file")
+            .takes_value(true)
+        )
+        .arg(Arg::with_name("provider")
+            .long("provider")
+            .help("Address of the socks5 provider to send messages to.")
+            .takes_value(true)
+        )
+        .arg(Arg::with_name("gateway")
+            .long("gateway")
+            .help("Id of the gateway we want to connect to. If overridden, it is user's responsibility to ensure prior registration happened")
+            .takes_value(true)
+        )
+        .arg(Arg::with_name("validators")
+                .long("validators")
+                .help("Comma separated list of rest endpoints of the validators")
+                .takes_value(true),
+        )
+        .arg(Arg::with_name("port")
+            .short("p")
+            .long("port")
+            .help("Port for the socket to listen on")
+            .takes_value(true)
+        );
+    #[cfg(feature = "eth")]
+    #[cfg(not(feature = "coconut"))]
+    let app = app
+        .arg(
+            Arg::with_name(ENABLED_CREDENTIALS_MODE_ARG_NAME)
+                .long(ENABLED_CREDENTIALS_MODE_ARG_NAME)
+                .help("Set this client to work in a disabled credentials mode that would attempt to use gateway without bandwidth credential requirement. If this value is set, --eth_endpoint and --eth_private_key don't need to be set.")
+                .conflicts_with_all(&[ETH_ENDPOINT_ARG_NAME, ETH_PRIVATE_KEY_ARG_NAME])
+        )
+        .arg(Arg::with_name(ETH_ENDPOINT_ARG_NAME)
+            .long(ETH_ENDPOINT_ARG_NAME)
+            .help("URL of an Ethereum full node that we want to use for getting bandwidth tokens from ERC20 tokens. If you don't want to set this value, use --testnet-mode instead")
+            .takes_value(true))
+        .arg(Arg::with_name(ETH_PRIVATE_KEY_ARG_NAME)
+            .long(ETH_PRIVATE_KEY_ARG_NAME)
+            .help("Ethereum private key used for obtaining bandwidth tokens from ERC20 tokens. If you don't want to set this value, use --testnet-mode instead")
+            .takes_value(true));

-    /// Custom path to the nym-mixnet-client configuration file
-    #[clap(long)]
-    config: Option<String>,
-
-    /// Address of the socks5 provider to send messages to.
-    #[clap(long)]
-    provider: Option<String>,
-
-    /// Id of the gateway we want to connect to. If overridden, it is user's responsibility to
-    /// ensure prior registration happened
-    #[clap(long)]
-    gateway: Option<String>,
-
-    /// Comma separated list of rest endpoints of the validators
-    #[clap(long)]
-    validators: Option<String>,
-
-    /// Port for the socket to listen on
-    #[clap(short, long)]
-    port: Option<u16>,
-
-    /// Set this client to work in a enabled credentials mode that would attempt to use gateway
-    /// with bandwidth credential requirement. If this value is set, --eth-endpoint and
-    /// --eth-private-key don't need to be set.
-    #[cfg(all(feature = "eth", not(feature = "coconut")))]
-    #[clap(long, conflicts_with_all = &["eth-endpoint", "eth-private-key"])]
-    enabled_credentials_mode: bool,
-
-    /// URL of an Ethereum full node that we want to use for getting bandwidth tokens from ERC20
-    /// tokens. If you don't want to set this value, use --enabled-credentials-mode instead
-    #[cfg(all(feature = "eth", not(feature = "coconut")))]
-    #[clap(long)]
-    eth_endpoint: Option<String>,
-
-    /// Ethereum private key used for obtaining bandwidth tokens from ERC20 tokens. If you don't
-    /// want to set this value, use --enabled-credentials-mode instead
-    #[cfg(all(feature = "eth", not(feature = "coconut")))]
-    #[clap(long)]
-    eth_private_key: Option<String>,
-}
-
-impl From<Run> for OverrideConfig {
-    fn from(run_config: Run) -> Self {
-        OverrideConfig {
-            validators: run_config.validators,
-            port: run_config.port,
-            fastmode: false,
-
-            #[cfg(all(feature = "eth", not(feature = "coconut")))]
-            enabled_credentials_mode: run_config.enabled_credentials_mode,
-
-            #[cfg(all(feature = "eth", not(feature = "coconut")))]
-            eth_private_key: run_config.eth_private_key,
-
-            #[cfg(all(feature = "eth", not(feature = "coconut")))]
-            eth_endpoint: run_config.eth_endpoint,
-        }
-    }
+    app
 }

 // this only checks compatibility between config the binary. It does not take into consideration
@@ -82,13 +76,8 @@ impl From<Run> for OverrideConfig {
 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 {
-        warn!(
-            "The mixnode binary has different version than what is specified in config file! {} and {}",
-            binary_version, config_version
-        );
+    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");
            true
@@ -96,11 +85,13 @@ fn version_check(cfg: &Config) -> bool {
            error!("and they are semver incompatible! - please run the `upgrade` command before attempting `run` again");
            false
        }
+    } else {
+        true
    }
 }

-pub(crate) async fn execute(args: &Run) {
-    let id = &args.id;
+pub async fn execute(matches: ArgMatches<'static>) {
+    let id = matches.value_of("id").unwrap();

    let mut config = match Config::load_from_file(Some(id)) {
        Ok(cfg) => cfg,
@@ -110,8 +101,7 @@ pub(crate) async fn execute(args: &Run) {
        }
    };

-    let override_config_fields = OverrideConfig::from(args.clone());
-    config = override_config(config, override_config_fields);
+    config = override_config(config, &matches);

    if !version_check(&config) {
        error!("failed the local version check");
@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::client::config::{Config, MISSING_VALUE};
-
+use clap::{App, Arg, ArgMatches};
+use config::defaults::default_api_endpoints;
 use config::NymConfig;
+use std::fmt::Display;
+use std::process;
 use version_checker::Version;

-use clap::Args;
-use std::{fmt::Display, process};
-
 #[allow(dead_code)]
 fn fail_upgrade<D1: Display, D2: Display>(from_version: D1, to_version: D2) -> ! {
    print_failed_upgrade(from_version, to_version);
@@ -49,11 +49,14 @@ fn unsupported_upgrade(current_version: &Version, config_version: &Version) -> !
    process::exit(1)
 }

-#[derive(Args, Clone)]
-pub(crate) struct Upgrade {
-    /// Id of the nym-client we want to upgrade
-    #[clap(long)]
-    id: String,
+pub fn command_args<'a, 'b>() -> App<'a, 'b> {
+    App::new("upgrade").about("Try to upgrade the client").arg(
+        Arg::with_name("id")
+            .long("id")
+            .help("Id of the nym-client we want to upgrade")
+            .takes_value(true)
+            .required(true),
+    )
 }

 fn parse_config_version(config: &Config) -> Version {
@@ -92,7 +95,7 @@ fn parse_package_version() -> Version {

 fn minor_0_12_upgrade(
    mut config: Config,
-    _args: &Upgrade,
+    _matches: &ArgMatches<'_>,
    config_version: &Version,
    package_version: &Version,
 ) -> Config {
@@ -104,6 +107,15 @@ fn minor_0_12_upgrade(

    print_start_upgrade(&config_version, &to_version);

+    println!(
+        "Setting validator API endpoints to {:?}",
+        default_api_endpoints()
+    );
+
+    config
+        .get_base_mut()
+        .set_custom_validator_apis(default_api_endpoints());
+
    config
        .get_base_mut()
        .set_custom_version(to_version.to_string().as_ref());
@@ -119,30 +131,30 @@ fn minor_0_12_upgrade(
    config
 }

-fn do_upgrade(mut config: Config, args: &Upgrade, 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, args, &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),
        }
    }
 }

-pub(crate) fn execute(args: &Upgrade) {
+pub fn execute(matches: &ArgMatches<'_>) {
    let package_version = parse_package_version();

-    let id = &args.id;
+    let id = matches.value_of("id").unwrap();

    let existing_config = Config::load_from_file(Some(id)).unwrap_or_else(|err| {
        eprintln!("failed to load existing config file! - {:?}", err);
@@ -155,5 +167,5 @@ pub(crate) fn execute(args: &Upgrade) {
    }

    // here be upgrade path to 0.9.X and beyond based on version number from config
-    do_upgrade(existing_config, args, &package_version)
+    do_upgrade(existing_config, matches, package_version)
 }
@@ -1,8 +1,8 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

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

 pub mod client;
 mod commands;
@@ -10,12 +10,34 @@ pub mod socks;

 #[tokio::main]
 async fn main() {
+    dotenv::dotenv().ok();
    setup_logging();
    println!("{}", banner());

-    let args = commands::Cli::parse();
-    setup_env(args.config_env_file.clone());
-    commands::execute(&args).await;
+    let arg_matches = App::new("Nym Socks5 Proxy")
+        .version(env!("CARGO_PKG_VERSION"))
+        .author("Nymtech")
+        .long_version(&*long_version())
+        .about("A Socks5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address")
+        .subcommand(commands::init::command_args())
+        .subcommand(commands::run::command_args())
+        .subcommand(commands::upgrade::command_args())
+        .get_matches();
+
+    execute(arg_matches).await;
+}
+
+async fn execute(matches: ArgMatches<'static>) {
+    match matches.subcommand() {
+        ("init", Some(m)) => commands::init::execute(m.clone()).await,
+        ("run", Some(m)) => commands::run::execute(m.clone()).await,
+        ("upgrade", Some(m)) => commands::upgrade::execute(m),
+        _ => println!("{}", usage()),
+    }
+}
+
+fn usage() -> &'static str {
+    "usage: --help to see available options.\n\n"
 }

 fn banner() -> String {
@@ -35,6 +57,40 @@ fn banner() -> String {
    )
 }

+fn long_version() -> String {
+    format!(
+        r#"
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+"#,
+        "Build Timestamp:",
+        env!("VERGEN_BUILD_TIMESTAMP"),
+        "Build Version:",
+        env!("VERGEN_BUILD_SEMVER"),
+        "Commit SHA:",
+        env!("VERGEN_GIT_SHA"),
+        "Commit Date:",
+        env!("VERGEN_GIT_COMMIT_TIMESTAMP"),
+        "Commit Branch:",
+        env!("VERGEN_GIT_BRANCH"),
+        "rustc Version:",
+        env!("VERGEN_RUSTC_SEMVER"),
+        "rustc Channel:",
+        env!("VERGEN_RUSTC_CHANNEL"),
+        "cargo Profile:",
+        env!("VERGEN_CARGO_PROFILE"),
+        "Network:",
+        DEFAULT_NETWORK
+    )
+}
+
 fn setup_logging() {
    let mut log_builder = pretty_env_logger::formatted_timed_builder();
    if let Ok(s) = ::std::env::var("RUST_LOG") {
@@ -5,7 +5,7 @@ use futures::StreamExt;
 use log::*;
 use nymsphinx::receiver::ReconstructedMessage;
 use proxy_helpers::connection_controller::{ControllerCommand, ControllerSender};
-use socks5_requests::Message;
+use socks5_requests::Response;

 pub(crate) struct MixnetResponseListener {
    buffer_requester: ReceivedBufferRequestSender,
@@ -44,16 +44,12 @@ impl MixnetResponseListener {
            warn!("this message had a surb - we didn't do anything with it");
        }

-        let response = match Message::try_from_bytes(&raw_message) {
+        let response = match Response::try_from_bytes(&raw_message) {
            Err(err) => {
                warn!("failed to parse received response - {:?}", err);
                return;
            }
-            Ok(Message::Request(_)) => {
-                warn!("unexpected request");
-                return;
-            }
-            Ok(Message::Response(data)) => data,
+            Ok(data) => data,
        };

        self.controller_sender
@@ -1 +1 @@
-16
+15.0.1
@@ -31,12 +31,9 @@
    "eslint-plugin-import": "^2.25.4",
    "eslint-plugin-mocha": "^10.0.3",
    "eslint-plugin-prettier": "^4.0.0",
-    "expect": "^28.1.3",
-    "mocha": "^10.0.0",
    "prettier": "^2.5.1",
    "typedoc": "^0.22.13",
-    "ts-mocha": "^10.0.0",
-    "typescript": "^4.6.2"
+    "typescript": "^4.1.3"
  },
  "dependencies": {
    "@cosmjs/cosmwasm-stargate": "^0.28.0",
@@ -64,20 +64,23 @@ export default class ValidatorClient implements INymClient {

  readonly vestingContract: string;

-  readonly mainnetDenom = 'unym';
+  readonly mainnetDenom = "unym";

-  readonly mainnetPrefix = 'n';
+  readonly mainnetPrefix = "n";

  private constructor(
    client: SigningClient | QueryClient,
    prefix: string,
    mixnetContract: string,
-    vestingContract: string,
-    denom: string,
+    vestingContract: string
  ) {
    this.client = client;
    this.prefix = prefix;
-    this.denom = `u${denom}`;
+    if (prefix == this.mainnetPrefix) {
+      this.denom = this.mainnetDenom;
+    } else {
+      this.denom = `u${prefix}`;
+    }

    this.mixnetContract = mixnetContract;
    this.vestingContract = vestingContract;
@@ -90,12 +93,11 @@ export default class ValidatorClient implements INymClient {
    prefix: string,
    mixnetContract: string,
    vestingContract: string,
-    denom: string,
  ): Promise<ValidatorClient> {
    const wallet = await ValidatorClient.buildWallet(mnemonic, prefix);

-    const signingClient = await SigningClient.connectWithNymSigner(wallet, nymdUrl, validatorApiUrl, prefix, denom);
-    return new ValidatorClient(signingClient, prefix, mixnetContract, vestingContract, denom);
+    const signingClient = await SigningClient.connectWithNymSigner(wallet, nymdUrl, validatorApiUrl, prefix);
+    return new ValidatorClient(signingClient, prefix, mixnetContract, vestingContract);
  }

  static async connectForQuery(
@@ -104,10 +106,9 @@ export default class ValidatorClient implements INymClient {
    prefix: string,
    mixnetContract: string,
    vestingContract: string,
-    denom: string,
  ): Promise<ValidatorClient> {
    const queryClient = await QueryClient.connectWithNym(nymdUrl, validatorApiUrl);
-    return new ValidatorClient(queryClient, prefix, mixnetContract, vestingContract, denom);
+    return new ValidatorClient(queryClient, prefix, mixnetContract, vestingContract);
  }

  public get address(): string {
@@ -456,4 +457,4 @@ export default class ValidatorClient implements INymClient {
    this.assertSigning();
    return (this.client as ISigningClient).updateContractStateParams(this.mixnetContract, newParams, fee, memo);
  }
-}
+}
@@ -221,12 +221,10 @@ export default class SigningClient extends SigningCosmWasmClient implements ISig
    nymdUrl: string,
    validatorApiUrl: string,
    prefix: string,
-    denom: string,
  ): Promise<SigningClient> {
    const [{ address }] = await wallet.getAccounts();
    const signerOptions: SigningCosmWasmClientOptions = {
-      prefix,
-      gasPrice: nymGasPrice(denom),
+      gasPrice: nymGasPrice(prefix),
    };
    const tmClient = await Tendermint34Client.connect(nymdUrl);
    return new SigningClient(address, validatorApiUrl, tmClient, wallet, signerOptions);
@@ -7,12 +7,13 @@ const mainnetDenom = 'nym';
 export function nymGasPrice(prefix: string): GasPrice {
  if (typeof prefix === 'string') {
    if (prefix === mainnetPrefix) {
-      return GasPrice.fromString(`0.025u${mainnetDenom}`);
+      prefix = mainnetDenom;
    }
    return GasPrice.fromString(`0.025u${prefix}`); // TODO: ideally this ugly conversion shouldn't be hardcoded here.
  }
-
-  throw new Error(`${prefix} is not of type string`);
+  else {
+    throw new Error(`${prefix} is not of type string`);
+  }
 }

 export const downloadWasm = async (url: string): Promise<Uint8Array> => {
@@ -1,11 +0,0 @@
-import ValidatorClient from '../../dist';
-import expect from 'expect';
-
-describe('Query: balances', () => {
-  it('can query for an account balance', async () => {
-    const client = await ValidatorClient.connectForQuery(
-      'https://rpc.nyx.nodes.guru/', 'https://validator.nymtech.net/api/', 'n', 'n14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sjyvg3g', 'n1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrq73f2nw', 'nym');
-    const balance = await client.getBalance('n10yyd98e2tuwu0f7ypz9dy3hhjw7v772q6287gy');
-    expect(Number.parseFloat(balance.amount)).toBeGreaterThan(0);
-  }).timeout(5000);
-})
@@ -1,14 +0,0 @@
-import ValidatorClient from '../../dist';
-import expect from 'expect';
-
-// TODO: implement for QA with .env for mnemonics
-// describe('Sign: send', () => {
-//   it('can send tokens', async () => {
-//     const client = await ValidatorClient.connect(
-//       '<ADD MNEMONIC HERE>',
-//       'https://rpc.nyx.nodes.guru/', 'https://validator.nymtech.net/api/', 'n', 'n14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sjyvg3g', 'n1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrq73f2nw', 'nym');
-//     await client.send('<ADD ADDRESS HERE>')
-//     const balance = await client.getBalance('n10yyd98e2tuwu0f7ypz9dy3hhjw7v772q6287gy');
-//     expect(Number.parseFloat(balance.amount)).toBeGreaterThan(0);
-//   }).timeout(5000);
-// })
@@ -5,8 +5,7 @@
        "esModuleInterop": true,
        "strict": true,
        "declaration": true,
-        "outDir": "./dist",
-        "skipLibCheck": true
+        "outDir": "./dist"
    },
    "typedocOptions": {
        "entryPoints": [
@@ -35,7 +35,7 @@ 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 = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support", features = ["rpc", "bip32", "cosmwasm"], optional = true}
+cosmrs = { version = "0.7.0", features = ["rpc", "bip32", "cosmwasm"], optional = true}
 prost = { version = "0.10", default-features = false, optional = true }
 flate2 = { version = "1.0.20", optional = true }
 sha2 = { version = "0.9.5", optional = true }
@@ -5,7 +5,8 @@ use crate::{validator_api, ValidatorClientError};
 use mixnet_contract_common::{GatewayBond, IdentityKeyRef, MixNodeBond};
 use url::Url;
 use validator_api_requests::coconut::{
-    BlindSignRequestBody, BlindedSignatureResponse, CosmosAddressResponse, VerificationKeyResponse,
+    BlindSignRequestBody, BlindedSignatureResponse, ExecuteReleaseFundsRequestBody,
+    ProposeReleaseFundsRequestBody, ProposeReleaseFundsResponse, VerificationKeyResponse,
    VerifyCredentialBody, VerifyCredentialResponse,
 };
 use validator_api_requests::models::{
@@ -28,7 +29,7 @@ use mixnet_contract_common::{
    RewardedSetUpdateDetails,
 };
 #[cfg(feature = "nymd-client")]
-use network_defaults::NymNetworkDetails;
+use network_defaults::{all::Network, NymNetworkDetails};
 #[cfg(feature = "nymd-client")]
 use std::collections::{HashMap, HashSet};

@@ -113,6 +114,9 @@ impl Config {

 #[cfg(feature = "nymd-client")]
 pub struct Client<C> {
+    // compatibility : (
+    pub network: Network,
+
    // TODO: we really shouldn't be storing a mnemonic here, but removing it would be
    // non-trivial amount of work and it's out of scope of the current branch
    mnemonic: Option<bip39::Mnemonic>,
@@ -131,6 +135,9 @@ pub struct Client<C> {
 impl Client<SigningNymdClient> {
    pub fn new_signing(
        config: Config,
+        // we need to provide network argument due to compatibility with other components (wallet...)
+        // that rely on its existence...
+        network: Network,
        mnemonic: bip39::Mnemonic,
    ) -> Result<Client<SigningNymdClient>, ValidatorClientError> {
        let validator_api_client = validator_api::Client::new(config.api_url.clone());
@@ -142,6 +149,7 @@ impl Client<SigningNymdClient> {
        )?;

        Ok(Client {
+            network,
            mnemonic: Some(mnemonic),
            mixnode_page_limit: config.mixnode_page_limit,
            gateway_page_limit: config.gateway_page_limit,
@@ -169,12 +177,18 @@ impl Client<SigningNymdClient> {

 #[cfg(feature = "nymd-client")]
 impl Client<QueryNymdClient> {
-    pub fn new_query(config: Config) -> Result<Client<QueryNymdClient>, ValidatorClientError> {
+    pub fn new_query(
+        config: Config,
+        // we need to provide network argument due to compatibility with other components (wallet...)
+        // that rely on its existence...
+        network: Network,
+    ) -> Result<Client<QueryNymdClient>, ValidatorClientError> {
        let validator_api_client = validator_api::Client::new(config.api_url.clone());
        let nymd_client =
            NymdClient::connect(config.nymd_config.clone(), config.nymd_url.as_str())?;

        Ok(Client {
+            network,
            mnemonic: None,
            mixnode_page_limit: config.mixnode_page_limit,
            gateway_page_limit: config.gateway_page_limit,
@@ -720,10 +734,6 @@ impl ApiClient {
        Ok(self.validator_api.get_coconut_verification_key().await?)
    }

-    pub async fn get_cosmos_address(&self) -> Result<CosmosAddressResponse, ValidatorClientError> {
-        Ok(self.validator_api.get_cosmos_address().await?)
-    }
-
    pub async fn verify_bandwidth_credential(
        &self,
        request_body: &VerifyCredentialBody,
@@ -733,4 +743,24 @@ impl ApiClient {
            .verify_bandwidth_credential(request_body)
            .await?)
    }
+
+    pub async fn propose_release_funds(
+        &self,
+        request_body: &ProposeReleaseFundsRequestBody,
+    ) -> Result<ProposeReleaseFundsResponse, ValidatorClientError> {
+        Ok(self
+            .validator_api
+            .propose_release_funds(request_body)
+            .await?)
+    }
+
+    pub async fn execute_release_funds(
+        &self,
+        request_body: &ExecuteReleaseFundsRequestBody,
+    ) -> Result<(), ValidatorClientError> {
+        Ok(self
+            .validator_api
+            .execute_release_funds(request_body)
+            .await?)
+    }
 }
@@ -26,7 +26,7 @@ use cosmrs::rpc::{self, HttpClient, Order};
 use cosmrs::tendermint::abci::Code as AbciCode;
 use cosmrs::tendermint::abci::Transaction;
 use cosmrs::tendermint::{abci, block, chain};
-use cosmrs::{tx, AccountId, Coin as CosmosCoin, Tx};
+use cosmrs::{tx, AccountId, Coin as CosmosCoin, Denom, Tx};
 use prost::Message;
 use serde::{Deserialize, Serialize};
 use std::convert::{TryFrom, TryInto};
@@ -121,7 +121,7 @@ pub trait CosmWasmClient: rpc::Client {
    async fn get_balance(
        &self,
        address: &AccountId,
-        search_denom: String,
+        search_denom: Denom,
    ) -> Result<Option<Coin>, NymdError> {
        let path = Some("/cosmos.bank.v1beta1.Query/Balance".parse().unwrap());

@@ -12,9 +12,6 @@ use crate::nymd::{Coin, GasAdjustable, GasPrice, TxResponse};
 use async_trait::async_trait;
 use cosmrs::bank::MsgSend;
 use cosmrs::distribution::MsgWithdrawDelegatorReward;
-use cosmrs::feegrant::{
-    AllowedMsgAllowance, BasicAllowance, MsgGrantAllowance, MsgRevokeAllowance,
-};
 use cosmrs::proto::cosmos::tx::signing::v1beta1::SignMode;
 use cosmrs::rpc::endpoint::broadcast;
 use cosmrs::rpc::{Error as TendermintRpcError, HttpClient, HttpClientUrl, SimpleRequest};
@@ -26,7 +23,7 @@ use serde::Serialize;
 use sha2::Digest;
 use sha2::Sha256;
 use std::convert::TryInto;
-use std::time::{Duration, SystemTime};
+use std::time::Duration;

 const DEFAULT_BROADCAST_POLLING_RATE: Duration = Duration::from_secs(4);
 const DEFAULT_BROADCAST_TIMEOUT: Duration = Duration::from_secs(60);
@@ -423,63 +420,6 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
            .check_response()
    }

-    #[allow(clippy::too_many_arguments)]
-    async fn grant_allowance(
-        &self,
-        granter: &AccountId,
-        grantee: &AccountId,
-        spend_limit: Vec<Coin>,
-        expiration: Option<SystemTime>,
-        allowed_messages: Vec<String>,
-        fee: Fee,
-        memo: impl Into<String> + Send + 'static,
-    ) -> Result<TxResponse, NymdError> {
-        let basic_allowance = BasicAllowance {
-            spend_limit: spend_limit.into_iter().map(Into::into).collect(),
-            expiration,
-        }
-        .to_any()
-        .map_err(|_| NymdError::SerializationError("BasicAllowance".to_owned()))?;
-
-        let allowed_msg_allowance = AllowedMsgAllowance {
-            allowance: Some(basic_allowance),
-            allowed_messages,
-        }
-        .to_any()
-        .map_err(|_| NymdError::SerializationError("AllowedMsgAllowance".to_owned()))?;
-
-        let grant_allowance_msg = MsgGrantAllowance {
-            granter: granter.to_owned(),
-            grantee: grantee.to_owned(),
-            allowance: Some(allowed_msg_allowance),
-        }
-        .to_any()
-        .map_err(|_| NymdError::SerializationError("MsgGrantAllowance".to_owned()))?;
-
-        self.sign_and_broadcast(granter, vec![grant_allowance_msg], fee, memo)
-            .await?
-            .check_response()
-    }
-
-    async fn revoke_allowance(
-        &self,
-        granter: &AccountId,
-        grantee: &AccountId,
-        fee: Fee,
-        memo: impl Into<String> + Send + 'static,
-    ) -> Result<TxResponse, NymdError> {
-        let revoke_allowance_msg = MsgRevokeAllowance {
-            granter: granter.to_owned(),
-            grantee: grantee.to_owned(),
-        }
-        .to_any()
-        .map_err(|_| NymdError::SerializationError("MsgRevokeAllowance".to_owned()))?;
-
-        self.sign_and_broadcast(granter, vec![revoke_allowance_msg], fee, memo)
-            .await?
-            .check_response()
-    }
-
    async fn delegate_tokens(
        &self,
        delegator_address: &AccountId,
@@ -574,10 +514,10 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
        let fee = match fee {
            Fee::Manual(fee) => fee,
            Fee::Auto(multiplier) => auto_fee(multiplier).await?,
-            Fee::PayerGranterAuto(auto_feegrant) => {
-                let mut fee = auto_fee(auto_feegrant.gas_adjustment).await?;
-                fee.payer = auto_feegrant.payer;
-                fee.granter = auto_feegrant.granter;
+            Fee::PayerGranterAuto(multiplier, payer, granter) => {
+                let mut fee = auto_fee(multiplier).await?;
+                fee.payer = payer;
+                fee.granter = granter;
                fee
            }
        };
@@ -1,11 +1,9 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::nymd::Coin;
 use crate::nymd::Gas;
 use cosmrs::{tx, AccountId};
 use serde::{Deserialize, Serialize};
-use std::fmt::{Display, Formatter};

 pub mod gas_price;

@@ -13,74 +11,11 @@ pub type GasAdjustment = f32;

 pub const DEFAULT_SIMULATED_GAS_MULTIPLIER: GasAdjustment = 1.3;

-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AutoFeeGrant {
-    pub gas_adjustment: Option<GasAdjustment>,
-    pub payer: Option<AccountId>,
-    pub granter: Option<AccountId>,
-}
-
-impl Display for AutoFeeGrant {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        if let Some(gas_adjustment) = self.gas_adjustment {
-            write!(f, "Feegrant in auto mode with {gas_adjustment} simulated multiplier with {:?} payer and {:?} granter", self.payer, self.granter)
-        } else {
-            write!(f, "Feegrant in auto mode with no custom simulated multiplier with {:?} payer and {:?} granter", self.payer, self.granter)
-        }
-    }
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum Fee {
    Manual(#[serde(with = "sealed::TxFee")] tx::Fee),
    Auto(Option<GasAdjustment>),
-    PayerGranterAuto(AutoFeeGrant),
-}
-
-impl Display for Fee {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Fee::Manual(fee) => {
-                write!(f, "Fee in manual mode with ")?;
-                for fee in &fee.amount {
-                    write!(f, "{}{} paid in fees, ", fee.amount, fee.denom)?;
-                }
-                write!(f, "{} set as gas limit, ", fee.gas_limit)?;
-                if let Some(payer) = &fee.payer {
-                    write!(f, "{payer} set as payer, ")?;
-                }
-                if let Some(granter) = &fee.granter {
-                    write!(f, "{granter} set as granter")?;
-                }
-                Ok(())
-            }
-            Fee::Auto(Some(multiplier)) => {
-                write!(f, "Fee in auto mode with {multiplier} simulated multiplier")
-            }
-            Fee::Auto(None) => write!(f, "Fee in auto mode with no custom simulated multiplier"),
-            Fee::PayerGranterAuto(auto_feegrant) => write!(f, "{}", auto_feegrant),
-        }
-    }
-}
-
-impl Fee {
-    pub fn new_payer_granter_auto(
-        gas_adjustment: Option<GasAdjustment>,
-        payer: Option<AccountId>,
-        granter: Option<AccountId>,
-    ) -> Self {
-        Fee::PayerGranterAuto(AutoFeeGrant {
-            gas_adjustment,
-            payer,
-            granter,
-        })
-    }
-    pub fn try_get_manual_amount(&self) -> Option<Vec<Coin>> {
-        match self {
-            Fee::Manual(tx_fee) => Some(tx_fee.amount.iter().cloned().map(Into::into).collect()),
-            _ => None,
-        }
-    }
+    PayerGranterAuto(Option<GasAdjustment>, Option<AccountId>, Option<AccountId>),
 }

 impl From<tx::Fee> for Fee {
@@ -26,7 +26,6 @@ use mixnet_contract_common::{
 };
 use serde::Serialize;
 use std::convert::TryInto;
-use std::time::SystemTime;
 use vesting_contract_common::ExecuteMsg as VestingExecuteMsg;
 use vesting_contract_common::QueryMsg as VestingQueryMsg;

@@ -389,7 +388,7 @@ impl<C> NymdClient<C> {
    pub async fn get_balance(
        &self,
        address: &AccountId,
-        denom: String,
+        denom: Denom,
    ) -> Result<Option<Coin>, NymdError>
    where
        C: CosmWasmClient + Sync,
@@ -846,49 +845,6 @@ impl<C> NymdClient<C> {
            .await
    }

-    /// Grant a fee allowance from one address to another
-    pub async fn grant_allowance(
-        &self,
-        grantee: &AccountId,
-        spend_limit: Vec<Coin>,
-        expiration: Option<SystemTime>,
-        allowed_messages: Vec<String>,
-        memo: impl Into<String> + Send + 'static,
-        fee: Option<Fee>,
-    ) -> Result<TxResponse, NymdError>
-    where
-        C: SigningCosmWasmClient + Sync,
-    {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
-        self.client
-            .grant_allowance(
-                self.address(),
-                grantee,
-                spend_limit,
-                expiration,
-                allowed_messages,
-                fee,
-                memo,
-            )
-            .await
-    }
-
-    /// Revoke a fee allowance from one address to another
-    pub async fn revoke_allowance(
-        &self,
-        grantee: &AccountId,
-        memo: impl Into<String> + Send + 'static,
-        fee: Option<Fee>,
-    ) -> Result<TxResponse, NymdError>
-    where
-        C: SigningCosmWasmClient + Sync,
-    {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
-        self.client
-            .revoke_allowance(self.address(), grantee, fee, memo)
-            .await
-    }
-
    pub async fn execute<M>(
        &self,
        contract_address: &AccountId,
@@ -1006,29 +962,6 @@ impl<C> NymdClient<C> {
            .await
    }

-    #[execute("mixnet")]
-    fn _compound_reward(
-        &self,
-        operator: Option<String>,
-        delegator: Option<String>,
-        mix_identity: Option<IdentityKey>,
-        proxy: Option<String>,
-        fee: Option<Fee>,
-    ) -> (ExecuteMsg, Option<Fee>)
-    where
-        C: SigningCosmWasmClient + Sync,
-    {
-        (
-            ExecuteMsg::CompoundReward {
-                operator,
-                delegator,
-                mix_identity,
-                proxy,
-            },
-            fee,
-        )
-    }
-
    #[execute("mixnet")]
    fn _compound_operator_reward(&self, fee: Option<Fee>) -> (ExecuteMsg, Option<Fee>)
    where
@@ -1,33 +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 coconut_bandwidth_contract_common::msg::QueryMsg;
-use coconut_bandwidth_contract_common::spend_credential::SpendCredentialResponse;
-
-use async_trait::async_trait;
-
-#[async_trait]
-pub trait CoconutBandwidthQueryClient {
-    async fn get_spent_credential(
-        &self,
-        blinded_serial_number: String,
-    ) -> Result<SpendCredentialResponse, NymdError>;
-}
-
-#[async_trait]
-impl<C: CosmWasmClient + Sync + Send> CoconutBandwidthQueryClient for NymdClient<C> {
-    async fn get_spent_credential(
-        &self,
-        blinded_serial_number: String,
-    ) -> Result<SpendCredentialResponse, NymdError> {
-        let request = QueryMsg::GetSpentCredential {
-            blinded_serial_number,
-        };
-        self.client
-            .query_contract_smart(self.coconut_bandwidth_contract_address(), &request)
-            .await
-    }
-}
@@ -5,7 +5,6 @@ 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::spend_credential::SpendCredentialData;
 use coconut_bandwidth_contract_common::{deposit::DepositData, msg::ExecuteMsg};

 use async_trait::async_trait;
@@ -20,13 +19,6 @@ pub trait CoconutBandwidthSigningClient {
        encryption_key: String,
        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NymdError>;
-    async fn spend_credential(
-        &self,
-        funds: Coin,
-        blinded_serial_number: String,
-        gateway_cosmos_address: String,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
 }

 #[async_trait]
@@ -54,30 +46,4 @@ impl<C: SigningCosmWasmClient + Sync + Send> CoconutBandwidthSigningClient for N
            )
            .await
    }
-    async fn spend_credential(
-        &self,
-        funds: Coin,
-        blinded_serial_number: String,
-        gateway_cosmos_address: String,
-        fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
-        let req = ExecuteMsg::SpendCredential {
-            data: SpendCredentialData::new(
-                funds.into(),
-                blinded_serial_number,
-                gateway_cosmos_address,
-            ),
-        };
-        self.client
-            .execute(
-                self.address(),
-                self.coconut_bandwidth_contract_address(),
-                &req,
-                fee,
-                "CoconutBandwidth::SpendCredential",
-                vec![],
-            )
-            .await
-    }
 }
@@ -1,16 +1,14 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-mod coconut_bandwidth_query_client;
 mod coconut_bandwidth_signing_client;
 mod multisig_query_client;
 mod multisig_signing_client;
 mod vesting_query_client;
 mod vesting_signing_client;

-pub use coconut_bandwidth_query_client::CoconutBandwidthQueryClient;
 pub use coconut_bandwidth_signing_client::CoconutBandwidthSigningClient;
-pub use multisig_query_client::MultisigQueryClient;
+pub use multisig_query_client::QueryClient;
 pub use multisig_signing_client::MultisigSigningClient;
 pub use vesting_query_client::VestingQueryClient;
 pub use vesting_signing_client::VestingSigningClient;
@@ -9,12 +9,12 @@ use multisig_contract_common::msg::{ProposalResponse, QueryMsg};
 use async_trait::async_trait;

 #[async_trait]
-pub trait MultisigQueryClient {
+pub trait QueryClient {
    async fn get_proposal(&self, proposal_id: u64) -> Result<ProposalResponse, NymdError>;
 }

 #[async_trait]
-impl<C: CosmWasmClient + Sync + Send> MultisigQueryClient for NymdClient<C> {
+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
@@ -12,6 +12,7 @@ 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 {
@@ -48,10 +49,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> MultisigSigningClient for NymdClien
    ) -> Result<ExecuteResult, NymdError> {
        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
        let release_funds_req = CoconutBandwidthExecuteMsg::ReleaseFunds {
-            funds: Coin::new(
-                voucher_value,
-                self.config.chain_details.mix_denom.base.clone(),
-            ),
+            funds: Coin::new(voucher_value, DEFAULT_NETWORK.mix_denom().base),
        };
        let release_funds_msg = CosmosMsg::Wasm(WasmMsg::Execute {
            contract_addr: self.coconut_bandwidth_contract_address().to_string(),
@@ -207,20 +207,35 @@ mod tests {
            "acquire rebel spot skin gun such erupt pull swear must define ill chief turtle today flower chunk truth battle claw rigid detail gym feel",
            "step income throw wheat mobile ship wave drink pool sudden upset jaguar bar globe rifle spice frost bless glimpse size regular carry aspect ball"
        ];
-        let prefix = MAINNET.bech32_prefix();
-
-        let addrs = vec![
-            "n1jw6mp7d5xqc7w6xm79lha27glmd0vdt3l9artf",
-            "n1h5hgn94nsq4kh99rjj794hr5h5q6yfm2lr52es",
-            "n17n9flp6jflljg6fp05dsy07wcprf2uuu8g40rf",
+        let prefixes = vec![
+            MAINNET.bech32_prefix(),
+            SANDBOX.bech32_prefix(),
+            QA.bech32_prefix(),
        ];
-        for (idx, mnemonic) in mnemonics.iter().enumerate() {
-            let wallet =
-                DirectSecp256k1HdWallet::from_mnemonic(&prefix, mnemonic.parse().unwrap()).unwrap();
-            assert_eq!(
-                wallet.try_derive_accounts().unwrap()[0].address,
-                addrs[idx].parse().unwrap()
-            )
+
+        for prefix in prefixes {
+            let addrs = match prefix.as_ref() {
+                "nymt" => vec![
+                    "nymt1jw6mp7d5xqc7w6xm79lha27glmd0vdt339me94",
+                    "nymt1h5hgn94nsq4kh99rjj794hr5h5q6yfm23rjshv",
+                    "nymt17n9flp6jflljg6fp05dsy07wcprf2uuufgn4d4",
+                ],
+                "n" => vec![
+                    "n1jw6mp7d5xqc7w6xm79lha27glmd0vdt3l9artf",
+                    "n1h5hgn94nsq4kh99rjj794hr5h5q6yfm2lr52es",
+                    "n17n9flp6jflljg6fp05dsy07wcprf2uuu8g40rf",
+                ],
+                _ => panic!("Test needs to be updated with new bech32 prefix"),
+            };
+            for (idx, mnemonic) in mnemonics.iter().enumerate() {
+                let wallet =
+                    DirectSecp256k1HdWallet::from_mnemonic(&prefix, mnemonic.parse().unwrap())
+                        .unwrap();
+                assert_eq!(
+                    wallet.try_derive_accounts().unwrap()[0].address,
+                    addrs[idx].parse().unwrap()
+                )
+            }
        }
    }
 }
@@ -8,8 +8,9 @@ use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use url::Url;
 use validator_api_requests::coconut::{
-    BlindSignRequestBody, BlindedSignatureResponse, CosmosAddressResponse, VerificationKeyResponse,
-    VerifyCredentialBody, VerifyCredentialResponse,
+    BlindSignRequestBody, BlindedSignatureResponse, CosmosAddressResponse,
+    ExecuteReleaseFundsRequestBody, ProposeReleaseFundsRequestBody, ProposeReleaseFundsResponse,
+    VerificationKeyResponse, VerifyCredentialBody, VerifyCredentialResponse,
 };
 use validator_api_requests::models::{
    CoreNodeStatusResponse, InclusionProbabilityResponse, MixNodeBondAnnotated,
@@ -404,6 +405,40 @@ impl Client {
        )
        .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.
@@ -19,6 +19,8 @@ pub const COCONUT_PARTIAL_BANDWIDTH_CREDENTIAL: &str = "partial-bandwidth-creden
 pub const COCONUT_VERIFICATION_KEY: &str = "verification-key";
 pub const COCONUT_COSMOS_ADDRESS: &str = "cosmos-address";
 pub const COCONUT_VERIFY_BANDWIDTH_CREDENTIAL: &str = "verify-bandwidth-credential";
+pub const COCONUT_PROPOSE_RELEASE_FUNDS: &str = "propose-release-funds";
+pub const COCONUT_EXECUTE_RELEASE_FUNDS: &str = "execute-release-funds";

 pub const STATUS_ROUTES: &str = "status";
 pub const MIXNODE: &str = "mixnode";
@@ -9,4 +9,3 @@ edition = "2021"
 cosmwasm-std = "1.0.0"
 schemars = "0.8"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
-multisig-contract-common = { path = "../multisig-contract" }
@@ -1,4 +1,3 @@
 pub mod deposit;
 pub mod events;
 pub mod msg;
-pub mod spend_credential;
@@ -5,34 +5,24 @@ use cosmwasm_std::Coin;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};

-use crate::{deposit::DepositData, spend_credential::SpendCredentialData};
+use crate::deposit::DepositData;

 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub struct InstantiateMsg {
    pub multisig_addr: String,
    pub pool_addr: String,
-    pub mix_denom: String,
 }

 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
    DepositFunds { data: DepositData },
-    SpendCredential { data: SpendCredentialData },
    ReleaseFunds { funds: Coin },
 }

 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
-pub enum QueryMsg {
-    GetSpentCredential {
-        blinded_serial_number: String,
-    },
-    GetAllSpentCredentials {
-        limit: Option<u32>,
-        start_after: Option<String>,
-    },
-}
+pub enum QueryMsg {}

 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
@@ -1,148 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use cosmwasm_std::{from_binary, to_binary, Addr, Coin, CosmosMsg, StdResult, WasmMsg};
-use multisig_contract_common::msg::ExecuteMsg as MultisigExecuteMsg;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-use crate::msg::ExecuteMsg;
-
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-pub struct SpendCredentialData {
-    funds: Coin,
-    blinded_serial_number: String,
-    gateway_cosmos_address: String,
-}
-
-impl SpendCredentialData {
-    pub fn new(funds: Coin, blinded_serial_number: String, gateway_cosmos_address: String) -> Self {
-        SpendCredentialData {
-            funds,
-            blinded_serial_number,
-            gateway_cosmos_address,
-        }
-    }
-
-    pub fn funds(&self) -> &Coin {
-        &self.funds
-    }
-
-    pub fn blinded_serial_number(&self) -> &str {
-        &self.blinded_serial_number
-    }
-
-    pub fn gateway_cosmos_address(&self) -> &str {
-        &self.gateway_cosmos_address
-    }
-}
-
-#[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
-pub enum SpendCredentialStatus {
-    InProgress,
-    Spent,
-}
-
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
-pub struct SpendCredential {
-    funds: Coin,
-    blinded_serial_number: String,
-    gateway_cosmos_address: Addr,
-    status: SpendCredentialStatus,
-}
-
-impl SpendCredential {
-    pub fn new(funds: Coin, blinded_serial_number: String, gateway_cosmos_address: Addr) -> Self {
-        SpendCredential {
-            funds,
-            blinded_serial_number,
-            gateway_cosmos_address,
-            status: SpendCredentialStatus::InProgress,
-        }
-    }
-
-    pub fn blinded_serial_number(&self) -> &str {
-        &self.blinded_serial_number
-    }
-
-    pub fn status(&self) -> SpendCredentialStatus {
-        self.status
-    }
-
-    pub fn mark_as_spent(&mut self) {
-        self.status = SpendCredentialStatus::Spent;
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
-pub struct PagedSpendCredentialResponse {
-    pub spend_credentials: Vec<SpendCredential>,
-    pub per_page: usize,
-    pub start_next_after: Option<String>,
-}
-
-impl PagedSpendCredentialResponse {
-    pub fn new(
-        spend_credentials: Vec<SpendCredential>,
-        per_page: usize,
-        start_next_after: Option<String>,
-    ) -> Self {
-        PagedSpendCredentialResponse {
-            spend_credentials,
-            per_page,
-            start_next_after,
-        }
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
-pub struct SpendCredentialResponse {
-    pub spend_credential: Option<SpendCredential>,
-}
-
-impl SpendCredentialResponse {
-    pub fn new(spend_credential: Option<SpendCredential>) -> Self {
-        SpendCredentialResponse { spend_credential }
-    }
-}
-
-pub fn to_cosmos_msg(
-    funds: Coin,
-    blinded_serial_number: String,
-    coconut_bandwidth_addr: String,
-    multisig_addr: String,
-) -> StdResult<CosmosMsg> {
-    let release_funds_req = ExecuteMsg::ReleaseFunds { funds };
-    let release_funds_msg = CosmosMsg::Wasm(WasmMsg::Execute {
-        contract_addr: coconut_bandwidth_addr,
-        msg: to_binary(&release_funds_req)?,
-        funds: vec![],
-    });
-    let req = MultisigExecuteMsg::Propose {
-        title: String::from("Release funds, as ordered by Coconut Bandwidth Contract"),
-        description: blinded_serial_number,
-        msgs: vec![release_funds_msg],
-        latest: None,
-    };
-    let msg = CosmosMsg::Wasm(WasmMsg::Execute {
-        contract_addr: multisig_addr,
-        msg: to_binary(&req)?,
-        funds: vec![],
-    });
-
-    Ok(msg)
-}
-
-pub fn funds_from_cosmos_msgs(msgs: Vec<CosmosMsg>) -> Option<Coin> {
-    if let Some(CosmosMsg::Wasm(WasmMsg::Execute {
-        contract_addr: _,
-        msg,
-        funds: _,
-    })) = msgs.get(0)
-    {
-        if let Ok(ExecuteMsg::ReleaseFunds { funds }) = from_binary::<ExecuteMsg>(msg) {
-            return Some(funds);
-        }
-    }
-    None
-}
@@ -3,7 +3,6 @@ name = "mixnet-contract-common"
 version = "0.1.0"
 authors = ["Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2021"
-rust-version = "1.62"

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

@@ -14,6 +13,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_repr = "0.1"
 schemars = "0.8"
 thiserror = "1.0"
+network-defaults = { path = "../../network-defaults" }
 fixed = { version = "1.1", features = ["serde"] }
 az = "1.1"
 log = "0.4.14"
@@ -33,7 +33,7 @@ pub struct Delegation {
    pub node_identity: IdentityKey,
    pub amount: Coin,
    pub block_height: u64,
-    pub proxy: Option<Addr>, // proxy address used to delegate the funds on behalf of another address
+    pub proxy: Option<Addr>, // proxy address used to delegate the funds on behalf of anouther address
 }

 impl Eq for Delegation {}
@@ -37,16 +37,6 @@ pub enum DelegationEvent {
    Undelegate(PendingUndelegate),
 }

-impl DelegationEvent {
-    pub fn delegation_amount(&self) -> Option<Coin> {
-        match self {
-            DelegationEvent::Delegate(delegation) => Some(delegation.amount.clone()),
-            // I think it would be nice to also expose an amount here to know how much we're undelegating
-            DelegationEvent::Undelegate(_) => None,
-        }
-    }
-}
-
 #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
 pub struct PendingUndelegate {
    mix_identity: IdentityKey,
@@ -10,7 +10,6 @@ use serde::{Deserialize, Serialize};
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub struct InstantiateMsg {
    pub rewarding_validator_address: String,
-    pub mixnet_denom: String,
 }

 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
@@ -33,12 +32,6 @@ pub enum ExecuteMsg {
    CompoundDelegatorReward {
        mix_identity: IdentityKey,
    },
-    CompoundReward {
-        operator: Option<String>,
-        delegator: Option<String>,
-        mix_identity: Option<IdentityKey>,
-        proxy: Option<String>,
-    },
    BondMixnode {
        mix_node: MixNode,
        owner_signature: String,
@@ -122,7 +115,6 @@ pub enum ExecuteMsg {
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
-    GetBlacklistedNodes {},
    GetCurrentOperatorCost {},
    GetRewardingValidatorAddress {},
    GetAllDelegationKeys {},
@@ -213,31 +205,6 @@ pub enum QueryMsg {
    },
 }

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
-pub struct MigrateMsg {
-    pub mixnet_denom: String,
-    nodes_to_remove: Option<Vec<NodeToRemove>>,
-}
-
-impl MigrateMsg {
-    pub fn nodes_to_remove(&self) -> Vec<NodeToRemove> {
-        self.nodes_to_remove.clone().unwrap_or_default()
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-pub struct NodeToRemove {
-    owner: String,
-    proxy: Option<String>,
-}
-
-impl NodeToRemove {
-    pub fn owner(&self) -> &str {
-        &self.owner
-    }
-
-    pub fn proxy(&self) -> Option<&String> {
-        self.proxy.as_ref()
-    }
-}
+pub struct MigrateMsg {}
@@ -14,7 +14,6 @@ use cw_utils::{Duration, Expiration, Threshold};
 pub struct InstantiateMsg {
    // this is the group contract that contains the member list
    pub group_addr: String,
-    pub coconut_bandwidth_contract_address: String,
    pub threshold: Threshold,
    pub max_voting_period: Duration,
 }
@@ -78,8 +77,3 @@ pub enum QueryMsg {
        limit: Option<u32>,
    },
 }
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct MigrateMsg {
-    pub coconut_bandwidth_address: String,
-}
@@ -1,5 +1,6 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
+use config::defaults::MIX_DENOM;
 use cosmwasm_std::{Coin, Timestamp};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -9,8 +10,8 @@ pub use messages::{ExecuteMsg, InitMsg, MigrateMsg, QueryMsg};
 pub mod events;
 pub mod messages;

-pub fn one_ucoin(denom: String) -> Coin {
-    Coin::new(1, denom)
+pub fn one_ucoin() -> Coin {
+    Coin::new(1, MIX_DENOM.base)
 }

 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
@@ -27,8 +28,8 @@ pub enum Period {

 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct PledgeData {
-    pub amount: Coin,
-    pub block_time: Timestamp,
+    amount: Coin,
+    block_time: Timestamp,
 }

 impl PledgeData {
@@ -47,9 +48,9 @@ impl PledgeData {

 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct OriginalVestingResponse {
-    pub amount: Coin,
-    pub number_of_periods: usize,
-    pub period_duration: u64,
+    amount: Coin,
+    number_of_periods: usize,
+    period_duration: u64,
 }

 impl OriginalVestingResponse {
@@ -7,14 +7,11 @@ use serde::{Deserialize, Serialize};
 #[serde(rename_all = "snake_case")]
 pub struct InitMsg {
    pub mixnet_contract_address: String,
-    pub mix_denom: String,
 }

 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
-pub struct MigrateMsg {
-    pub mix_denom: String,
-}
+pub struct MigrateMsg {}

 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema, Default)]
 pub struct VestingSpecification {
@@ -7,13 +7,14 @@ edition = "2021"

 [dependencies]
 bls12_381 = { version = "0.5", default-features = false, features = ["pairings", "alloc", "experimental"] }
-cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support", optional = true }
+cosmrs = { version = "0.7.0", optional = true }
 thiserror = "1.0"
 url = "2.2"

 # I guess temporarily until we get serde support in coconut up and running
 coconut-interface = { path = "../coconut-interface" }
 crypto = { path = "../crypto", features = ["rand", "asymmetric", "symmetric", "hashing"] }
+network-defaults = { path = "../network-defaults" }
 validator-api-requests = { path = "../../validator-api/validator-api-requests" }
 validator-client = { path = "../client-libs/validator-client" }

@@ -1,3 +1,4 @@
+use config::defaults::DEFAULT_NETWORK;
 use subtle_encoding::bech32;

 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -14,15 +15,16 @@ pub fn try_bech32_decode(address: &str) -> Result<String, Bech32Error> {
    }
 }

-pub fn validate_bech32_prefix(bech32_prefix: &str, address: &str) -> Result<(), Bech32Error> {
+pub fn validate_bech32_prefix(address: &str) -> Result<(), Bech32Error> {
    let prefix = try_bech32_decode(address)?;

-    if prefix == bech32_prefix {
+    if prefix == DEFAULT_NETWORK.bech32_prefix() {
        Ok(())
    } else {
        Err(Bech32Error::WrongPrefix(format!(
            "your bech32 address prefix should be {}, not {}",
-            bech32_prefix, prefix
+            DEFAULT_NETWORK.bech32_prefix(),
+            prefix
        )))
    }
 }
@@ -31,8 +33,6 @@ pub fn validate_bech32_prefix(bech32_prefix: &str, address: &str) -> Result<(),
 mod tests {
    use super::*;

-    const TEST_BECH32_PREFIX: &str = "n";
-
    mod decoding_bech32_addresses {
        use super::*;

@@ -71,12 +71,9 @@ mod tests {
            assert_eq!(
                Err(Bech32Error::WrongPrefix(format!(
                    "your bech32 address prefix should be {}, not punk",
-                    TEST_BECH32_PREFIX
+                    DEFAULT_NETWORK.bech32_prefix()
                ))),
-                validate_bech32_prefix(
-                    TEST_BECH32_PREFIX,
-                    "punk1h3w4nj7kny5dfyjw2le4vm74z03v9vd4dstpu0"
-                )
+                validate_bech32_prefix("punk1h3w4nj7kny5dfyjw2le4vm74z03v9vd4dstpu0")
            )
        }

@@ -85,7 +82,6 @@ mod tests {
            assert_eq!(
                Ok(()),
                validate_bech32_prefix(
-                    TEST_BECH32_PREFIX,
                    "n14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sjyvg3g"
                )
            )
@@ -8,7 +8,6 @@ edition = "2021"

 [dependencies]
 cfg-if = "1.0.0"
-dotenv = "0.15.0"
 hex-literal = "0.3.3"
 once_cell = "1.7.2"
 serde = {version = "1.0", features = ["derive"]}
@@ -0,0 +1,11 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+fn main() {
+    match option_env!("NETWORK") {
+        None | Some("mainnet") => println!("cargo:rustc-cfg=network=\"mainnet\"",),
+        Some("sandbox") => println!("cargo:rustc-cfg=network=\"sandbox\"",),
+        Some("qa") => println!("cargo:rustc-cfg=network=\"qa\""),
+        _ => panic!("No such network"),
+    }
+}
@@ -3,7 +3,6 @@

 use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
-use std::{env::var, path::PathBuf};
 use url::Url;

 pub mod all;
@@ -11,10 +10,36 @@ pub mod eth_contract;
 pub mod mainnet;
 pub mod qa;
 pub mod sandbox;
-pub mod var_names;

-pub const ETH_CONTRACT_ADDRESS: [u8; 20] = mainnet::_ETH_CONTRACT_ADDRESS;
-pub const ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] = mainnet::_ETH_ERC20_CONTRACT_ADDRESS;
+// The set of defaults that are decided at compile time. Ideally we want to reduce these to a
+// minimum.
+// Keep DENOM around mostly for use in contracts. (TODO: consider moving it there, or renaming?)
+cfg_if::cfg_if! {
+    if #[cfg(network = "mainnet")] {
+        pub const DEFAULT_NETWORK: all::Network = all::Network::MAINNET;
+        pub const MIX_DENOM: DenomDetails = mainnet::MIX_DENOM;
+        pub const STAKE_DENOM: DenomDetails = mainnet::STAKE_DENOM;
+
+        pub const ETH_CONTRACT_ADDRESS: [u8; 20] = mainnet::_ETH_CONTRACT_ADDRESS;
+        pub const ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] = mainnet::_ETH_ERC20_CONTRACT_ADDRESS;
+
+    } else if #[cfg(network = "qa")] {
+        pub const DEFAULT_NETWORK: all::Network = all::Network::QA;
+        pub const MIX_DENOM: DenomDetails = qa::MIX_DENOM;
+        pub const STAKE_DENOM: DenomDetails = qa::STAKE_DENOM;
+
+        pub const ETH_CONTRACT_ADDRESS: [u8; 20] = qa::_ETH_CONTRACT_ADDRESS;
+        pub const ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] = qa::_ETH_ERC20_CONTRACT_ADDRESS;
+
+    } else if #[cfg(network = "sandbox")] {
+        pub const DEFAULT_NETWORK: all::Network = all::Network::SANDBOX;
+        pub const MIX_DENOM: DenomDetails = sandbox::MIX_DENOM;
+        pub const STAKE_DENOM: DenomDetails = sandbox::STAKE_DENOM;
+
+        pub const ETH_CONTRACT_ADDRESS: [u8; 20] = sandbox::_ETH_CONTRACT_ADDRESS;
+        pub const ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] = sandbox::_ETH_ERC20_CONTRACT_ADDRESS;
+    }
+}

 #[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
 pub struct ChainDetails {
@@ -57,56 +82,23 @@ impl NymNetworkDetails {
        NymNetworkDetails::default()
    }

-    pub fn new_from_env() -> Self {
-        NymNetworkDetails::new()
-            .with_bech32_account_prefix(
-                var(var_names::BECH32_PREFIX).expect("bech32 prefix not set"),
-            )
-            .with_mix_denom(DenomDetailsOwned {
-                base: var(var_names::MIX_DENOM).expect("mix denomination base not set"),
-                display: var(var_names::MIX_DENOM_DISPLAY)
-                    .expect("mix denomination display not set"),
-                display_exponent: var(var_names::DENOMS_EXPONENT)
-                    .expect("denomination exponent not set")
-                    .parse()
-                    .expect("denomination exponent is not u32"),
-            })
-            .with_stake_denom(DenomDetailsOwned {
-                base: var(var_names::STAKE_DENOM).expect("stake denomination base not set"),
-                display: var(var_names::STAKE_DENOM_DISPLAY)
-                    .expect("stake denomination display not set"),
-                display_exponent: var(var_names::DENOMS_EXPONENT)
-                    .expect("denomination exponent not set")
-                    .parse()
-                    .expect("denomination exponent is not u32"),
-            })
-            .with_validator_endpoint(ValidatorDetails::new(
-                var(var_names::NYMD_VALIDATOR).expect("nymd validator not set"),
-                Some(var(var_names::API_VALIDATOR).expect("api validator not set")),
-            ))
-            .with_mixnet_contract(Some(
-                var(var_names::MIXNET_CONTRACT_ADDRESS).expect("mixnet contract not set"),
-            ))
-            .with_vesting_contract(Some(
-                var(var_names::VESTING_CONTRACT_ADDRESS).expect("vesting contract not set"),
-            ))
-            .with_bandwidth_claim_contract(Some(
-                var(var_names::BANDWIDTH_CLAIM_CONTRACT_ADDRESS)
-                    .expect("bandwidth claim contract not set"),
-            ))
-            .with_coconut_bandwidth_contract(Some(
-                var(var_names::COCONUT_BANDWIDTH_CONTRACT_ADDRESS)
-                    .expect("coconut bandwidth contract not set"),
-            ))
-            .with_multisig_contract(Some(
-                var(var_names::MULTISIG_CONTRACT_ADDRESS).expect("multisig contract not set"),
-            ))
+    pub fn new_qa() -> Self {
+        (&*QA_DEFAULTS).into()
+    }
+
+    pub fn new_sandbox() -> Self {
+        (&*SANDBOX_DEFAULTS).into()
    }

    pub fn new_mainnet() -> Self {
        (&*MAINNET_DEFAULTS).into()
    }

+    pub fn current_default() -> Self {
+        // backwards compatibility reasons
+        DEFAULT_NETWORK.details()
+    }
+
    pub fn with_bech32_account_prefix<S: Into<String>>(mut self, prefix: S) -> Self {
        self.chain_details.bech32_account_prefix = prefix.into();
        self
@@ -275,7 +267,7 @@ impl DenomDetails {
    }
 }

-#[derive(Debug, Serialize, Deserialize, Hash, Clone, PartialEq, Eq)]
+#[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
 pub struct DenomDetailsOwned {
    pub base: String,
    pub display: String,
@@ -341,21 +333,27 @@ impl ValidatorDetails {
    }
 }

-pub fn setup_env(config_env_file: Option<PathBuf>) {
-    match std::env::var(var_names::CONFIGURED) {
-        // if the configuration is not already set in the env vars
-        Err(std::env::VarError::NotPresent) => {
-            if let Some(config_env_file) = config_env_file {
-                dotenv::from_path(config_env_file)
-                    .expect("Invalid path to environment configuration file");
-            } else {
-                // if nothing is set, the use mainnet defaults
-                crate::mainnet::export_to_env();
-            }
-        }
-        Err(_) => crate::mainnet::export_to_env(),
-        _ => {}
-    }
+pub fn default_statistics_service_url() -> Url {
+    DEFAULT_NETWORK
+        .statistics_service_url()
+        .parse()
+        .expect("the provided statistics service url is invalid!")
+}
+
+pub fn default_nymd_endpoints() -> Vec<Url> {
+    DEFAULT_NETWORK
+        .validators()
+        .iter()
+        .map(ValidatorDetails::nymd_url)
+        .collect()
+}
+
+pub fn default_api_endpoints() -> Vec<Url> {
+    DEFAULT_NETWORK
+        .validators()
+        .iter()
+        .filter_map(ValidatorDetails::api_url)
+        .collect()
 }

 // Name of the event triggered by the eth contract. If the event name is changed,
@@ -1,7 +1,6 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::var_names;
 use crate::{DenomDetails, ValidatorDetails};

 pub(crate) const BECH32_PREFIX: &str = "n";
@@ -25,48 +24,9 @@ pub(crate) const _ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] =
 pub(crate) const REWARDING_VALIDATOR_ADDRESS: &str = "n10yyd98e2tuwu0f7ypz9dy3hhjw7v772q6287gy";

 pub(crate) const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "http://127.0.0.1:8090";
-pub const NYMD_VALIDATOR: &str = "https://rpc.nyx.nodes.guru/";
-pub const API_VALIDATOR: &str = "https://validator.nymtech.net/api/";
 pub(crate) fn validators() -> Vec<ValidatorDetails> {
-    vec![ValidatorDetails::new(NYMD_VALIDATOR, Some(API_VALIDATOR))]
-}
-
-pub fn export_to_env() {
-    std::env::set_var(var_names::CONFIGURED, "true");
-    std::env::set_var(var_names::BECH32_PREFIX, BECH32_PREFIX);
-    std::env::set_var(var_names::MIX_DENOM, MIX_DENOM.base);
-    std::env::set_var(var_names::MIX_DENOM_DISPLAY, MIX_DENOM.display);
-    std::env::set_var(var_names::STAKE_DENOM, STAKE_DENOM.base);
-    std::env::set_var(var_names::STAKE_DENOM_DISPLAY, STAKE_DENOM.display);
-    std::env::set_var(
-        var_names::DENOMS_EXPONENT,
-        STAKE_DENOM.display_exponent.to_string(),
-    );
-    std::env::set_var(var_names::MIXNET_CONTRACT_ADDRESS, MIXNET_CONTRACT_ADDRESS);
-    std::env::set_var(
-        var_names::VESTING_CONTRACT_ADDRESS,
-        VESTING_CONTRACT_ADDRESS,
-    );
-    std::env::set_var(
-        var_names::BANDWIDTH_CLAIM_CONTRACT_ADDRESS,
-        BANDWIDTH_CLAIM_CONTRACT_ADDRESS,
-    );
-    std::env::set_var(
-        var_names::COCONUT_BANDWIDTH_CONTRACT_ADDRESS,
-        COCONUT_BANDWIDTH_CONTRACT_ADDRESS,
-    );
-    std::env::set_var(
-        var_names::MULTISIG_CONTRACT_ADDRESS,
-        MULTISIG_CONTRACT_ADDRESS,
-    );
-    std::env::set_var(
-        var_names::REWARDING_VALIDATOR_ADDRESS,
-        REWARDING_VALIDATOR_ADDRESS,
-    );
-    std::env::set_var(
-        var_names::STATISTICS_SERVICE_DOMAIN_ADDRESS,
-        STATISTICS_SERVICE_DOMAIN_ADDRESS,
-    );
-    std::env::set_var(var_names::NYMD_VALIDATOR, NYMD_VALIDATOR);
-    std::env::set_var(var_names::API_VALIDATOR, API_VALIDATOR);
+    vec![ValidatorDetails::new(
+        "https://rpc.nyx.nodes.guru/",
+        Some("https://validator.nymtech.net/api/"),
+    )]
 }
@@ -1,21 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-// Environment variable that, if set, shows the environment is currently configured
-pub const CONFIGURED: &str = "CONFIGURED";
-
-pub const BECH32_PREFIX: &str = "BECH32_PREFIX";
-pub const MIX_DENOM: &str = "MIX_DENOM";
-pub const MIX_DENOM_DISPLAY: &str = "MIX_DENOM_DISPLAY";
-pub const STAKE_DENOM: &str = "STAKE_DENOM";
-pub const STAKE_DENOM_DISPLAY: &str = "STAKE_DENOM_DISPLAY";
-pub const DENOMS_EXPONENT: &str = "DENOMS_EXPONENT";
-pub const MIXNET_CONTRACT_ADDRESS: &str = "MIXNET_CONTRACT_ADDRESS";
-pub const VESTING_CONTRACT_ADDRESS: &str = "VESTING_CONTRACT_ADDRESS";
-pub const BANDWIDTH_CLAIM_CONTRACT_ADDRESS: &str = "BANDWIDTH_CLAIM_CONTRACT_ADDRESS";
-pub const COCONUT_BANDWIDTH_CONTRACT_ADDRESS: &str = "COCONUT_BANDWIDTH_CONTRACT_ADDRESS";
-pub const MULTISIG_CONTRACT_ADDRESS: &str = "MULTISIG_CONTRACT_ADDRESS";
-pub const REWARDING_VALIDATOR_ADDRESS: &str = "REWARDING_VALIDATOR_ADDRESS";
-pub const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "STATISTICS_SERVICE_DOMAIN_ADDRESS";
-pub const NYMD_VALIDATOR: &str = "NYMD_VALIDATOR";
-pub const API_VALIDATOR: &str = "API_VALIDATOR";
@@ -34,7 +34,8 @@ mod error;
 mod impls;
 mod proofs;
 mod scheme;
-pub mod tests;
+#[cfg(test)]
+mod tests;
 mod traits;
 mod utils;

@@ -1,13 +1,23 @@
 use crate::{
-    aggregate_verification_keys, setup, tests::helpers::theta_from_keys_and_attributes, ttp_keygen,
-    verify_credential, CoconutError, VerificationKey,
+    aggregate_signature_shares, aggregate_verification_keys, blind_sign, prepare_blind_sign,
+    prove_bandwidth_credential, setup, ttp_keygen, verify_credential, CoconutError, Signature,
+    SignatureShare, VerificationKey,
 };

+use itertools::izip;
+
 #[test]
 fn main() -> Result<(), CoconutError> {
    let params = setup(5)?;

    let public_attributes = params.n_random_scalars(2);
+    let serial_number = params.random_scalar();
+    let binding_number = params.random_scalar();
+    let private_attributes = vec![serial_number, binding_number];
+
+    // generate commitment
+    let (commitments_openings, blind_sign_request) =
+        prepare_blind_sign(&params, &private_attributes, &public_attributes)?;

    // generate_keys
    let coconut_keypairs = ttp_keygen(&params, 2, 3)?;
@@ -20,8 +30,58 @@ fn main() -> Result<(), CoconutError> {
    // aggregate verification keys
    let verification_key = aggregate_verification_keys(&verification_keys, Some(&[1, 2, 3]))?;

+    // generate blinded signatures
+    let mut blinded_signatures = Vec::new();
+
+    for keypair in coconut_keypairs {
+        let blinded_signature = blind_sign(
+            &params,
+            &keypair.secret_key(),
+            &blind_sign_request,
+            &public_attributes,
+        )?;
+        blinded_signatures.push(blinded_signature)
+    }
+
+    // Unblind
+    let unblinded_signatures: Vec<Signature> =
+        izip!(blinded_signatures.iter(), verification_keys.iter())
+            .map(|(s, vk)| {
+                s.unblind(
+                    &params,
+                    vk,
+                    &private_attributes,
+                    &public_attributes,
+                    &blind_sign_request.get_commitment_hash(),
+                    &commitments_openings,
+                )
+                .unwrap()
+            })
+            .collect();
+
+    // Aggregate signatures
+    let signature_shares: Vec<SignatureShare> = unblinded_signatures
+        .iter()
+        .enumerate()
+        .map(|(idx, signature)| SignatureShare::new(*signature, (idx + 1) as u64))
+        .collect();
+
+    let mut attributes = Vec::with_capacity(private_attributes.len() + public_attributes.len());
+    attributes.extend_from_slice(&private_attributes);
+    attributes.extend_from_slice(&public_attributes);
+
+    // Randomize credentials and generate any cryptographic material to verify them
+    let signature =
+        aggregate_signature_shares(&params, &verification_key, &attributes, &signature_shares)?;
+
    // Generate cryptographic material to verify them
-    let theta = theta_from_keys_and_attributes(&params, &coconut_keypairs, &public_attributes)?;
+    let theta = prove_bandwidth_credential(
+        &params,
+        &verification_key,
+        &signature,
+        serial_number,
+        binding_number,
+    )?;

    // Verify credentials
    assert!(verify_credential(
@@ -1,87 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::*;
-use itertools::izip;
-
-pub fn theta_from_keys_and_attributes(
-    params: &Parameters,
-    coconut_keypairs: &Vec<KeyPair>,
-    public_attributes: &Vec<PublicAttribute>,
-) -> Result<Theta, CoconutError> {
-    let serial_number = params.random_scalar();
-    let binding_number = params.random_scalar();
-    let private_attributes = vec![serial_number, binding_number];
-
-    // generate commitment
-    let (commitments_openings, blind_sign_request) =
-        prepare_blind_sign(params, &private_attributes, public_attributes)?;
-
-    let verification_keys: Vec<VerificationKey> = coconut_keypairs
-        .iter()
-        .map(|keypair| keypair.verification_key())
-        .collect();
-
-    // aggregate verification keys
-    let indices: Vec<u64> = coconut_keypairs
-        .iter()
-        .enumerate()
-        .map(|(idx, _)| (idx + 1) as u64)
-        .collect();
-    let verification_key = aggregate_verification_keys(&verification_keys, Some(&indices))?;
-
-    // generate blinded signatures
-    let mut blinded_signatures = Vec::new();
-
-    for keypair in coconut_keypairs {
-        let blinded_signature = blind_sign(
-            params,
-            &keypair.secret_key(),
-            &blind_sign_request,
-            public_attributes,
-        )?;
-        blinded_signatures.push(blinded_signature)
-    }
-
-    // Unblind
-    let unblinded_signatures: Vec<Signature> =
-        izip!(blinded_signatures.iter(), verification_keys.iter())
-            .map(|(s, vk)| {
-                s.unblind(
-                    params,
-                    vk,
-                    &private_attributes,
-                    public_attributes,
-                    &blind_sign_request.get_commitment_hash(),
-                    &commitments_openings,
-                )
-                .unwrap()
-            })
-            .collect();
-
-    // Aggregate signatures
-    let signature_shares: Vec<SignatureShare> = unblinded_signatures
-        .iter()
-        .enumerate()
-        .map(|(idx, signature)| SignatureShare::new(*signature, (idx + 1) as u64))
-        .collect();
-
-    let mut attributes = Vec::with_capacity(private_attributes.len() + public_attributes.len());
-    attributes.extend_from_slice(&private_attributes);
-    attributes.extend_from_slice(public_attributes);
-
-    // Randomize credentials and generate any cryptographic material to verify them
-    let signature =
-        aggregate_signature_shares(params, &verification_key, &attributes, &signature_shares)?;
-
-    // Generate cryptographic material to verify them
-    let theta = prove_bandwidth_credential(
-        params,
-        &verification_key,
-        &signature,
-        serial_number,
-        binding_number,
-    )?;
-
-    Ok(theta)
-}
@@ -1,3 +1 @@
-#[cfg(test)]
 mod e2e;
-pub mod helpers;
@@ -17,3 +17,5 @@ serde_json = "1"
 sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "chrono"]}
 thiserror = "1"
 tokio = { version = "1.19.1", features = [ "time" ] }
+
+network-defaults = { path = "../network-defaults" }
@@ -34,16 +34,12 @@ pub enum StatsData {

 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct StatsGatewayData {
-    pub gateway_id: String,
    pub inbox_count: u32,
 }

 impl StatsGatewayData {
-    pub fn new(gateway_id: String, inbox_count: u32) -> Self {
-        StatsGatewayData {
-            gateway_id,
-            inbox_count,
-        }
+    pub fn new(inbox_count: u32) -> Self {
+        StatsGatewayData { inbox_count }
    }
 }

@@ -20,7 +20,7 @@ url = "2.2"
 ts-rs = "6.1.2"

 cosmwasm-std = "1.0.0-beta8"
-cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support" }
+cosmrs = "0.7.0"

 validator-client = { path = "../../common/client-libs/validator-client", features = [
    "nymd-client",
@@ -1,5 +1,4 @@
-use crate::currency::{CurrencyDenom, DecCoin};
-use config::defaults::DenomDetails;
+use crate::currency::{CurrencyDenom, MajorCurrencyAmount};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};

@@ -10,20 +9,17 @@ use serde::{Deserialize, Serialize};
 )]
 #[derive(Serialize, Deserialize, JsonSchema)]
 pub struct Account {
+    pub contract_address: String,
    pub client_address: String,
-    pub base_mix_denom: String,
-
-    // this should get refactored to just use a String, but for now it's fine as it reduces headache
-    // for others
-    pub display_mix_denom: CurrencyDenom,
+    pub denom: CurrencyDenom,
 }

 impl Account {
-    pub fn new(client_address: String, mix_denom: DenomDetails) -> Self {
+    pub fn new(contract_address: String, client_address: String, denom: CurrencyDenom) -> Self {
        Account {
+            contract_address,
            client_address,
-            base_mix_denom: mix_denom.base.to_owned(),
-            display_mix_denom: mix_denom.display.parse().unwrap_or_default(),
+            denom,
        }
    }
 }
@@ -57,15 +53,6 @@ pub struct AccountEntry {
 )]
 #[derive(Serialize, Deserialize)]
 pub struct Balance {
-    pub amount: DecCoin,
+    pub amount: MajorCurrencyAmount,
    pub printable_balance: String,
 }
-
-impl Balance {
-    pub fn new(amount: DecCoin) -> Self {
-        Balance {
-            printable_balance: amount.to_string(),
-            amount,
-        }
-    }
-}
@@ -1,29 +1,24 @@
 use crate::error::TypesError;
-use config::defaults::all::Network;
-use config::defaults::{DenomDetails, DenomDetailsOwned};
-use cosmwasm_std::Fraction;
+use cosmrs::Denom as CosmosDenom;
+use cosmwasm_std::Coin as CosmWasmCoin;
 use cosmwasm_std::{Decimal, Uint128};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use std::cmp::Ordering;
-use std::collections::HashMap;
 use std::convert::TryFrom;
 use std::fmt::{Display, Formatter};
+use std::ops::{Add, Mul};
+use std::str::FromStr;
 use strum::{Display, EnumString, EnumVariantNames};
-use validator_client::nymd::Coin;
-
-#[cfg(feature = "generate-ts")]
-use ts_rs::{Dependency, TS};
+use validator_client::nymd::{Coin, CosmosCoin};

 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
    feature = "generate-ts",
    ts(export_to = "ts-packages/types/src/types/rust/CurrencyDenom.ts")
 )]
-#[cfg_attr(feature = "generate-ts", ts(rename_all = "lowercase"))]
+#[cfg_attr(feature = "generate-ts", ts(rename_all = "UPPERCASE"))]
 #[derive(
    Display,
-    Default,
    Serialize,
    Deserialize,
    Clone,
@@ -34,12 +29,10 @@ use ts_rs::{Dependency, TS};
    Eq,
    JsonSchema,
 )]
-#[serde(rename_all = "lowercase")]
-#[strum(serialize_all = "lowercase")]
+#[serde(rename_all = "UPPERCASE")]
+#[strum(serialize_all = "UPPERCASE")]
+// TODO: this shouldn't be an enum...
 pub enum CurrencyDenom {
-    #[strum(ascii_case_insensitive)]
-    #[default]
-    Unknown,
    #[strum(ascii_case_insensitive)]
    Nym,
    #[strum(ascii_case_insensitive)]
@@ -50,469 +43,448 @@ pub enum CurrencyDenom {
    Nyxt,
 }

-pub type Denom = String;
-
-#[derive(Debug, Default)]
-pub struct RegisteredCoins(HashMap<Denom, CoinMetadata>);
-
-impl RegisteredCoins {
-    pub fn default_denoms(network: Network) -> Self {
-        let mut network_coins = HashMap::new();
-        network_coins.insert(network.mix_denom().base, network.mix_denom().into());
-        network_coins.insert(network.stake_denom().base, network.stake_denom().into());
-        RegisteredCoins(network_coins)
-    }
-
-    pub fn insert(&mut self, denom: Denom, metadata: CoinMetadata) -> Option<CoinMetadata> {
-        self.0.insert(denom, metadata)
-    }
-
-    pub fn remove(&mut self, denom: &Denom) -> Option<CoinMetadata> {
-        self.0.remove(denom)
-    }
-
-    pub fn attempt_convert_to_base_coin(&self, coin: DecCoin) -> Result<Coin, TypesError> {
-        // check if this is already in the base denom
-        if self.0.contains_key(&coin.denom) {
-            // if we're converting a base DecCoin it CANNOT fail, unless somebody is providing
-            // bullshit data on purpose : )
-            return coin.try_into();
-        } else {
-            // TODO: this kinda suggests we may need a better data structure
-            for registered_coin in self.0.values() {
-                if let Some(exponent) = registered_coin.get_exponent(&coin.denom) {
-                    let amount = try_convert_decimal_to_u128(coin.try_scale_up_value(exponent)?)?;
-                    return Ok(Coin::new(amount, &registered_coin.base));
-                }
-            }
+impl CurrencyDenom {
+    pub fn parse(value: &str) -> Result<CurrencyDenom, TypesError> {
+        let mut denom = value.to_string();
+        if denom.starts_with('u') {
+            denom = denom[1..].to_string();
        }
-        Err(TypesError::UnknownCoinDenom(coin.denom))
-    }
-
-    pub fn attempt_convert_to_display_dec_coin(&self, coin: Coin) -> Result<DecCoin, TypesError> {
-        for registered_coin in self.0.values() {
-            if let Some(exponent) = registered_coin.get_exponent(&coin.denom) {
-                // if this fails it means we haven't registered our display denom which honestly should never be the case
-                // unless somebody is rocking their own custom network
-                let display_exponent = registered_coin
-                    .get_exponent(&registered_coin.display)
-                    .ok_or_else(|| TypesError::UnknownCoinDenom(coin.denom.clone()))?;
-
-                return match exponent.cmp(&display_exponent) {
-                    Ordering::Greater => {
-                        // we need to scale up, unlikely to ever be needed but included for completion sake,
-                        // for example if we decided to created knym with exponent 9 and wanted to convert to nym with exponent 6
-                        Ok(DecCoin::new_scaled_up(
-                            coin.amount,
-                            &registered_coin.display,
-                            exponent - display_exponent,
-                        )?)
-                    }
-                    // we're already in the display denom
-                    Ordering::Equal => Ok(coin.into()),
-                    Ordering::Less => {
-                        // we need to scale down, the most common case, for example we're in base unym with exponent 0 and want to convert to nym with exponent 6
-                        Ok(DecCoin::new_scaled_down(
-                            coin.amount,
-                            &registered_coin.display,
-                            display_exponent - exponent,
-                        )?)
-                    }
-                };
-            }
-        }
-
-        Err(TypesError::UnknownCoinDenom(coin.denom))
-    }
-}
-
-// TODO: should this live here?
-// attempts to replicate cosmos-sdk's coin metadata
-// https://docs.cosmos.network/master/architecture/adr-024-coin-metadata.html
-// this way we could more easily handle multiple coin types simultaneously (like nym/nyx/nymt/nyx + local currencies)
-#[derive(Debug)]
-pub struct DenomUnit {
-    pub denom: Denom,
-    pub exponent: u32,
-    // pub aliases: Vec<String>,
-}
-
-impl DenomUnit {
-    pub fn new(denom: Denom, exponent: u32) -> Self {
-        DenomUnit { denom, exponent }
-    }
-}
-
-#[derive(Debug)]
-pub struct CoinMetadata {
-    pub denom_units: Vec<DenomUnit>,
-    pub base: Denom,
-    pub display: Denom,
-}
-
-impl CoinMetadata {
-    pub fn new(denom_units: Vec<DenomUnit>, base: Denom, display: Denom) -> Self {
-        CoinMetadata {
-            denom_units,
-            base,
-            display,
+        match CurrencyDenom::from_str(&denom) {
+            Ok(res) => Ok(res),
+            Err(_e) => Err(TypesError::InvalidDenom(value.to_string())),
        }
    }
+}

-    pub fn get_exponent(&self, denom: &str) -> Option<u32> {
-        self.denom_units
-            .iter()
-            .find(|denom_unit| denom_unit.denom == denom)
-            .map(|denom_unit| denom_unit.exponent)
+impl TryFrom<CosmosDenom> for CurrencyDenom {
+    type Error = TypesError;
+
+    fn try_from(value: CosmosDenom) -> Result<Self, Self::Error> {
+        CurrencyDenom::parse(value.as_ref())
    }
 }

-impl From<DenomDetails> for CoinMetadata {
-    fn from(denom_details: DenomDetails) -> Self {
-        CoinMetadata::new(
-            vec![
-                DenomUnit::new(denom_details.base.into(), 0),
-                DenomUnit::new(denom_details.display.into(), denom_details.display_exponent),
-            ],
-            denom_details.base.into(),
-            denom_details.display.into(),
-        )
-    }
+#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
+#[cfg_attr(
+    feature = "generate-ts",
+    ts(export_to = "ts-packages/types/src/types/rust/CurrencyStringMajorAmount.ts")
+)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+pub struct MajorAmountString(String); // see https://github.com/Aleph-Alpha/ts-rs/issues/51 for exporting type aliases
+
+#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
+#[cfg_attr(
+    feature = "generate-ts",
+    ts(export_to = "ts-packages/types/src/types/rust/Currency.ts")
+)]
+// #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+pub struct MajorCurrencyAmount {
+    // temporarly going back to original impl to speed up merge
+    pub amount: MajorAmountString,
+    pub denom: CurrencyDenom,
+    // // temporary...
+    // #[cfg_attr(feature = "generate-ts", ts(skip))]
+    // pub coin: Coin,
 }

-impl From<DenomDetailsOwned> for CoinMetadata {
-    fn from(denom_details: DenomDetailsOwned) -> Self {
-        CoinMetadata::new(
-            vec![
-                DenomUnit::new(denom_details.base.clone(), 0),
-                DenomUnit::new(
-                    denom_details.display.clone(),
-                    denom_details.display_exponent,
-                ),
-            ],
-            denom_details.base,
-            denom_details.display,
-        )
-    }
-}
+// impl JsonSchema for MajorCurrencyAmount {
+//     fn schema_name() -> String {
+//         todo!()
+//     }
+//
+//     fn json_schema(gen: &mut SchemaGenerator) -> Schema {
+//         todo!()
+//     }
+// }

 // tries to semi-replicate cosmos-sdk's DecCoin for being able to handle tokens with decimal amounts
 // https://github.com/cosmos/cosmos-sdk/blob/v0.45.4/types/dec_coin.go
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, JsonSchema)]
 pub struct DecCoin {
-    pub denom: Denom,
-    // Decimal is already serialized to string and using string in its schema, so lets also go straight to string for ts_rs
-    // todo: is `Decimal` the correct type to use? Do we want to depend on cosmwasm_std here?
-    pub amount: Decimal,
+    //
 }

-// I had to implement it manually to correctly set dependencies
-#[cfg(feature = "generate-ts")]
-impl TS for DecCoin {
-    const EXPORT_TO: Option<&'static str> = Some("ts-packages/types/src/types/rust/DecCoin.ts");
-
-    fn decl() -> String {
-        format!("type {} = {};", Self::name(), Self::inline())
-    }
-
-    fn name() -> String {
-        "DecCoin".into()
-    }
-
-    fn inline() -> String {
-        "{ denom: CurrencyDenom, amount: string }".into()
-    }
-
-    fn dependencies() -> Vec<Dependency> {
-        vec![Dependency::from_ty::<CurrencyDenom>()
-            .expect("TS was incorrectly defined on `CurrencyDenom`")]
-    }
-
-    fn transparent() -> bool {
-        false
-    }
-}
-
-impl DecCoin {
-    pub fn new_base<S: Into<String>>(amount: impl Into<Uint128>, denom: S) -> Self {
-        DecCoin {
-            denom: denom.into(),
-            amount: Decimal::from_atomics(amount, 0).unwrap(),
+impl MajorCurrencyAmount {
+    pub fn new(amount: &str, denom: CurrencyDenom) -> MajorCurrencyAmount {
+        MajorCurrencyAmount {
+            amount: MajorAmountString(amount.to_string()),
+            denom,
        }
    }

-    pub fn zero<S: Into<String>>(denom: S) -> Self {
-        DecCoin {
-            denom: denom.into(),
-            amount: Decimal::zero(),
-        }
+    pub fn zero(denom: &CurrencyDenom) -> MajorCurrencyAmount {
+        MajorCurrencyAmount::new("0", denom.clone())
    }
+    //
+    // pub fn from_cosmrs_coin(coin: &CosmosCoin) -> Result<MajorCurrencyAmount, TypesError> {
+    //     MajorCurrencyAmount::from_cosmrs_decimal_and_denom(coin.amount, coin.denom.to_string())
+    // }
+    //
+    // pub fn from_minor_uint128_and_denom(
+    //     amount_minor: Uint128,
+    //     denom_minor: &str,
+    // ) -> Result<MajorCurrencyAmount, TypesError> {
+    //     MajorCurrencyAmount::from_minor_decimal_and_denom(
+    //         Decimal::from_atomics(amount_minor, 0)?,
+    //         denom_minor,
+    //     )
+    // }
+    //
+    // pub fn from_minor_decimal_and_denom(
+    //     amount_minor: Decimal,
+    //     denom_minor: &str,
+    // ) -> Result<MajorCurrencyAmount, TypesError> {
+    //     if !(denom_minor.starts_with('u') || denom_minor.starts_with('U')) {
+    //         return Err(TypesError::InvalidDenom(denom_minor.to_string()));
+    //     }
+    //     let major = amount_minor / Uint128::from(1_000_000u64);
+    //     if let Ok(denom) = CurrencyDenom::from_str(&denom_minor[1..].to_string()) {
+    //         return Ok(MajorCurrencyAmount {
+    //             amount: MajorAmountString(major.to_string()),
+    //             denom,
+    //         });
+    //     }
+    //     Err(TypesError::InvalidDenom(denom_minor.to_string()))
+    // }
+    // pub fn from_decimal_and_denom(
+    //     amount: Decimal,
+    //     denom: String,
+    // ) -> Result<MajorCurrencyAmount, TypesError> {
+    //     if denom.starts_with('u') || denom.starts_with('U') {
+    //         return MajorCurrencyAmount::from_minor_decimal_and_denom(amount, &denom);
+    //     }
+    //     if let Ok(denom) = CurrencyDenom::from_str(denom.as_str()) {
+    //         return Ok(MajorCurrencyAmount {
+    //             amount: MajorAmountString(amount.to_string()),
+    //             denom,
+    //         });
+    //     }
+    //     Err(TypesError::InvalidDenom(denom))
+    // }
+    // pub fn from_cosmrs_decimal_and_denom(
+    //     amount: CosmosDecimal,
+    //     denom: String,
+    // ) -> Result<MajorCurrencyAmount, TypesError> {
+    //     if denom.starts_with('u') || denom.starts_with('U') {
+    //         return match Decimal::from_str(&amount.to_string()) {
+    //             Ok(amount) => MajorCurrencyAmount::from_minor_decimal_and_denom(amount, &denom),
+    //             Err(_e) => Err(TypesError::InvalidAmount(amount.to_string())),
+    //         };
+    //     }
+    //
+    //     if let Ok(denom) = CurrencyDenom::from_str(denom.as_str()) {
+    //         return Ok(MajorCurrencyAmount {
+    //             amount: MajorAmountString(amount.to_string()),
+    //             denom,
+    //         });
+    //     }
+    //     Err(TypesError::InvalidDenom(denom))
+    // }
+    //
+    // pub fn into_cosmos_coin(self) -> CosmosCoin {
+    //     self.coin.into()
+    // }
+    //
+    // pub fn to_minor_uint128(&self) -> Result<Uint128, TypesError> {
+    //     if self.amount.0.contains('.') {
+    //         // has a decimal point (Cosmos assumes "." is the decimal separator)
+    //         let parts = self.amount.0.split('.');
+    //         let str = parts.collect_vec();
+    //         if str.is_empty() || str.len() > 2 {
+    //             return Err(TypesError::InvalidAmount("Amount is invalid".to_string()));
+    //         }
+    //         if str.len() == 2 {
+    //             // has a decimal, so check decimal places first
+    //             if str[1].len() > 6 {
+    //                 return Err(TypesError::InvalidDenom(
+    //                     "Amount is invalid, only 6 decimal places of precision are allowed"
+    //                         .to_string(),
+    //                 ));
+    //             }
+    //
+    //             // so multiple whole part by 1e6 and add decimal part
+    //             let whole_part = Uint128::from_str(str[0])? * Uint128::from(1_000_000u64);
+    //
+    //             // TODO: has Rust got anything that deals with fixed point values, or parsing from format strings? Leading zeroes are causing issues
+    //             return match format!("0.{}", str[1]).parse::<f64>() {
+    //                 Ok(decimal_part_float) => {
+    //                     // this makes an assumption that 6 decimal places of f64 can never lose precision
+    //                     let truncated = (decimal_part_float * 1_000_000.).trunc() as u32;
+    //                     let decimal_part = Uint128::from(truncated);
+    //                     let sum = whole_part + decimal_part;
+    //                     Ok(sum)
+    //                 }
+    //                 Err(_e) => Err(TypesError::InvalidAmount(
+    //                     "Amount decimal part is invalid".to_string(),
+    //                 )),
+    //             };
+    //         }
+    //     }
+    //
+    //     let major = Uint128::from_str(&self.amount.0)?;
+    //     let scaled = major * Uint128::new(1_000_000u128);
+    //     Ok(scaled)
+    // }

-    pub fn new_scaled_up<S: Into<String>>(
-        base_amount: impl Into<Uint128>,
-        denom: S,
-        exponent: u32,
-    ) -> Result<Self, TypesError> {
-        let base_amount = Decimal::from_atomics(base_amount, 0).unwrap();
-        Ok(DecCoin {
-            denom: denom.into(),
-            amount: try_scale_up_decimal(base_amount, exponent)?,
-        })
-    }
-
-    pub fn new_scaled_down<S: Into<String>>(
-        base_amount: impl Into<Uint128>,
-        denom: S,
-        exponent: u32,
-    ) -> Result<Self, TypesError> {
-        let base_amount = Decimal::from_atomics(base_amount, 0).unwrap();
-        Ok(DecCoin {
-            denom: denom.into(),
-            amount: try_scale_down_decimal(base_amount, exponent)?,
-        })
-    }
-
-    pub fn try_scale_down_value(&self, exponent: u32) -> Result<Decimal, TypesError> {
-        try_scale_down_decimal(self.amount, exponent)
-    }
-
-    pub fn try_scale_up_value(&self, exponent: u32) -> Result<Decimal, TypesError> {
-        try_scale_up_decimal(self.amount, exponent)
-    }
+    // pub fn denom_to_string(&self) -> String {
+    //     self.denom.to_string()
+    // }
 }

-// TODO: should thoese live here?
-pub fn try_scale_down_decimal(dec: Decimal, exponent: u32) -> Result<Decimal, TypesError> {
-    let rhs = 10u128
-        .checked_pow(exponent)
-        .ok_or(TypesError::UnsupportedExponent(exponent))?;
-    let denominator = dec
-        .denominator()
-        .checked_mul(rhs.into())
-        .map_err(|_| TypesError::UnsupportedExponent(exponent))?;
-
-    Ok(Decimal::from_ratio(dec.numerator(), denominator))
-}
-
-pub fn try_scale_up_decimal(dec: Decimal, exponent: u32) -> Result<Decimal, TypesError> {
-    let rhs = 10u128
-        .checked_pow(exponent)
-        .ok_or(TypesError::UnsupportedExponent(exponent))?;
-    let denominator = dec
-        .denominator()
-        .checked_div(rhs.into())
-        .map_err(|_| TypesError::UnsupportedExponent(exponent))?;
-
-    Ok(Decimal::from_ratio(dec.numerator(), denominator))
-}
-
-pub fn try_convert_decimal_to_u128(dec: Decimal) -> Result<u128, TypesError> {
-    let whole = dec.numerator() / dec.denominator();
-
-    // unwrap is fine as we're not dividing by zero here
-    let fractional = (dec.numerator()).checked_rem(dec.denominator()).unwrap();
-
-    // we cannot convert as we'd lose our decimal places
-    // (for example if somebody attempted to represent our gas price (WHICH YOU SHOULDN'T DO) as DecCoin)
-    if fractional != Uint128::zero() {
-        return Err(TypesError::LossyCoinConversion);
-    }
-    Ok(whole.u128())
-}
-
-impl Display for DecCoin {
+impl Display for MajorCurrencyAmount {
    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{} {}", self.amount, self.denom)
+        write!(f, "{} {}", self.amount.0, self.denom)
    }
 }

-impl From<Coin> for DecCoin {
+// TODO: cleanup after merge
+impl From<CosmosCoin> for MajorCurrencyAmount {
+    fn from(c: CosmosCoin) -> Self {
+        MajorCurrencyAmount::from(Coin::from(c))
+    }
+}
+
+impl From<CosmWasmCoin> for MajorCurrencyAmount {
+    fn from(c: CosmWasmCoin) -> Self {
+        MajorCurrencyAmount::from(Coin::from(c))
+    }
+}
+
+impl From<Coin> for MajorCurrencyAmount {
    fn from(coin: Coin) -> Self {
-        DecCoin::new_base(coin.amount, coin.denom)
+        // current assumption: MajorCurrencyAmount is represented as decimal with 6 decimal points
+        // unwrap is fine as we haven't exceeded decimal range since our coins are at max 1B in value
+        // (this is a weak assumption, but for solving this merge conflict it's good enough temporary workaround)
+        let amount = Decimal::from_atomics(coin.amount, 6).unwrap();
+        MajorCurrencyAmount {
+            amount: MajorAmountString(amount.to_string()),
+            denom: CurrencyDenom::parse(&coin.denom).expect("this will go away after the merge..."),
+        }
    }
 }

-// this conversion assumes same denomination
-impl TryFrom<DecCoin> for Coin {
-    type Error = TypesError;
+// temporary...
+impl From<MajorCurrencyAmount> for CosmosCoin {
+    fn from(c: MajorCurrencyAmount) -> CosmosCoin {
+        let c: Coin = c.into();
+        c.into()
+    }
+}

-    fn try_from(value: DecCoin) -> Result<Self, Self::Error> {
-        Ok(Coin {
-            amount: try_convert_decimal_to_u128(value.try_scale_down_value(0)?)?,
-            denom: value.denom,
-        })
+impl From<MajorCurrencyAmount> for CosmWasmCoin {
+    fn from(c: MajorCurrencyAmount) -> CosmWasmCoin {
+        let c: Coin = c.into();
+        c.into()
+    }
+}
+
+impl From<MajorCurrencyAmount> for Coin {
+    fn from(c: MajorCurrencyAmount) -> Coin {
+        let decimal: Decimal = c
+            .amount
+            .0
+            .parse()
+            .expect("stringified amount should have been a valid decimal");
+
+        // again, temporary
+        let exp = Uint128::new(1000000);
+        let val = decimal.mul(exp);
+
+        // again, terrible assumption for denom, but it works temporarily...
+        Coin {
+            amount: val.u128(),
+            denom: format!("u{}", c.denom).to_lowercase(),
+        }
+    }
+}
+
+impl Add for MajorCurrencyAmount {
+    type Output = Self;
+
+    fn add(self, rhs: Self) -> Self::Output {
+        // again, temporary workaround to help with merge
+        (Coin::from(self).try_add(&Coin::from(rhs)))
+            .expect("provided coins had different denoms")
+            .into()
    }
 }

 #[cfg(test)]
 mod test {
    use super::*;
-    use std::convert::TryFrom;
+    use cosmrs::Coin as CosmosCoin;
+    use cosmrs::Decimal as CosmosDecimal;
+    use cosmrs::Denom as CosmosDenom;
+    use cosmwasm_std::Coin as CosmWasmCoin;
+    use cosmwasm_std::Decimal as CosmWasmDecimal;
+    use serde_json::json;
+    use std::str::FromStr;
    use std::string::ToString;

    #[test]
-    fn dec_value_scale_down() {
-        let dec = DecCoin {
-            denom: "foo".to_string(),
-            amount: "1234007000".parse().unwrap(),
-        };
+    fn json_to_major_currency_amount() {
+        let nym = json!({
+            "amount": "1",
+            "denom": "NYM"
+        });
+        let nymt = json!({
+            "amount": "1",
+            "denom": "NYMT"
+        });

+        let test_nym_amount = MajorCurrencyAmount::new("1", CurrencyDenom::Nym);
+        let test_nymt_amount = MajorCurrencyAmount::new("1", CurrencyDenom::Nymt);
+
+        let nym_amount = serde_json::from_value::<MajorCurrencyAmount>(nym).unwrap();
+        let nymt_amount = serde_json::from_value::<MajorCurrencyAmount>(nymt).unwrap();
+
+        assert_eq!(nym_amount, test_nym_amount);
+        assert_eq!(nymt_amount, test_nymt_amount);
+    }
+
+    #[test]
+    fn minor_amount_json_to_major_currency_amount() {
+        let one_micro_nym = json!({
+            "amount": "0.000001",
+            "denom": "NYM"
+        });
+
+        let expected_nym_amount = MajorCurrencyAmount::new("0.000001", CurrencyDenom::Nym);
+        let actual_nym_amount =
+            serde_json::from_value::<MajorCurrencyAmount>(one_micro_nym).unwrap();
+
+        assert_eq!(expected_nym_amount, actual_nym_amount);
+    }
+
+    #[test]
+    fn denom_from_str() {
+        assert_eq!(CurrencyDenom::from_str("nym").unwrap(), CurrencyDenom::Nym);
        assert_eq!(
-            "1234007000".parse::<Decimal>().unwrap(),
-            dec.try_scale_down_value(0).unwrap()
+            CurrencyDenom::from_str("nymt").unwrap(),
+            CurrencyDenom::Nymt
        );
+        assert_eq!(CurrencyDenom::from_str("NYM").unwrap(), CurrencyDenom::Nym);
        assert_eq!(
-            "123400700".parse::<Decimal>().unwrap(),
-            dec.try_scale_down_value(1).unwrap()
+            CurrencyDenom::from_str("NYMT").unwrap(),
+            CurrencyDenom::Nymt
        );
+        assert_eq!(CurrencyDenom::from_str("NyM").unwrap(), CurrencyDenom::Nym);
        assert_eq!(
-            "12340070".parse::<Decimal>().unwrap(),
-            dec.try_scale_down_value(2).unwrap()
-        );
-        assert_eq!(
-            "123400.7".parse::<Decimal>().unwrap(),
-            dec.try_scale_down_value(4).unwrap()
+            CurrencyDenom::from_str("NYmt").unwrap(),
+            CurrencyDenom::Nymt
        );

-        let dec = DecCoin {
-            denom: "foo".to_string(),
-            amount: "10000000000".parse().unwrap(),
-        };
+        assert!(matches!(
+            CurrencyDenom::from_str("foo").unwrap_err(),
+            strum::ParseError::VariantNotFound,
+        ));

+        // denominations must all be major
+        assert!(matches!(
+            CurrencyDenom::from_str("unym").unwrap_err(),
+            strum::ParseError::VariantNotFound,
+        ));
+        assert!(matches!(
+            CurrencyDenom::from_str("unymt").unwrap_err(),
+            strum::ParseError::VariantNotFound,
+        ));
+    }
+
+    #[test]
+    fn to_string() {
        assert_eq!(
-            "100".parse::<Decimal>().unwrap(),
-            dec.try_scale_down_value(8).unwrap()
+            MajorCurrencyAmount::new("1", CurrencyDenom::Nym).to_string(),
+            "1 NYM"
        );
        assert_eq!(
-            "1".parse::<Decimal>().unwrap(),
-            dec.try_scale_down_value(10).unwrap()
+            MajorCurrencyAmount::new("1", CurrencyDenom::Nymt).to_string(),
+            "1 NYMT"
        );
        assert_eq!(
-            "0.01".parse::<Decimal>().unwrap(),
-            dec.try_scale_down_value(12).unwrap()
+            MajorCurrencyAmount::new("1000000000000", CurrencyDenom::Nym).to_string(),
+            "1000000000000 NYM"
        );
    }

    #[test]
-    fn dec_value_scale_up() {
-        let dec = DecCoin {
-            denom: "foo".to_string(),
-            amount: "1234.56".parse().unwrap(),
+    fn minor_coin_to_major_currency() {
+        let cosmos_coin = CosmosCoin {
+            amount: CosmosDecimal::from(1u64),
+            denom: CosmosDenom::from_str("unym").unwrap(),
        };
+        let c = MajorCurrencyAmount::from(cosmos_coin);
+        assert_eq!(c, MajorCurrencyAmount::new("0.000001", CurrencyDenom::Nym));
+    }

-        assert_eq!(
-            "1234.56".parse::<Decimal>().unwrap(),
-            dec.try_scale_up_value(0).unwrap()
-        );
-        assert_eq!(
-            "12345.6".parse::<Decimal>().unwrap(),
-            dec.try_scale_up_value(1).unwrap()
-        );
-        assert_eq!(
-            "123456".parse::<Decimal>().unwrap(),
-            dec.try_scale_up_value(2).unwrap()
-        );
-        assert_eq!(
-            "1234560".parse::<Decimal>().unwrap(),
-            dec.try_scale_up_value(3).unwrap()
-        );
-        assert_eq!(
-            "12345600".parse::<Decimal>().unwrap(),
-            dec.try_scale_up_value(4).unwrap()
-        );
-
-        let dec = DecCoin {
-            denom: "foo".to_string(),
-            amount: "0.00000123".parse().unwrap(),
+    #[test]
+    fn minor_cosmwasm_coin_to_major_currency() {
+        let coin = CosmWasmCoin {
+            amount: Uint128::from(1u64),
+            denom: "unym".to_string(),
        };
-
-        assert_eq!(
-            "0.0000123".parse::<Decimal>().unwrap(),
-            dec.try_scale_up_value(1).unwrap()
-        );
-        assert_eq!(
-            "0.000123".parse::<Decimal>().unwrap(),
-            dec.try_scale_up_value(2).unwrap()
-        );
-        assert_eq!(
-            "123".parse::<Decimal>().unwrap(),
-            dec.try_scale_up_value(8).unwrap()
-        );
-        assert_eq!(
-            "1230".parse::<Decimal>().unwrap(),
-            dec.try_scale_up_value(9).unwrap()
-        );
-        assert_eq!(
-            "12300".parse::<Decimal>().unwrap(),
-            dec.try_scale_up_value(10).unwrap()
+        println!(
+            "from_atomics = {}",
+            CosmWasmDecimal::from_atomics(coin.amount, 6).unwrap()
        );
+        let c: MajorCurrencyAmount = coin.into();
+        assert_eq!(c, MajorCurrencyAmount::new("0.000001", CurrencyDenom::Nym));
    }

    #[test]
-    fn coin_to_dec_coin() {
-        let coin = Coin::new(123, "foo");
-        let dec = DecCoin::from(coin.clone());
-        assert_eq!(coin.denom, dec.denom);
-        assert_eq!(dec.amount, Decimal::from_atomics(coin.amount, 0).unwrap());
-    }
-
-    #[test]
-    fn dec_coin_to_coin() {
-        let dec = DecCoin {
-            denom: "foo".to_string(),
-            amount: "123".parse().unwrap(),
+    fn minor_cosmwasm_coin_to_major_currency_2() {
+        let coin = CosmWasmCoin {
+            amount: Uint128::from(1_000_000u64),
+            denom: "unym".to_string(),
        };
-        let coin = Coin::try_from(dec.clone()).unwrap();
-        assert_eq!(dec.denom, coin.denom);
-        assert_eq!(coin.amount, 123u128);
+        println!(
+            "from_atomics = {:?}",
+            CosmWasmDecimal::from_atomics(coin.amount, 6)
+                .unwrap()
+                .to_string()
+        );
+        let c: MajorCurrencyAmount = coin.into();
+        assert_eq!(c, MajorCurrencyAmount::new("1", CurrencyDenom::Nym));
    }

    #[test]
-    fn converting_to_display() {
-        let reg = RegisteredCoins::default_denoms(Network::MAINNET);
-        let values = vec![
-            (1u128, "0.000001"),
-            (10u128, "0.00001"),
-            (100u128, "0.0001"),
-            (1000u128, "0.001"),
-            (10000u128, "0.01"),
-            (100000u128, "0.1"),
-            (1000000u128, "1"),
-            (1234567u128, "1.234567"),
-            (123456700u128, "123.4567"),
-        ];
-
-        for (raw, expected) in values {
-            let coin = Coin::new(raw, Network::MAINNET.mix_denom().base);
-            let display = reg.attempt_convert_to_display_dec_coin(coin).unwrap();
-            assert_eq!(Network::MAINNET.mix_denom().display, display.denom);
-            assert_eq!(expected, display.amount.to_string());
-        }
+    fn major_currency_to_minor_cosmos_coin() {
+        let expected_cosmos_coin = CosmosCoin {
+            amount: CosmosDecimal::from(1u64),
+            denom: CosmosDenom::from_str("unym").unwrap(),
+        };
+        let c = MajorCurrencyAmount::new("0.000001", CurrencyDenom::Nym);
+        let minor_cosmos_coin = c.into();
+        assert_eq!(expected_cosmos_coin, minor_cosmos_coin);
+        assert_eq!("unym", minor_cosmos_coin.denom.to_string());
    }

    #[test]
-    fn converting_to_base() {
-        let reg = RegisteredCoins::default_denoms(Network::MAINNET);
-        let values = vec![
-            (1u128, "0.000001"),
-            (10u128, "0.00001"),
-            (100u128, "0.0001"),
-            (1000u128, "0.001"),
-            (10000u128, "0.01"),
-            (100000u128, "0.1"),
-            (1000000u128, "1"),
-            (1234567u128, "1.234567"),
-            (123456700u128, "123.4567"),
-        ];
+    fn major_currency_to_minor_cosmos_coin_2() {
+        let expected_cosmos_coin = CosmosCoin {
+            amount: CosmosDecimal::from(1000000u64),
+            denom: CosmosDenom::from_str("unym").unwrap(),
+        };
+        let c = MajorCurrencyAmount::new("1", CurrencyDenom::Nym);
+        let minor_cosmos_coin = c.into();
+        assert_eq!(expected_cosmos_coin, minor_cosmos_coin);
+        assert_eq!("unym", minor_cosmos_coin.denom.to_string());
+    }

-        for (expected, raw_display) in values {
-            let coin = DecCoin {
-                denom: Network::MAINNET.mix_denom().display.into(),
-                amount: raw_display.parse().unwrap(),
-            };
-            let base = reg.attempt_convert_to_base_coin(coin).unwrap();
-            assert_eq!(Network::MAINNET.mix_denom().base, base.denom);
-            assert_eq!(expected, base.amount);
-        }
+    #[test]
+    fn minor_cosmos_coin_to_major_currency_string() {
+        // check minor cosmos coin is converted to major value
+        let cosmos_coin = CosmosCoin {
+            amount: CosmosDecimal::from(1u64),
+            denom: CosmosDenom::from_str("unym").unwrap(),
+        };
+        let c = MajorCurrencyAmount::from(cosmos_coin);
+        assert_eq!(c.to_string(), "0.000001 NYM");
+    }
+
+    #[test]
+    fn denom_to_string() {
+        let c = MajorCurrencyAmount::new("1", CurrencyDenom::Nym);
+        let denom = c.denom.to_string();
+        assert_eq!(denom, "NYM".to_string());
    }
 }
@@ -1,10 +1,13 @@
-use crate::currency::{DecCoin, RegisteredCoins};
-use crate::error::TypesError;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+use log::error;
 use mixnet_contract_common::mixnode::DelegationEvent as ContractDelegationEvent;
 use mixnet_contract_common::mixnode::PendingUndelegate as ContractPendingUndelegate;
 use mixnet_contract_common::Delegation as MixnetContractDelegation;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
+
+use crate::currency::MajorCurrencyAmount;
+use crate::error::TypesError;

 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
@@ -15,22 +18,31 @@ use serde::{Deserialize, Serialize};
 pub struct Delegation {
    pub owner: String,
    pub node_identity: String,
-    pub amount: DecCoin,
+    pub amount: MajorCurrencyAmount,
    pub block_height: u64,
    pub proxy: Option<String>, // proxy address used to delegate the funds on behalf of another address
 }

-impl Delegation {
-    pub fn from_mixnet_contract(
-        delegation: MixnetContractDelegation,
-        reg: &RegisteredCoins,
-    ) -> Result<Self, TypesError> {
+impl TryFrom<MixnetContractDelegation> for Delegation {
+    type Error = TypesError;
+
+    fn try_from(value: MixnetContractDelegation) -> Result<Self, Self::Error> {
+        let MixnetContractDelegation {
+            owner,
+            node_identity,
+            amount,
+            block_height,
+            proxy,
+        } = value;
+
+        let amount: MajorCurrencyAmount = amount.into();
+
        Ok(Delegation {
-            owner: delegation.owner.to_string(),
-            node_identity: delegation.node_identity,
-            amount: reg.attempt_convert_to_display_dec_coin(delegation.amount.into())?,
-            block_height: delegation.block_height,
-            proxy: delegation.proxy.map(|d| d.to_string()),
+            owner: owner.into_string(),
+            node_identity,
+            amount,
+            block_height,
+            proxy: proxy.map(|p| p.into_string()),
        })
    }
 }
@@ -42,7 +54,7 @@ impl Delegation {
 )]
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, JsonSchema)]
 pub struct DelegationRecord {
-    pub amount: DecCoin,
+    pub amount: MajorCurrencyAmount,
    pub block_height: u64,
    pub delegated_on_iso_datetime: String,
    pub uses_vesting_contract_tokens: bool,
@@ -57,16 +69,16 @@ pub struct DelegationRecord {
 pub struct DelegationWithEverything {
    pub owner: String,
    pub node_identity: String,
-    pub amount: DecCoin,
-    pub total_delegation: Option<DecCoin>,
-    pub pledge_amount: Option<DecCoin>,
+    pub amount: MajorCurrencyAmount,
+    pub total_delegation: Option<MajorCurrencyAmount>,
+    pub pledge_amount: Option<MajorCurrencyAmount>,
    pub block_height: u64,
    pub delegated_on_iso_datetime: String,
    pub profit_margin_percent: Option<u8>,
    pub avg_uptime_percent: Option<u8>,
    pub stake_saturation: Option<f32>,
    pub uses_vesting_contract_tokens: bool,
-    pub accumulated_rewards: Option<DecCoin>,
+    pub accumulated_rewards: Option<MajorCurrencyAmount>,
    pub pending_events: Vec<DelegationEvent>,
    pub history: Vec<DelegationRecord>,
 }
@@ -80,7 +92,34 @@ pub struct DelegationWithEverything {
 pub struct DelegationResult {
    source_address: String,
    target_address: String,
-    amount: Option<DecCoin>,
+    amount: Option<MajorCurrencyAmount>,
+}
+
+impl DelegationResult {
+    pub fn new(
+        source_address: &str,
+        target_address: &str,
+        amount: Option<MajorCurrencyAmount>,
+    ) -> DelegationResult {
+        DelegationResult {
+            source_address: source_address.to_string(),
+            target_address: target_address.to_string(),
+            amount,
+        }
+    }
+}
+
+impl TryFrom<MixnetContractDelegation> for DelegationResult {
+    type Error = TypesError;
+
+    fn try_from(delegation: MixnetContractDelegation) -> Result<Self, Self::Error> {
+        let amount: MajorCurrencyAmount = delegation.amount.clone().into();
+        Ok(DelegationResult {
+            source_address: delegation.owner().to_string(),
+            target_address: delegation.node_identity(),
+            amount: Some(amount),
+        })
+    }
 }

 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
@@ -104,34 +143,36 @@ pub struct DelegationEvent {
    pub kind: DelegationEventKind,
    pub node_identity: String,
    pub address: String,
-    pub amount: Option<DecCoin>,
+    pub amount: Option<MajorCurrencyAmount>,
    pub block_height: u64,
    pub proxy: Option<String>,
 }

-impl DelegationEvent {
-    pub fn from_mixnet_contract(
-        event: ContractDelegationEvent,
-        reg: &RegisteredCoins,
-    ) -> Result<Self, TypesError> {
-        Ok(match event {
-            ContractDelegationEvent::Delegate(delegation) => DelegationEvent {
-                kind: DelegationEventKind::Delegate,
-                block_height: delegation.block_height,
-                address: delegation.owner.into_string(),
-                node_identity: delegation.node_identity,
-                amount: Some(reg.attempt_convert_to_display_dec_coin(delegation.amount.into())?),
-                proxy: delegation.proxy.map(|p| p.into_string()),
-            },
-            ContractDelegationEvent::Undelegate(pending_undelegate) => DelegationEvent {
+impl TryFrom<ContractDelegationEvent> for DelegationEvent {
+    type Error = TypesError;
+
+    fn try_from(event: ContractDelegationEvent) -> Result<Self, Self::Error> {
+        match event {
+            ContractDelegationEvent::Delegate(delegation) => {
+                let amount: MajorCurrencyAmount = delegation.amount.into();
+                Ok(DelegationEvent {
+                    kind: DelegationEventKind::Delegate,
+                    block_height: delegation.block_height,
+                    address: delegation.owner.into_string(),
+                    node_identity: delegation.node_identity,
+                    amount: Some(amount),
+                    proxy: delegation.proxy.map(|p| p.into_string()),
+                })
+            }
+            ContractDelegationEvent::Undelegate(pending_undelegate) => Ok(DelegationEvent {
                kind: DelegationEventKind::Undelegate,
                block_height: pending_undelegate.block_height(),
                address: pending_undelegate.delegate().into_string(),
                node_identity: pending_undelegate.mix_identity(),
                amount: None,
                proxy: pending_undelegate.proxy().map(|p| p.into_string()),
-            },
-        })
+            }),
+        }
    }
 }

@@ -159,6 +200,30 @@ impl From<ContractPendingUndelegate> for PendingUndelegate {
    }
 }

+pub fn from_contract_delegation_events(
+    events: Vec<ContractDelegationEvent>,
+) -> Result<Vec<DelegationEvent>, TypesError> {
+    let (events, errors): (Vec<_>, Vec<_>) = events
+        .into_iter()
+        .map(|delegation_event| delegation_event.try_into())
+        .partition(Result::is_ok);
+
+    if errors.is_empty() {
+        let events = events
+            .into_iter()
+            .filter_map(|e| e.ok())
+            .collect::<Vec<DelegationEvent>>();
+        return Ok(events);
+    }
+    let errors = errors
+        .into_iter()
+        .filter_map(|e| e.err())
+        .collect::<Vec<TypesError>>();
+
+    error!("Failed to convert delegations: {:?}", errors);
+    Err(TypesError::DelegationsInvalid)
+}
+
 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
    feature = "generate-ts",
@@ -167,6 +232,6 @@ impl From<ContractPendingUndelegate> for PendingUndelegate {
 #[derive(Deserialize, Serialize)]
 pub struct DelegationsSummaryResponse {
    pub delegations: Vec<DelegationWithEverything>,
-    pub total_delegations: DecCoin,
-    pub total_rewards: DecCoin,
+    pub total_delegations: MajorCurrencyAmount,
+    pub total_rewards: MajorCurrencyAmount,
 }
@@ -4,7 +4,6 @@ use thiserror::Error;
 use validator_client::validator_api::error::ValidatorAPIError;
 use validator_client::{nymd::error::NymdError, ValidatorClientError};

-// TODO: ask @MS why this even exists
 #[derive(Error, Debug)]
 pub enum TypesError {
    #[error("{source}")]
@@ -64,12 +63,6 @@ pub enum TypesError {
    InvalidGatewayBond(),
    #[error("Invalid delegations")]
    DelegationsInvalid,
-    #[error("Attempted to use too huge currency exponent ({0})")]
-    UnsupportedExponent(u32),
-    #[error("Attempted to convert coin that would have resulted in loss of precision")]
-    LossyCoinConversion,
-    #[error("The provided coin has an unknown denomination - {0}")]
-    UnknownCoinDenom(String),
 }

 impl Serialize for TypesError {
@@ -1,4 +1,4 @@
-use crate::currency::DecCoin;
+use crate::currency::MajorCurrencyAmount;
 use serde::{Deserialize, Serialize};
 use validator_client::nymd::Fee;

@@ -8,16 +8,10 @@ use ts_rs::{Dependency, TS};
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct FeeDetails {
    // expected to be used by the wallet in order to display detailed fee information to the user
-    pub amount: Option<DecCoin>,
+    pub amount: Option<MajorCurrencyAmount>,
    pub fee: Fee,
 }

-impl FeeDetails {
-    pub fn new(amount: Option<DecCoin>, fee: Fee) -> Self {
-        FeeDetails { amount, fee }
-    }
-}
-
 #[cfg(feature = "generate-ts")]
 impl TS for FeeDetails {
    const EXPORT_TO: Option<&'static str> = Some("ts-packages/types/src/types/rust/FeeDetails.ts");
@@ -31,12 +25,13 @@ impl TS for FeeDetails {
    }

    fn inline() -> String {
-        "{ amount: DecCoin | null, fee: Fee }".into()
+        "{ amount: MajorCurrencyAmount | null, fee: Fee }".into()
    }

    fn dependencies() -> Vec<Dependency> {
        vec![
-            Dependency::from_ty::<DecCoin>().expect("TS was incorrectly defined on `DecCoin`"),
+            Dependency::from_ty::<MajorCurrencyAmount>()
+                .expect("TS was incorrectly defined on `CurrencyDenom`"),
            Dependency::from_ty::<ts_type_helpers::Fee>()
                .expect("TS was incorrectly defined on `ts_type_helpers::Fee`"),
        ]
@@ -1,29 +1,48 @@
+use crate::currency::MajorCurrencyAmount;
+use crate::error::TypesError;
 use cosmrs::tx::Gas as CosmrsGas;
 use serde::{Deserialize, Serialize};
 use validator_client::nymd::cosmwasm_client::types::GasInfo as ValidatorClientGasInfo;
+use validator_client::nymd::GasPrice;

 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
    feature = "generate-ts",
    ts(export_to = "ts-packages/types/src/types/rust/Gas.ts")
 )]
-#[derive(Deserialize, Serialize, Copy, Clone, Debug)]
+#[derive(Deserialize, Serialize, Clone)]
 pub struct Gas {
    /// units of gas used
    pub gas_units: u64,
+    //
+    // /// gas units converted to fee as major coin amount
+    // pub amount: MajorCurrencyAmount,
 }

 impl Gas {
-    pub fn from_u64(value: u64) -> Gas {
-        Gas { gas_units: value }
-    }
-}
+    pub fn from_cosmrs_gas(value: CosmrsGas, _denom_minor: &str) -> Result<Gas, TypesError> {
+        Ok(Gas {
+            gas_units: value.value(),
+        })

-impl From<CosmrsGas> for Gas {
-    fn from(gas: CosmrsGas) -> Self {
-        Gas {
-            gas_units: gas.value(),
-        }
+        // // TODO: use simulator struct to do conversion to fee
+        // let value_u128 = Uint128::from(value.value());
+        // let amount = Decimal::new(value_u128) * Decimal::from_str("0.0025")?;
+        // Ok(Gas {
+        //     gas_units: value.value(),
+        //     amount: MajorCurrencyAmount::from_minor_decimal_and_denom(amount, denom_minor)?,
+        // })
+    }
+    pub fn from_u64(value: u64, _denom_minor: &str) -> Result<Gas, TypesError> {
+        Ok(Gas { gas_units: value })
+        // todo!()
+        // // TODO: use simulator struct to do conversion to fee
+        // let value_u128 = Uint128::from(value);
+        // let amount = Decimal::new(value_u128) * Decimal::from_str("0.0025")?;
+        // Ok(Gas {
+        //     gas_units: value,
+        //     amount: MajorCurrencyAmount::from_minor_decimal_and_denom(amount, denom_minor)?,
+        // })
    }
 }

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

    /// GasUsed is the amount of gas actually consumed.
-    pub gas_used: Gas,
-}
+    pub gas_used: u64,

-impl From<ValidatorClientGasInfo> for GasInfo {
-    fn from(info: ValidatorClientGasInfo) -> Self {
-        GasInfo {
-            gas_wanted: info.gas_wanted.into(),
-            gas_used: info.gas_used.into(),
-        }
-    }
+    /// gas units converted to fee as major coin amount
+    pub fee: MajorCurrencyAmount,
 }

 impl GasInfo {
-    pub fn from_u64(gas_wanted: u64, gas_used: u64) -> GasInfo {
-        GasInfo {
-            gas_wanted: Gas::from_u64(gas_wanted),
-            gas_used: Gas::from_u64(gas_used),
-        }
+    pub fn from_validator_client_gas_info(
+        value: ValidatorClientGasInfo,
+        denom_minor: &str,
+    ) -> Result<GasInfo, TypesError> {
+        // terrible workaround, but I don't want to break the current flow (just yet)
+        let gas_price = GasPrice::new_with_default_price(denom_minor)?;
+        let fee = (&gas_price) * value.gas_used;
+        Ok(GasInfo {
+            gas_wanted: value.gas_wanted.value(),
+            gas_used: value.gas_used.value(),
+            fee: fee.into(),
+        })
+    }
+    pub fn from_u64(
+        gas_wanted: u64,
+        gas_used: u64,
+        denom_minor: &str,
+    ) -> Result<GasInfo, TypesError> {
+        // terrible workaround, but I don't want to break the current flow (just yet)
+        let gas_price = GasPrice::new_with_default_price(denom_minor)?;
+        let fee = (&gas_price) * CosmrsGas::from(gas_used);
+        Ok(GasInfo {
+            gas_wanted,
+            gas_used,
+            fee: fee.into(),
+        })
    }
 }
@@ -1,4 +1,4 @@
-use crate::currency::{DecCoin, RegisteredCoins};
+use crate::currency::MajorCurrencyAmount;
 use crate::error::TypesError;
 use mixnet_contract_common::{
    Gateway as MixnetContractGateway, GatewayBond as MixnetContractGatewayBond,
@@ -54,7 +54,7 @@ impl From<MixnetContractGateway> for Gateway {
 )]
 #[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
 pub struct GatewayBond {
-    pub pledge_amount: DecCoin,
+    pub pledge_amount: MajorCurrencyAmount,
    pub owner: String,
    pub block_height: u64,
    pub gateway: Gateway,
@@ -63,15 +63,38 @@ pub struct GatewayBond {

 impl GatewayBond {
    pub fn from_mixnet_contract_gateway_bond(
-        bond: MixnetContractGatewayBond,
-        reg: &RegisteredCoins,
-    ) -> Result<GatewayBond, TypesError> {
+        bond: Option<MixnetContractGatewayBond>,
+    ) -> Result<Option<GatewayBond>, TypesError> {
+        match bond {
+            Some(bond) => {
+                let bond: GatewayBond = bond.try_into()?;
+                Ok(Some(bond))
+            }
+            None => Ok(None),
+        }
+    }
+}
+
+impl TryFrom<MixnetContractGatewayBond> for GatewayBond {
+    type Error = TypesError;
+
+    fn try_from(value: MixnetContractGatewayBond) -> Result<Self, Self::Error> {
+        let MixnetContractGatewayBond {
+            pledge_amount,
+            owner,
+            block_height,
+            gateway,
+            proxy,
+        } = value;
+
+        let pledge_amount: MajorCurrencyAmount = pledge_amount.into();
+
        Ok(GatewayBond {
-            pledge_amount: reg.attempt_convert_to_display_dec_coin(bond.pledge_amount.into())?,
-            owner: bond.owner.to_string(),
-            block_height: bond.block_height,
-            gateway: bond.gateway.into(),
-            proxy: bond.proxy.map(|p| p.into_string()),
+            pledge_amount,
+            owner: owner.into_string(),
+            block_height,
+            gateway: gateway.into(),
+            proxy: proxy.map(|p| p.into_string()),
        })
    }
 }
@@ -1,11 +1,11 @@
-use crate::currency::{DecCoin, RegisteredCoins};
+use crate::currency::MajorCurrencyAmount;
 use crate::error::TypesError;
 use mixnet_contract_common::{
-    MixNode as MixnetContractMixNode, MixNodeBond as MixnetContractMixNodeBond,
+    Coin as CosmWasmCoin, MixNode as MixnetContractMixNode,
+    MixNodeBond as MixnetContractMixNodeBond,
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use validator_client::nymd::Coin;

 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
@@ -58,39 +58,67 @@ impl From<MixnetContractMixNode> for MixNode {
 )]
 #[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
 pub struct MixNodeBond {
-    pub pledge_amount: DecCoin,
-    pub total_delegation: DecCoin,
+    pub pledge_amount: MajorCurrencyAmount,
+    pub total_delegation: MajorCurrencyAmount,
    pub owner: String,
    pub layer: String,
    pub block_height: u64,
    pub mix_node: MixNode,
    pub proxy: Option<String>,
-    pub accumulated_rewards: Option<DecCoin>,
+    pub accumulated_rewards: Option<MajorCurrencyAmount>,
 }

 impl MixNodeBond {
    pub fn from_mixnet_contract_mixnode_bond(
-        bond: MixnetContractMixNodeBond,
-        reg: &RegisteredCoins,
-    ) -> Result<MixNodeBond, TypesError> {
-        let denom = bond.pledge_amount.denom.clone();
+        bond: Option<MixnetContractMixNodeBond>,
+    ) -> Result<Option<MixNodeBond>, TypesError> {
+        match bond {
+            Some(bond) => {
+                let bond: MixNodeBond = bond.try_into()?;
+                Ok(Some(bond))
+            }
+            None => Ok(None),
+        }
+    }
+}
+
+impl TryFrom<MixnetContractMixNodeBond> for MixNodeBond {
+    type Error = TypesError;
+
+    fn try_from(value: MixnetContractMixNodeBond) -> Result<Self, Self::Error> {
+        let MixnetContractMixNodeBond {
+            pledge_amount,
+            total_delegation,
+            owner,
+            layer,
+            block_height,
+            mix_node,
+            proxy,
+            accumulated_rewards,
+        } = value;
+
+        if pledge_amount.denom != total_delegation.denom {
+            return Err(TypesError::InvalidDenom(
+                "The pledge and delegation denominations do not match".to_string(),
+            ));
+        }
+
+        let denom = total_delegation.denom.clone();
+
+        let pledge_amount: MajorCurrencyAmount = pledge_amount.into();
+        let total_delegation: MajorCurrencyAmount = total_delegation.into();
+        let accumulated_rewards: Option<MajorCurrencyAmount> =
+            accumulated_rewards.map(|r| CosmWasmCoin::new(r.u128(), denom).into());
+
        Ok(MixNodeBond {
-            pledge_amount: reg.attempt_convert_to_display_dec_coin(bond.pledge_amount.into())?,
-            total_delegation: reg
-                .attempt_convert_to_display_dec_coin(bond.total_delegation.into())?,
-            owner: bond.owner.into_string(),
-            layer: bond.layer.into(),
-            block_height: bond.block_height,
-            mix_node: bond.mix_node.into(),
-            proxy: bond.proxy.map(|p| p.to_string()),
-            accumulated_rewards: bond
-                .accumulated_rewards
-                .map(|reward| {
-                    // here we're making an assumption that rewards always use the same denom as the pledge
-                    // (which I think is a reasonable assumption)
-                    reg.attempt_convert_to_display_dec_coin(Coin::new(reward.u128(), denom))
-                })
-                .transpose()?,
+            pledge_amount,
+            total_delegation,
+            owner: owner.into_string(),
+            layer: layer.into(),
+            block_height,
+            mix_node: mix_node.into(),
+            proxy: proxy.map(|p| p.into_string()),
+            accumulated_rewards,
        })
    }
 }
@@ -1,6 +1,6 @@
-use crate::currency::DecCoin;
+use crate::currency::MajorCurrencyAmount;
 use crate::error::TypesError;
-use crate::gas::{Gas, GasInfo};
+use crate::gas::GasInfo;
 use serde::{Deserialize, Serialize};
 use validator_client::nymd::cosmwasm_client::types::ExecuteResult;
 use validator_client::nymd::TxResponse;
@@ -15,23 +15,31 @@ pub struct SendTxResult {
    pub block_height: u64,
    pub code: u32,
    pub details: TransactionDetails,
-    pub gas_used: Gas,
-    pub gas_wanted: Gas,
+    pub gas_used: u64,
+    pub gas_wanted: u64,
    pub tx_hash: String,
-    pub fee: Option<DecCoin>,
+    // pub fee: MajorCurrencyAmount,
 }

 impl SendTxResult {
-    pub fn new(t: TxResponse, details: TransactionDetails, fee: Option<DecCoin>) -> SendTxResult {
-        SendTxResult {
+    pub fn new(
+        t: TxResponse,
+        details: TransactionDetails,
+        _denom_minor: &str,
+    ) -> Result<SendTxResult, TypesError> {
+        Ok(SendTxResult {
            block_height: t.height.value(),
            code: t.tx_result.code.value(),
            details,
-            gas_used: t.tx_result.gas_used.into(),
-            gas_wanted: t.tx_result.gas_wanted.into(),
+            gas_used: t.tx_result.gas_used.value(),
+            gas_wanted: t.tx_result.gas_wanted.value(),
            tx_hash: t.hash.to_string(),
-            fee,
-        }
+            // that is completely wrong: fee is what you told the validator to use beforehand
+            // fee: MajorCurrencyAmount::from_decimal_and_denom(
+            //     Decimal::new(Uint128::from(t.tx_result.gas_used.value())),
+            //     denom_minor.to_string(),
+            // )?,
+        })
    }
 }

@@ -42,21 +50,11 @@ impl SendTxResult {
 )]
 #[derive(Deserialize, Serialize, Debug)]
 pub struct TransactionDetails {
-    pub amount: DecCoin,
+    pub amount: MajorCurrencyAmount,
    pub from_address: String,
    pub to_address: String,
 }

-impl TransactionDetails {
-    pub fn new(amount: DecCoin, from_address: String, to_address: String) -> Self {
-        TransactionDetails {
-            amount,
-            from_address,
-            to_address,
-        }
-    }
-}
-
 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
    feature = "generate-ts",
@@ -68,16 +66,18 @@ pub struct TransactionExecuteResult {
    pub data_json: String,
    pub transaction_hash: String,
    pub gas_info: GasInfo,
-    pub fee: Option<DecCoin>,
+    pub fee: MajorCurrencyAmount,
 }

 impl TransactionExecuteResult {
    pub fn from_execute_result(
        value: ExecuteResult,
-        fee: Option<DecCoin>,
+        denom_minor: &str,
    ) -> Result<TransactionExecuteResult, TypesError> {
+        let gas_info = GasInfo::from_validator_client_gas_info(value.gas_info, denom_minor)?;
+        let fee = gas_info.fee.clone();
        Ok(TransactionExecuteResult {
-            gas_info: value.gas_info.into(),
+            gas_info,
            transaction_hash: value.transaction_hash.to_string(),
            data_json: ::serde_json::to_string_pretty(&value.data)?,
            logs_json: ::serde_json::to_string_pretty(&value.logs)?,
@@ -97,24 +97,30 @@ pub struct RpcTransactionResponse {
    pub tx_result_json: String,
    pub block_height: u64,
    pub transaction_hash: String,
-    pub gas_used: Gas,
-    pub gas_wanted: Gas,
-    pub fee: Option<DecCoin>,
+    pub gas_info: GasInfo,
+    // pub fee: MajorCurrencyAmount,
 }

 impl RpcTransactionResponse {
    pub fn from_tx_response(
-        t: &TxResponse,
-        fee: Option<DecCoin>,
+        value: &TxResponse,
+        denom_minor: &str,
    ) -> Result<RpcTransactionResponse, TypesError> {
        Ok(RpcTransactionResponse {
-            index: t.index,
-            gas_used: t.tx_result.gas_used.into(),
-            gas_wanted: t.tx_result.gas_wanted.into(),
-            transaction_hash: t.hash.to_string(),
-            tx_result_json: ::serde_json::to_string_pretty(&t.tx_result)?,
-            block_height: t.height.value(),
-            fee,
+            index: value.index,
+            gas_info: GasInfo::from_u64(
+                value.tx_result.gas_wanted.value(),
+                value.tx_result.gas_used.value(),
+                denom_minor,
+            )?,
+            transaction_hash: value.hash.to_string(),
+            tx_result_json: ::serde_json::to_string_pretty(&value.tx_result)?,
+            block_height: value.height.value(),
+            // wrong
+            // fee: MajorCurrencyAmount::from_decimal_and_denom(
+            //     Decimal::new(Uint128::from(value.tx_result.gas_used.value())),
+            //     denom_minor.to_string(),
+            // )?,
        })
    }
 }
@@ -1,10 +1,10 @@
-use crate::currency::{DecCoin, RegisteredCoins};
+use crate::currency::MajorCurrencyAmount;
 use crate::error::TypesError;
 use serde::{Deserialize, Serialize};
-use vesting_contract::vesting::Account as ContractVestingAccount;
-use vesting_contract::vesting::VestingPeriod as ContractVestingPeriod;
-use vesting_contract_common::OriginalVestingResponse as ContractOriginalVestingResponse;
-use vesting_contract_common::PledgeData as ContractPledgeData;
+use vesting_contract::vesting::Account as VestingAccount;
+use vesting_contract::vesting::VestingPeriod as VestingVestingPeriod;
+use vesting_contract_common::OriginalVestingResponse as VestingOriginalVestingResponse;
+use vesting_contract_common::PledgeData as VestingPledgeData;

 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
@@ -13,22 +13,28 @@ use vesting_contract_common::PledgeData as ContractPledgeData;
 )]
 #[derive(Serialize, Deserialize, Debug)]
 pub struct PledgeData {
-    pub amount: DecCoin,
+    pub amount: MajorCurrencyAmount,
    pub block_time: u64,
 }

-impl PledgeData {
-    pub fn from_vesting_contract(
-        pledge: ContractPledgeData,
-        reg: &RegisteredCoins,
-    ) -> Result<Self, TypesError> {
-        Ok(PledgeData {
-            amount: reg.attempt_convert_to_display_dec_coin(pledge.amount.into())?,
-            block_time: pledge.block_time.seconds(),
+impl TryFrom<VestingPledgeData> for PledgeData {
+    type Error = TypesError;
+
+    fn try_from(data: VestingPledgeData) -> Result<Self, Self::Error> {
+        let amount: MajorCurrencyAmount = data.amount().into();
+        Ok(Self {
+            amount,
+            block_time: data.block_time().seconds(),
        })
    }
 }

+impl PledgeData {
+    pub fn and_then(data: VestingPledgeData) -> Option<Self> {
+        data.try_into().ok()
+    }
+}
+
 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
    feature = "generate-ts",
@@ -36,20 +42,20 @@ impl PledgeData {
 )]
 #[derive(Serialize, Deserialize, Debug)]
 pub struct OriginalVestingResponse {
-    amount: DecCoin,
+    amount: MajorCurrencyAmount,
    number_of_periods: usize,
    period_duration: u64,
 }

-impl OriginalVestingResponse {
-    pub fn from_vesting_contract(
-        res: ContractOriginalVestingResponse,
-        reg: &RegisteredCoins,
-    ) -> Result<Self, TypesError> {
-        Ok(OriginalVestingResponse {
-            amount: reg.attempt_convert_to_display_dec_coin(res.amount.into())?,
-            number_of_periods: res.number_of_periods,
-            period_duration: res.period_duration,
+impl TryFrom<VestingOriginalVestingResponse> for OriginalVestingResponse {
+    type Error = TypesError;
+
+    fn try_from(data: VestingOriginalVestingResponse) -> Result<Self, Self::Error> {
+        let amount = data.amount().into();
+        Ok(Self {
+            amount,
+            number_of_periods: data.number_of_periods(),
+            period_duration: data.period_duration(),
        })
    }
 }
@@ -65,20 +71,24 @@ pub struct VestingAccountInfo {
    staking_address: Option<String>,
    start_time: u64,
    periods: Vec<VestingPeriod>,
-    amount: DecCoin,
+    amount: MajorCurrencyAmount,
 }

-impl VestingAccountInfo {
-    pub fn from_vesting_contract(
-        account: ContractVestingAccount,
-        reg: &RegisteredCoins,
-    ) -> Result<Self, TypesError> {
-        Ok(VestingAccountInfo {
+impl TryFrom<VestingAccount> for VestingAccountInfo {
+    type Error = TypesError;
+
+    fn try_from(account: VestingAccount) -> Result<Self, Self::Error> {
+        let mut periods = Vec::new();
+        for period in account.periods() {
+            periods.push(period.into());
+        }
+        let amount: MajorCurrencyAmount = account.coin().into();
+        Ok(Self {
            owner_address: account.owner_address().to_string(),
            staking_address: account.staking_address().map(|a| a.to_string()),
            start_time: account.start_time().seconds(),
-            periods: account.periods().into_iter().map(Into::into).collect(),
-            amount: reg.attempt_convert_to_display_dec_coin(account.coin.into())?,
+            periods,
+            amount,
        })
    }
 }
@@ -94,8 +104,8 @@ pub struct VestingPeriod {
    period_seconds: u64,
 }

-impl From<ContractVestingPeriod> for VestingPeriod {
-    fn from(period: ContractVestingPeriod) -> Self {
+impl From<VestingVestingPeriod> for VestingPeriod {
+    fn from(period: VestingVestingPeriod) -> Self {
        Self {
            start_time: period.start_time,
            period_seconds: period.period_seconds,
@@ -50,6 +50,7 @@ name = "bandwidth-claim"
 version = "1.0.0"
 dependencies = [
 "bandwidth-claim-contract",
+ "config",
 "cosmwasm-std",
 "cosmwasm-storage",
 "schemars",
@@ -220,11 +221,12 @@ version = "0.1.0"
 dependencies = [
 "bandwidth-claim-contract",
 "coconut-bandwidth-contract-common",
+ "config",
 "cosmwasm-std",
 "cosmwasm-storage",
 "cw-controllers",
+ "cw-multi-test",
 "cw-storage-plus",
- "multisig-contract-common",
 "schemars",
 "serde",
 "thiserror",
@@ -235,32 +237,10 @@ name = "coconut-bandwidth-contract-common"
 version = "0.1.0"
 dependencies = [
 "cosmwasm-std",
- "multisig-contract-common",
 "schemars",
 "serde",
 ]

-[[package]]
-name = "coconut-test"
-version = "0.1.0"
-dependencies = [
- "bandwidth-claim-contract",
- "coconut-bandwidth",
- "coconut-bandwidth-contract-common",
- "cosmwasm-std",
- "cosmwasm-storage",
- "cw-controllers",
- "cw-multi-test",
- "cw-storage-plus",
- "cw-utils",
- "cw3-flex-multisig",
- "cw4-group",
- "multisig-contract-common",
- "schemars",
- "serde",
- "thiserror",
-]
-
 [[package]]
 name = "config"
 version = "0.1.0"
@@ -612,12 +592,6 @@ dependencies = [
 "generic-array 0.14.5",
 ]

-[[package]]
-name = "dotenv"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
-
 [[package]]
 name = "dyn-clone"
 version = "1.0.4"
@@ -1082,6 +1056,7 @@ dependencies = [
 "cosmwasm-std",
 "fixed",
 "log",
+ "network-defaults",
 "schemars",
 "serde",
 "serde_repr",
@@ -1107,7 +1082,6 @@ name = "network-defaults"
 version = "0.1.0"
 dependencies = [
 "cfg-if",
- "dotenv",
 "hex-literal",
 "once_cell",
 "serde",
@@ -1392,18 +1366,18 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.6.0"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
 dependencies = [
 "regex-syntax",
 ]

 [[package]]
 name = "regex-syntax"
-version = "0.6.27"
+version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"

 [[package]]
 name = "rfc6979"
@@ -1854,6 +1828,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 name = "vesting-contract"
 version = "1.0.1"
 dependencies = [
+ "config",
 "cosmwasm-std",
 "cw-storage-plus",
 "mixnet-contract-common",
@@ -1,5 +1,5 @@
 [workspace]
-members = ["bandwidth-claim", "coconut-bandwidth", "mixnet", "vesting", "multisig/cw3-flex-multisig", "multisig/cw4-group", "coconut-test"]
+members = ["bandwidth-claim", "coconut-bandwidth", "mixnet", "vesting", "multisig/cw3-flex-multisig", "multisig/cw4-group"]

 [profile.release]
 opt-level = 3
@@ -9,6 +9,8 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]

 [dev-dependencies]
+config = { path = "../../common/config"}
+
 [dependencies]
 bandwidth-claim-contract = { path = "../../common/bandwidth-claim-contract" }

@@ -62,11 +62,10 @@ pub fn migrate(_deps: DepsMut<'_>, _env: Env, _msg: MigrateMsg) -> Result<Respon
 pub mod tests {
    use super::*;
    use bandwidth_claim_contract::payment::PagedPaymentResponse;
+    use config::defaults::MIX_DENOM;
    use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
    use cosmwasm_std::{coins, from_binary};

-    const TEST_MIX_DENOM: &str = "unym";
-
    #[test]
    fn initialize_contract() {
        let mut deps = mock_dependencies();
@@ -92,11 +91,11 @@ pub mod tests {

        // Contract balance should match what we initialized it as
        assert_eq!(
-            coins(0, TEST_MIX_DENOM),
+            coins(0, MIX_DENOM.base),
            vec![deps
                .as_ref()
                .querier
-                .query_balance(env.contract.address, TEST_MIX_DENOM)
+                .query_balance(env.contract.address, MIX_DENOM.base)
                .unwrap()]
        );
    }
@@ -11,7 +11,7 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 bandwidth-claim-contract = { path = "../../common/bandwidth-claim-contract" }
 coconut-bandwidth-contract-common = { path = "../../common/cosmwasm-smart-contracts/coconut-bandwidth-contract" }
-multisig-contract-common = { path = "../../common/cosmwasm-smart-contracts/multisig-contract" }
+config = { path = "../../common/config"}

 cosmwasm-std = "1.0.0"
 cosmwasm-storage = "1.0.0"
@@ -21,3 +21,6 @@ cw-controllers = "0.13.4"
 schemars = "0.8"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = "1.0.23"
+
+[dev-dependencies]
+cw-multi-test = { version = "0.13.2" }
@@ -1,14 +1,11 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use cosmwasm_std::{
-    entry_point, to_binary, Binary, Deps, DepsMut, Env, MessageInfo, Response, StdResult,
-};
+use cosmwasm_std::{entry_point, Binary, Deps, DepsMut, Env, MessageInfo, Response, StdResult};

 use coconut_bandwidth_contract_common::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};

 use crate::error::ContractError;
-use crate::queries::{query_all_spent_credentials_paged, query_spent_credential};
 use crate::state::{Config, ADMIN, CONFIG};
 use crate::transactions;

@@ -25,14 +22,12 @@ pub fn instantiate(
 ) -> Result<Response, ContractError> {
    let multisig_addr = deps.api.addr_validate(&msg.multisig_addr)?;
    let pool_addr = deps.api.addr_validate(&msg.pool_addr)?;
-    let mix_denom = msg.mix_denom;

    ADMIN.set(deps.branch(), Some(multisig_addr.clone()))?;

    let cfg = Config {
        multisig_addr,
        pool_addr,
-        mix_denom,
    };
    CONFIG.save(deps.storage, &cfg)?;

@@ -49,23 +44,13 @@ pub fn execute(
 ) -> Result<Response, ContractError> {
    match msg {
        ExecuteMsg::DepositFunds { data } => transactions::deposit_funds(deps, env, info, data),
-        ExecuteMsg::SpendCredential { data } => {
-            transactions::spend_credential(deps, env, info, data)
-        }
        ExecuteMsg::ReleaseFunds { funds } => transactions::release_funds(deps, env, info, funds),
    }
 }

 #[entry_point]
-pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
-    match msg {
-        QueryMsg::GetAllSpentCredentials { limit, start_after } => to_binary(
-            &query_all_spent_credentials_paged(deps, start_after, limit)?,
-        ),
-        QueryMsg::GetSpentCredential {
-            blinded_serial_number,
-        } => to_binary(&query_spent_credential(deps, blinded_serial_number)?),
-    }
+pub fn query(_deps: Deps, _env: Env, _msg: QueryMsg) -> StdResult<Binary> {
+    unimplemented!();
 }

 #[entry_point]
@@ -76,10 +61,12 @@ pub fn migrate(_deps: DepsMut<'_>, _env: Env, _msg: MigrateMsg) -> Result<Respon
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::support::tests::fixtures::TEST_MIX_DENOM;
    use crate::support::tests::helpers::*;
-    use cosmwasm_std::coins;
+    use coconut_bandwidth_contract_common::deposit::DepositData;
+    use config::defaults::MIX_DENOM;
    use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
+    use cosmwasm_std::{coins, Addr};
+    use cw_multi_test::Executor;

    #[test]
    fn initialize_contract() {
@@ -88,7 +75,6 @@ mod tests {
        let msg = InstantiateMsg {
            multisig_addr: String::from(MULTISIG_CONTRACT),
            pool_addr: String::from(POOL_CONTRACT),
-            mix_denom: TEST_MIX_DENOM.to_string(),
        };
        let info = mock_info("creator", &[]);

@@ -97,12 +83,80 @@ mod tests {

        // Contract balance should be 0
        assert_eq!(
-            coins(0, TEST_MIX_DENOM),
+            coins(0, MIX_DENOM.base),
            vec![deps
                .as_ref()
                .querier
-                .query_balance(env.contract.address, TEST_MIX_DENOM)
+                .query_balance(env.contract.address, MIX_DENOM.base)
                .unwrap()]
        );
    }
+
+    #[test]
+    fn deposit_and_release() {
+        let init_funds = coins(10, MIX_DENOM.base);
+        let deposit_funds = coins(1, MIX_DENOM.base);
+        let release_funds = coins(2, MIX_DENOM.base);
+        let mut app = mock_app(&init_funds);
+        let multisig_addr = String::from(MULTISIG_CONTRACT);
+        let pool_addr = String::from(POOL_CONTRACT);
+
+        let code_id = app.store_code(contract_bandwidth());
+        let msg = InstantiateMsg {
+            multisig_addr: multisig_addr.clone(),
+            pool_addr: pool_addr.clone(),
+        };
+        let contract_addr = app
+            .instantiate_contract(
+                code_id,
+                Addr::unchecked(OWNER),
+                &msg,
+                &[],
+                "bandwidth",
+                None,
+            )
+            .unwrap();
+
+        let msg = ExecuteMsg::DepositFunds {
+            data: DepositData::new(
+                String::from("info"),
+                String::from("id"),
+                String::from("enc"),
+            ),
+        };
+        app.execute_contract(
+            Addr::unchecked(OWNER),
+            contract_addr.clone(),
+            &msg,
+            &deposit_funds,
+        )
+        .unwrap();
+
+        // try to release more then it's in the contract
+        let msg = ExecuteMsg::ReleaseFunds {
+            funds: release_funds[0].clone(),
+        };
+        let err = app
+            .execute_contract(
+                Addr::unchecked(multisig_addr.clone()),
+                contract_addr.clone(),
+                &msg,
+                &[],
+            )
+            .unwrap_err();
+        assert_eq!(ContractError::NotEnoughFunds, err.downcast().unwrap());
+
+        let msg = ExecuteMsg::ReleaseFunds {
+            funds: deposit_funds[0].clone(),
+        };
+        app.execute_contract(
+            Addr::unchecked(multisig_addr),
+            contract_addr.clone(),
+            &msg,
+            &[],
+        )
+        .unwrap();
+        let pool_bal = app.wrap().query_balance(pool_addr, MIX_DENOM.base).unwrap();
+        assert_eq!(pool_bal, deposit_funds[0]);
+    }
 }
@@ -5,6 +5,8 @@ use cosmwasm_std::StdError;
 use cw_controllers::AdminError;
 use thiserror::Error;

+use config::defaults::MIX_DENOM;
+
 /// Custom errors for contract failure conditions.
 ///
 /// Add any other custom errors you like here.
@@ -20,15 +22,12 @@ pub enum ContractError {
    #[error("No coin was sent for voucher")]
    NoCoin,

-    #[error("Wrong coin denomination, you must send {mix_denom}")]
-    WrongDenom { mix_denom: String },
+    #[error("Wrong coin denomination, you must send {}", MIX_DENOM.base)]
+    WrongDenom,

    #[error("There aren't enough funds in the contract")]
    NotEnoughFunds,

-    #[error("Credential already spent or in process of spending")]
-    DuplicateBlindedSerialNumber,
-
    #[error("{0}")]
    Admin(#[from] AdminError),
 }
@@ -2,9 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 pub mod contract;
-pub mod error;
-mod queries;
+mod error;
 mod state;
-mod storage;
 mod support;
 mod transactions;
@@ -1,178 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use coconut_bandwidth_contract_common::spend_credential::{
-    PagedSpendCredentialResponse, SpendCredential, SpendCredentialResponse,
-};
-use cosmwasm_std::{Deps, Order, StdResult};
-use cw_storage_plus::Bound;
-
-use crate::storage::{self, SPEND_CREDENTIAL_PAGE_DEFAULT_LIMIT, SPEND_CREDENTIAL_PAGE_MAX_LIMIT};
-
-pub(crate) fn query_all_spent_credentials_paged(
-    deps: Deps<'_>,
-    start_after: Option<String>,
-    limit: Option<u32>,
-) -> StdResult<PagedSpendCredentialResponse> {
-    let limit = limit
-        .unwrap_or(SPEND_CREDENTIAL_PAGE_DEFAULT_LIMIT)
-        .min(SPEND_CREDENTIAL_PAGE_MAX_LIMIT) as usize;
-
-    let start = start_after.as_deref().map(Bound::exclusive);
-
-    let nodes = storage::spent_credentials()
-        .range(deps.storage, start, None, Order::Ascending)
-        .take(limit)
-        .map(|res| res.map(|item| item.1))
-        .collect::<StdResult<Vec<SpendCredential>>>()?;
-
-    let start_next_after = nodes
-        .last()
-        .map(|spend_credential| spend_credential.blinded_serial_number().to_string());
-
-    Ok(PagedSpendCredentialResponse::new(
-        nodes,
-        limit,
-        start_next_after,
-    ))
-}
-
-pub(crate) fn query_spent_credential(
-    deps: Deps<'_>,
-    blinded_serial_number: String,
-) -> StdResult<SpendCredentialResponse> {
-    let spend_credential =
-        storage::spent_credentials().may_load(deps.storage, &blinded_serial_number)?;
-    Ok(SpendCredentialResponse::new(spend_credential))
-}
-
-#[cfg(test)]
-pub(crate) mod tests {
-    use super::*;
-    use crate::support::tests::fixtures::spend_credential_data_fixture;
-    use crate::support::tests::helpers::init_contract;
-    use crate::transactions::spend_credential;
-    use cosmwasm_std::testing::{mock_env, mock_info};
-
-    #[test]
-    fn spent_credentials_empty_on_init() {
-        let deps = init_contract();
-        let response =
-            query_all_spent_credentials_paged(deps.as_ref(), None, Option::from(2)).unwrap();
-        assert_eq!(0, response.spend_credentials.len());
-    }
-
-    #[test]
-    fn spent_credentials_paged_retrieval_obeys_limits() {
-        let mut deps = init_contract();
-        let env = mock_env();
-        let info = mock_info("requester", &[]);
-        let limit = 2;
-        for n in 0..1000 {
-            let data = spend_credential_data_fixture(&format!("blinded_serial_number{}", n));
-            spend_credential(deps.as_mut(), env.clone(), info.clone(), data).unwrap();
-        }
-
-        let page1 =
-            query_all_spent_credentials_paged(deps.as_ref(), None, Option::from(limit)).unwrap();
-        assert_eq!(limit, page1.spend_credentials.len() as u32);
-    }
-
-    #[test]
-    fn spent_credentials_paged_retrieval_has_default_limit() {
-        let mut deps = init_contract();
-        let env = mock_env();
-        let info = mock_info("requester", &[]);
-        for n in 0..1000 {
-            let data = spend_credential_data_fixture(&format!("blinded_serial_number{}", n));
-            spend_credential(deps.as_mut(), env.clone(), info.clone(), data).unwrap();
-        }
-
-        // query without explicitly setting a limit
-        let page1 = query_all_spent_credentials_paged(deps.as_ref(), None, None).unwrap();
-
-        assert_eq!(
-            SPEND_CREDENTIAL_PAGE_DEFAULT_LIMIT,
-            page1.spend_credentials.len() as u32
-        );
-    }
-
-    #[test]
-    fn spent_credentials_paged_retrieval_has_max_limit() {
-        let mut deps = init_contract();
-        let env = mock_env();
-        let info = mock_info("requester", &[]);
-        for n in 0..1000 {
-            let data = spend_credential_data_fixture(&format!("blinded_serial_number{}", n));
-            spend_credential(deps.as_mut(), env.clone(), info.clone(), data).unwrap();
-        }
-
-        // query with a crazily high limit in an attempt to use too many resources
-        let crazy_limit = 1000 * SPEND_CREDENTIAL_PAGE_MAX_LIMIT;
-        let page1 =
-            query_all_spent_credentials_paged(deps.as_ref(), None, Option::from(crazy_limit))
-                .unwrap();
-
-        // we default to a decent sized upper bound instead
-        let expected_limit = SPEND_CREDENTIAL_PAGE_MAX_LIMIT;
-        assert_eq!(expected_limit, page1.spend_credentials.len() as u32);
-    }
-
-    #[test]
-    fn spent_credentials_pagination_works() {
-        let mut deps = init_contract();
-        let env = mock_env();
-        let info = mock_info("requester", &[]);
-
-        let data = spend_credential_data_fixture("blinded_serial_number1");
-        spend_credential(deps.as_mut(), env.clone(), info.clone(), data).unwrap();
-
-        let per_page = 2;
-        let page1 =
-            query_all_spent_credentials_paged(deps.as_ref(), None, Option::from(per_page)).unwrap();
-
-        // page should have 1 result on it
-        assert_eq!(1, page1.spend_credentials.len());
-
-        // save another
-        let data = spend_credential_data_fixture("blinded_serial_number2");
-        spend_credential(deps.as_mut(), env.clone(), info.clone(), data).unwrap();
-
-        // page1 should have 2 results on it
-        let page1 =
-            query_all_spent_credentials_paged(deps.as_ref(), None, Option::from(per_page)).unwrap();
-        assert_eq!(2, page1.spend_credentials.len());
-
-        let data = spend_credential_data_fixture("blinded_serial_number3");
-        spend_credential(deps.as_mut(), env.clone(), info.clone(), data).unwrap();
-
-        // page1 still has 2 results
-        let page1 =
-            query_all_spent_credentials_paged(deps.as_ref(), None, Option::from(per_page)).unwrap();
-        assert_eq!(2, page1.spend_credentials.len());
-
-        // retrieving the next page should start after the last key on this page
-        let start_after = page1.start_next_after.unwrap();
-        let page2 = query_all_spent_credentials_paged(
-            deps.as_ref(),
-            Option::from(start_after.clone()),
-            Option::from(per_page),
-        )
-        .unwrap();
-
-        assert_eq!(1, page2.spend_credentials.len());
-
-        let data = spend_credential_data_fixture("blinded_serial_number4");
-        spend_credential(deps.as_mut(), env, info, data).unwrap();
-
-        let page2 = query_all_spent_credentials_paged(
-            deps.as_ref(),
-            Option::from(start_after),
-            Option::from(per_page),
-        )
-        .unwrap();
-
-        // now we have 2 pages, with 2 results on the second page
-        assert_eq!(2, page2.spend_credentials.len());
-    }
-}
@@ -13,7 +13,6 @@ pub const ADMIN: Admin = Admin::new("admin");
 pub struct Config {
    pub multisig_addr: Addr,
    pub pool_addr: Addr,
-    pub mix_denom: String,
 }

 pub const CONFIG: Item<Config> = Item::new("config");
@@ -1,106 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use coconut_bandwidth_contract_common::spend_credential::SpendCredential;
-use cw_storage_plus::{Index, IndexList, IndexedMap, UniqueIndex};
-
-// storage prefixes
-const SPEND_CREDENTIAL_PK_NAMESPACE: &str = "sc";
-const SPEND_CREDENTIAL_BLINDED_SERIAL_NO_IDX_NAMESPACE: &str = "scn";
-
-// paged retrieval limits for all queries and transactions
-pub(crate) const SPEND_CREDENTIAL_PAGE_MAX_LIMIT: u32 = 75;
-pub(crate) const SPEND_CREDENTIAL_PAGE_DEFAULT_LIMIT: u32 = 50;
-
-pub(crate) struct SpendCredentialIndex<'a> {
-    pub(crate) blinded_serial_number: UniqueIndex<'a, String, SpendCredential>,
-}
-
-// IndexList is just boilerplate code for fetching a struct's indexes
-// note that from my understanding this will be converted into a macro at some point in the future
-impl<'a> IndexList<SpendCredential> for SpendCredentialIndex<'a> {
-    fn get_indexes(&'_ self) -> Box<dyn Iterator<Item = &'_ dyn Index<SpendCredential>> + '_> {
-        let v: Vec<&dyn Index<SpendCredential>> = vec![&self.blinded_serial_number];
-        Box::new(v.into_iter())
-    }
-}
-
-// gateways() is the storage access function.
-pub(crate) fn spent_credentials<'a>(
-) -> IndexedMap<'a, &'a str, SpendCredential, SpendCredentialIndex<'a>> {
-    let indexes = SpendCredentialIndex {
-        blinded_serial_number: UniqueIndex::new(
-            |d| d.blinded_serial_number().to_string(),
-            SPEND_CREDENTIAL_BLINDED_SERIAL_NO_IDX_NAMESPACE,
-        ),
-    };
-    IndexedMap::new(SPEND_CREDENTIAL_PK_NAMESPACE, indexes)
-}
-
-// currently not used outside tests
-#[cfg(test)]
-mod tests {
-    use super::super::storage;
-    use crate::storage::SpendCredential;
-    use crate::support::tests::fixtures;
-    use crate::support::tests::fixtures::TEST_MIX_DENOM;
-    use coconut_bandwidth_contract_common::spend_credential::SpendCredentialStatus;
-    use cosmwasm_std::testing::MockStorage;
-    use cosmwasm_std::Addr;
-    use cosmwasm_std::Coin;
-
-    #[test]
-    fn spend_credential_single_read_retrieval() {
-        let mut storage = MockStorage::new();
-        let blind_serial_number1 = "number1";
-        let blind_serial_number2 = "number2";
-        let spend1 = fixtures::spend_credential_fixture(blind_serial_number1);
-        let spend2 = fixtures::spend_credential_fixture(blind_serial_number2);
-        storage::spent_credentials()
-            .save(&mut storage, blind_serial_number1, &spend1)
-            .unwrap();
-        storage::spent_credentials()
-            .save(&mut storage, blind_serial_number2, &spend2)
-            .unwrap();
-
-        let res1 = storage::spent_credentials()
-            .load(&storage, blind_serial_number1)
-            .unwrap();
-        let res2 = storage::spent_credentials()
-            .load(&storage, blind_serial_number2)
-            .unwrap();
-        assert_eq!(spend1, res1);
-        assert_eq!(spend2, res2);
-    }
-
-    #[test]
-    fn mark_as_spent_credential() {
-        let mut mock_storage = MockStorage::new();
-        let funds = Coin::new(100, TEST_MIX_DENOM);
-        let blind_serial_number = "blind_serial_number";
-        let gateway_cosmos_address: Addr = Addr::unchecked("gateway_cosmos_address");
-
-        let res = storage::spent_credentials()
-            .may_load(&mock_storage, blind_serial_number)
-            .unwrap();
-        assert!(res.is_none());
-
-        let mut spend_credential = SpendCredential::new(
-            funds.clone(),
-            blind_serial_number.to_string(),
-            gateway_cosmos_address.clone(),
-        );
-        spend_credential.mark_as_spent();
-
-        storage::spent_credentials()
-            .save(&mut mock_storage, blind_serial_number, &spend_credential)
-            .unwrap();
-
-        let ret = storage::spent_credentials()
-            .load(&mock_storage, blind_serial_number)
-            .unwrap();
-
-        assert_eq!(ret, spend_credential);
-        assert_eq!(ret.status(), SpendCredentialStatus::Spent);
-    }
-}
@@ -1,5 +1,3 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
-
-#[cfg(test)]
 pub mod tests;
@@ -0,0 +1,45 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(test)]
+pub mod helpers {
+    pub const OWNER: &str = "admin0001";
+    pub const MULTISIG_CONTRACT: &str = "multisig contract address";
+    pub const POOL_CONTRACT: &str = "mix pool contract address";
+
+    use crate::contract::instantiate;
+    use coconut_bandwidth_contract_common::msg::InstantiateMsg;
+    use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info, MockApi, MockQuerier};
+    use cosmwasm_std::{Addr, Coin, Empty, MemoryStorage, OwnedDeps};
+    use cw_multi_test::{App, AppBuilder, Contract, ContractWrapper};
+
+    pub fn init_contract() -> OwnedDeps<MemoryStorage, MockApi, MockQuerier<Empty>> {
+        let mut deps = mock_dependencies();
+        let msg = InstantiateMsg {
+            multisig_addr: String::from(MULTISIG_CONTRACT),
+            pool_addr: String::from(POOL_CONTRACT),
+        };
+        let env = mock_env();
+        let info = mock_info("creator", &[]);
+        instantiate(deps.as_mut(), env.clone(), info, msg).unwrap();
+        deps
+    }
+
+    pub fn mock_app(init_funds: &[Coin]) -> App {
+        AppBuilder::new().build(|router, _, storage| {
+            router
+                .bank
+                .init_balance(storage, &Addr::unchecked(OWNER), init_funds.to_vec())
+                .unwrap();
+        })
+    }
+
+    pub fn contract_bandwidth() -> Box<dyn Contract<Empty>> {
+        let contract = ContractWrapper::new(
+            crate::contract::execute,
+            crate::contract::instantiate,
+            crate::contract::query,
+        );
+        Box::new(contract)
+    }
+}
@@ -1,23 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use coconut_bandwidth_contract_common::spend_credential::{SpendCredential, SpendCredentialData};
-use cosmwasm_std::{Addr, Coin};
-
-pub const TEST_MIX_DENOM: &str = "unym";
-
-pub fn spend_credential_fixture(blinded_serial_number: &str) -> SpendCredential {
-    SpendCredential::new(
-        Coin::new(100, TEST_MIX_DENOM),
-        blinded_serial_number.to_string(),
-        Addr::unchecked("gateway_owner_addr"),
-    )
-}
-
-pub fn spend_credential_data_fixture(blinded_serial_number: &str) -> SpendCredentialData {
-    SpendCredentialData::new(
-        Coin::new(100, TEST_MIX_DENOM),
-        blinded_serial_number.to_string(),
-        "gateway_owner_addr".to_string(),
-    )
-}
@@ -1,25 +0,0 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-pub const MULTISIG_CONTRACT: &str = "multisig contract address";
-pub const POOL_CONTRACT: &str = "mix pool contract address";
-
-use crate::contract::instantiate;
-use coconut_bandwidth_contract_common::msg::InstantiateMsg;
-use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info, MockApi, MockQuerier};
-use cosmwasm_std::{Empty, MemoryStorage, OwnedDeps};
-
-use super::fixtures::TEST_MIX_DENOM;
-
-pub fn init_contract() -> OwnedDeps<MemoryStorage, MockApi, MockQuerier<Empty>> {
-    let mut deps = mock_dependencies();
-    let msg = InstantiateMsg {
-        multisig_addr: String::from(MULTISIG_CONTRACT),
-        pool_addr: String::from(POOL_CONTRACT),
-        mix_denom: TEST_MIX_DENOM.to_string(),
-    };
-    let env = mock_env();
-    let info = mock_info("creator", &[]);
-    instantiate(deps.as_mut(), env.clone(), info, msg).unwrap();
-    deps
-}
@@ -1,5 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-pub mod fixtures;
-pub mod helpers;
@@ -1,23 +1,20 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use coconut_bandwidth_contract_common::spend_credential::{
-    to_cosmos_msg, SpendCredential, SpendCredentialData,
-};
 use cosmwasm_std::{BankMsg, Coin, DepsMut, Env, Event, MessageInfo, Response};

 use crate::error::ContractError;
 use crate::state::{ADMIN, CONFIG};
-use crate::storage;

 use coconut_bandwidth_contract_common::deposit::DepositData;
 use coconut_bandwidth_contract_common::events::{
    DEPOSITED_FUNDS_EVENT_TYPE, DEPOSIT_ENCRYPTION_KEY, DEPOSIT_IDENTITY_KEY, DEPOSIT_INFO,
    DEPOSIT_VALUE,
 };
+use config::defaults::MIX_DENOM;

 pub(crate) fn deposit_funds(
-    deps: DepsMut<'_>,
+    _deps: DepsMut<'_>,
    _env: Env,
    info: MessageInfo,
    data: DepositData,
@@ -28,9 +25,8 @@ pub(crate) fn deposit_funds(
    if info.funds.len() > 1 {
        return Err(ContractError::MultipleDenoms);
    }
-    let mix_denom = CONFIG.load(deps.storage)?.mix_denom;
-    if info.funds[0].denom != mix_denom {
-        return Err(ContractError::WrongDenom { mix_denom });
+    if info.funds[0].denom != MIX_DENOM.base {
+        return Err(ContractError::WrongDenom);
    }

    let voucher_value = info.funds.last().unwrap();
@@ -43,55 +39,18 @@ pub(crate) fn deposit_funds(
    Ok(Response::new().add_event(event))
 }

-pub(crate) fn spend_credential(
-    deps: DepsMut<'_>,
-    env: Env,
-    _info: MessageInfo,
-    data: SpendCredentialData,
-) -> Result<Response, ContractError> {
-    let mix_denom = CONFIG.load(deps.storage)?.mix_denom;
-    if data.funds().denom != mix_denom {
-        return Err(ContractError::WrongDenom { mix_denom });
-    }
-    if storage::spent_credentials().has(deps.storage, data.blinded_serial_number()) {
-        return Err(ContractError::DuplicateBlindedSerialNumber);
-    }
-    let cfg = CONFIG.load(deps.storage)?;
-
-    let gateway_cosmos_address = deps.api.addr_validate(data.gateway_cosmos_address())?;
-    storage::spent_credentials().save(
-        deps.storage,
-        data.blinded_serial_number(),
-        &SpendCredential::new(
-            data.funds().to_owned(),
-            data.blinded_serial_number().to_owned(),
-            gateway_cosmos_address,
-        ),
-    )?;
-
-    let msg = to_cosmos_msg(
-        data.funds().clone(),
-        data.blinded_serial_number().to_string(),
-        env.contract.address.into_string(),
-        cfg.multisig_addr.into_string(),
-    )?;
-
-    Ok(Response::new().add_message(msg))
-}
-
 pub(crate) fn release_funds(
    deps: DepsMut<'_>,
    env: Env,
    info: MessageInfo,
    funds: Coin,
 ) -> Result<Response, ContractError> {
-    let mix_denom = CONFIG.load(deps.storage)?.mix_denom;
-    if funds.denom != mix_denom {
-        return Err(ContractError::WrongDenom { mix_denom });
+    if funds.denom != MIX_DENOM.base {
+        return Err(ContractError::WrongDenom);
    }
    let current_balance = deps
        .querier
-        .query_balance(env.contract.address, mix_denom)?;
+        .query_balance(env.contract.address, MIX_DENOM.base)?;
    if funds.amount > current_balance.amount {
        return Err(ContractError::NotEnoughFunds);
    }
@@ -111,13 +70,11 @@ pub(crate) fn release_funds(
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::support::tests::fixtures::spend_credential_data_fixture;
-    use crate::support::tests::helpers::{self, MULTISIG_CONTRACT, POOL_CONTRACT};
-    use coconut_bandwidth_contract_common::msg::ExecuteMsg;
+    use crate::support::tests::helpers;
+    use crate::support::tests::helpers::{MULTISIG_CONTRACT, POOL_CONTRACT};
    use cosmwasm_std::testing::{mock_env, mock_info};
-    use cosmwasm_std::{from_binary, Coin, CosmosMsg, WasmMsg};
+    use cosmwasm_std::{Coin, CosmosMsg};
    use cw_controllers::AdminError;
-    use multisig_contract_common::msg::ExecuteMsg as MultisigExecuteMsg;

    #[test]
    fn invalid_deposit() {
@@ -135,7 +92,7 @@ mod tests {
            Err(ContractError::NoCoin)
        );

-        let coin = Coin::new(1000000, crate::support::tests::fixtures::TEST_MIX_DENOM);
+        let coin = Coin::new(1000000, MIX_DENOM.base);
        let second_coin = Coin::new(1000000, "some_denom");

        let info = mock_info("requester", &[coin, second_coin.clone()]);
@@ -147,9 +104,7 @@ mod tests {
        let info = mock_info("requester", &[second_coin]);
        assert_eq!(
            deposit_funds(deps.as_mut(), env, info, data),
-            Err(ContractError::WrongDenom {
-                mix_denom: crate::support::tests::fixtures::TEST_MIX_DENOM.to_string()
-            })
+            Err(ContractError::WrongDenom)
        );
    }

@@ -167,10 +122,7 @@ mod tests {
            verification_key.clone(),
            encryption_key.clone(),
        );
-        let coin = Coin::new(
-            deposit_value,
-            crate::support::tests::fixtures::TEST_MIX_DENOM,
-        );
+        let coin = Coin::new(deposit_value, MIX_DENOM.base);
        let info = mock_info("requester", &[coin]);

        let tx = deposit_funds(deps.as_mut(), env.clone(), info, data).unwrap();
@@ -219,7 +171,7 @@ mod tests {
        let mut deps = helpers::init_contract();
        let env = mock_env();
        let invalid_admin = "invalid admin";
-        let funds = Coin::new(1, crate::support::tests::fixtures::TEST_MIX_DENOM);
+        let funds = Coin::new(1, MIX_DENOM.base);

        let err = release_funds(
            deps.as_mut(),
@@ -228,12 +180,7 @@ mod tests {
            Coin::new(1, "invalid denom"),
        )
        .unwrap_err();
-        assert_eq!(
-            err,
-            ContractError::WrongDenom {
-                mix_denom: crate::support::tests::fixtures::TEST_MIX_DENOM.to_string()
-            }
-        );
+        assert_eq!(err, ContractError::WrongDenom);

        let err = release_funds(
            deps.as_mut(),
@@ -260,7 +207,7 @@ mod tests {
    fn valid_release() {
        let mut deps = helpers::init_contract();
        let env = mock_env();
-        let coin = Coin::new(1, crate::support::tests::fixtures::TEST_MIX_DENOM);
+        let coin = Coin::new(1, MIX_DENOM.base);

        deps.querier
            .update_balance(env.contract.address.clone(), vec![coin.clone()]);
@@ -279,96 +226,4 @@ mod tests {
            })
        );
    }
-    #[test]
-    fn valid_spend() {
-        let mut deps = helpers::init_contract();
-        let env = mock_env();
-        let info = mock_info("requester", &[]);
-        let data = spend_credential_data_fixture("blinded_serial_number");
-        let res = spend_credential(deps.as_mut(), env.clone(), info, data.clone()).unwrap();
-        if let CosmosMsg::Wasm(WasmMsg::Execute {
-            contract_addr,
-            msg,
-            funds,
-        }) = &res.messages[0].msg
-        {
-            assert_eq!(contract_addr, MULTISIG_CONTRACT);
-            assert!(funds.is_empty());
-            let multisig_msg: MultisigExecuteMsg = from_binary(&msg).unwrap();
-            if let MultisigExecuteMsg::Propose {
-                title: _,
-                description,
-                msgs,
-                latest,
-            } = multisig_msg
-            {
-                assert_eq!(description, data.blinded_serial_number().to_string());
-                assert!(latest.is_none());
-                if let CosmosMsg::Wasm(WasmMsg::Execute {
-                    contract_addr,
-                    msg,
-                    funds,
-                }) = &msgs[0]
-                {
-                    assert_eq!(*contract_addr, env.contract.address.into_string());
-                    assert!(funds.is_empty());
-                    let release_funds_req: ExecuteMsg = from_binary(&msg).unwrap();
-                    if let ExecuteMsg::ReleaseFunds { funds } = release_funds_req {
-                        assert_eq!(funds, *data.funds());
-                    } else {
-                        panic!("Could not extract release funds message from proposal");
-                    }
-                }
-            } else {
-                panic!("Could not extract proposal from binary blob");
-            }
-        } else {
-            panic!("Wasm execute message not found");
-        }
-    }
-
-    #[test]
-    fn invalid_spend_attempts() {
-        let mut deps = helpers::init_contract();
-        let env = mock_env();
-        let info = mock_info("requester", &[]);
-
-        let invalid_data = SpendCredentialData::new(
-            Coin::new(1, "invalid_denom".to_string()),
-            String::new(),
-            String::new(),
-        );
-        let ret = spend_credential(deps.as_mut(), env.clone(), info.clone(), invalid_data);
-        assert_eq!(
-            ret.unwrap_err(),
-            ContractError::WrongDenom {
-                mix_denom: crate::support::tests::fixtures::TEST_MIX_DENOM.to_string()
-            }
-        );
-
-        let invalid_data = SpendCredentialData::new(
-            Coin::new(1, crate::support::tests::fixtures::TEST_MIX_DENOM),
-            String::new(),
-            "Blinded Serial Number".to_string(),
-        );
-        let ret = spend_credential(deps.as_mut(), env.clone(), info.clone(), invalid_data);
-        assert_eq!(
-            ret.unwrap_err().to_string(),
-            "Generic error: Invalid input: address not normalized".to_string()
-        );
-
-        let invalid_data = spend_credential_data_fixture("blined_serial_number");
-        spend_credential(
-            deps.as_mut(),
-            env.clone(),
-            info.clone(),
-            invalid_data.clone(),
-        )
-        .unwrap();
-        let ret = spend_credential(deps.as_mut(), env, info, invalid_data);
-        assert_eq!(
-            ret.unwrap_err(),
-            ContractError::DuplicateBlindedSerialNumber
-        );
-    }
 }
@@ -1,30 +0,0 @@
-[package]
-name = "coconut-test"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-bandwidth-claim-contract = { path = "../../common/bandwidth-claim-contract" }
-coconut-bandwidth-contract-common = { path = "../../common/cosmwasm-smart-contracts/coconut-bandwidth-contract" }
-multisig-contract-common = { path = "../../common/cosmwasm-smart-contracts/multisig-contract" }
-
-cosmwasm-std = "1.0.0"
-cosmwasm-storage = "1.0.0"
-cw-storage-plus = "0.13.4"
-cw-controllers = "0.13.4"
-cw-utils = "0.13.4"
-
-schemars = "0.8"
-serde = { version = "1.0.103", default-features = false, features = ["derive"] }
-thiserror = "1.0.23"
-
-coconut-bandwidth = { path = "../coconut-bandwidth" }
-cw-multi-test = { version = "0.13.2" }
-cw3-flex-multisig = { path = "../multisig/cw3-flex-multisig" }
-cw4-group = { path = "../multisig/cw4-group" }
-
-[[test]]
-name = "coconut-test"
-path = "src/tests.rs"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
pierre	0f795feaef	feat(wallet): add generic dialog component	2022-07-04 19:45:36 +02:00
pierre	8f18af232d	feat(wallet): add generic dialog component	2022-07-04 19:35:56 +02:00
pierre	be6172d622	feat(wallet): add generic dialog component	2022-07-04 19:33:02 +02:00
pierre	2e7d773128	feat(wallet): add generic dialog component	2022-07-04 19:25:03 +02:00
@@ -1 +1 @@
 
 .0.1