Implement base line for tests on the validator ts client

- This will need to be separated and configured accordingly - This was a quick spin up, using jest as a library to implement some coverage - Further things to be refined - mocks, more coverage, better configuration, clean up methods, improve env vars
Missed takes_value() call
2022-01-06 10:01:08 +00:00 · 2022-01-04 17:12:41 +01:00 · 2022-01-04 13:49:24 +01:00 · 2022-01-04 11:00:48 +00:00 · 2022-01-03 14:32:37 +01:00 · 2021-12-23 15:05:11 +02:00
353 changed files with 32838 additions and 36890 deletions
@@ -0,0 +1,3 @@
+unreleased=true
+future-release=v0.12.0
+since-tag=v0.11.0
@@ -0,0 +1 @@
+2.7.5
@@ -240,6 +240,14 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d6dff4a1892b54d70af377bf7a17064192e822865791d812957f21e3108c325"

+[[package]]
+name = "bandwidth-claim-contract"
+version = "0.1.0"
+dependencies = [
+ "schemars",
+ "serde",
+]
+
 [[package]]
 name = "base-x"
 version = "0.2.8"
@@ -612,7 +620,7 @@ dependencies = [

 [[package]]
 name = "client-core"
-version = "0.11.0"
+version = "0.12.0"
 dependencies = [
 "config",
 "crypto",
@@ -899,9 +907,9 @@ dependencies = [

 [[package]]
 name = "cosmwasm-crypto"
-version = "1.0.0-beta2"
+version = "1.0.0-beta3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c16b255449b3f5cd7fa4b79acd5225b5185655261087a3d8aaac44f88a0e23e9"
+checksum = "a380b87642204557629c9b72988c47b55fbfe6d474960adba56b22331504956a"
 dependencies = [
 "digest 0.9.0",
 "ed25519-zebra",
@@ -912,18 +920,18 @@ dependencies = [

 [[package]]
 name = "cosmwasm-derive"
-version = "1.0.0-beta2"
+version = "1.0.0-beta3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abad1a6ff427a2f66890a4dce6354b4563cd07cee91a942300e011c921c09ed2"
+checksum = "866713b2fe13f23038c7d8824c3059d1f28dd94685fb406d1533c4eeeefeefae"
 dependencies = [
 "syn",
 ]

 [[package]]
 name = "cosmwasm-std"
-version = "1.0.0-beta2"
+version = "1.0.0-beta3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1660ee3d5734672e1eb4f0ceda403e2d83345e15143a48845f340f3252ce99a6"
+checksum = "8dbb9939b31441dfa9af3ec9740c8a24d585688401eff1b6b386abb7ad0d10a8"
 dependencies = [
 "base64",
 "cosmwasm-crypto",
@@ -1084,6 +1092,7 @@ dependencies = [
 "blake3",
 "bs58",
 "cipher",
+ "config",
 "digest 0.9.0",
 "ed25519-dalek",
 "generic-array 0.14.4",
@@ -1093,6 +1102,7 @@ dependencies = [
 "nymsphinx-types",
 "pemstore",
 "rand 0.7.3",
+ "subtle-encoding",
 "x25519-dalek",
 ]

@@ -1614,6 +1624,26 @@ dependencies = [
 "cfg-if 1.0.0",
 ]

+[[package]]
+name = "enum-iterator"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6"
+dependencies = [
+ "enum-iterator-derive",
+]
+
+[[package]]
+name = "enum-iterator-derive"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "enum_kind"
 version = "0.2.1"
@@ -1639,14 +1669,6 @@ dependencies = [
 "termcolor",
 ]

-[[package]]
-name = "erc20-bridge-contract"
-version = "0.1.0"
-dependencies = [
- "schemars",
- "serde",
-]
-
 [[package]]
 name = "error-chain"
 version = "0.12.4"
@@ -2285,6 +2307,19 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "git2"
+version = "0.13.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f29229cc1b24c0e6062f6e742aa3e256492a5323365e5ed3413599f8a5eff7d6"
+dependencies = [
+ "bitflags",
+ "libc",
+ "libgit2-sys",
+ "log",
+ "url",
+]
+
 [[package]]
 name = "glib"
 version = "0.14.5"
@@ -3057,6 +3092,18 @@ version = "0.2.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103"

+[[package]]
+name = "libgit2-sys"
+version = "0.12.26+1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19e1c899248e606fbfe68dcb31d8b0176ebab833b103824af31bddf4b7457494"
+dependencies = [
+ "cc",
+ "libc",
+ "libz-sys",
+ "pkg-config",
+]
+
 [[package]]
 name = "libm"
 version = "0.2.1"
@@ -3074,6 +3121,18 @@ dependencies = [
 "vcpkg",
 ]

+[[package]]
+name = "libz-sys"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "lioness"
 version = "0.1.2"
@@ -3514,7 +3573,7 @@ dependencies = [

 [[package]]
 name = "nym-client"
-version = "0.11.0"
+version = "0.12.1"
 dependencies = [
 "clap",
 "client-core",
@@ -3541,13 +3600,14 @@ dependencies = [
 "topology",
 "url",
 "validator-client",
+ "vergen",
 "version-checker",
 "websocket-requests",
 ]

 [[package]]
 name = "nym-client-wasm"
-version = "0.11.0"
+version = "0.12.0"
 dependencies = [
 "coconut-interface",
 "console_error_panic_hook",
@@ -3571,8 +3631,9 @@ dependencies = [

 [[package]]
 name = "nym-gateway"
-version = "0.11.0"
+version = "0.12.1"
 dependencies = [
+ "bandwidth-claim-contract",
 "bip39",
 "bs58",
 "clap",
@@ -3584,7 +3645,6 @@ dependencies = [
 "dashmap",
 "dirs",
 "dotenv",
- "erc20-bridge-contract",
 "futures",
 "gateway-client",
 "gateway-requests",
@@ -3607,13 +3667,14 @@ dependencies = [
 "tokio-util",
 "url",
 "validator-client",
+ "vergen",
 "version-checker",
 "web3",
 ]

 [[package]]
 name = "nym-mixnode"
-version = "0.11.0"
+version = "0.12.1"
 dependencies = [
 "bs58",
 "clap",
@@ -3635,19 +3696,19 @@ dependencies = [
 "rocket",
 "serde",
 "serial_test",
- "subtle-encoding",
 "tokio",
 "tokio-util",
 "toml",
 "topology",
 "url",
 "validator-client",
+ "vergen",
 "version-checker",
 ]

 [[package]]
 name = "nym-network-requester"
-version = "0.11.0"
+version = "0.12.0"
 dependencies = [
 "clap",
 "dirs",
@@ -3668,7 +3729,7 @@ dependencies = [

 [[package]]
 name = "nym-socks5-client"
-version = "0.11.0"
+version = "0.12.1"
 dependencies = [
 "clap",
 "client-core",
@@ -3697,12 +3758,13 @@ dependencies = [
 "topology",
 "url",
 "validator-client",
+ "vergen",
 "version-checker",
 ]

 [[package]]
 name = "nym-validator-api"
-version = "0.11.0"
+version = "0.12.0"
 dependencies = [
 "anyhow",
 "clap",
@@ -3737,6 +3799,7 @@ dependencies = [
 "topology",
 "url",
 "validator-client",
+ "vergen",
 "version-checker",
 ]

@@ -3910,10 +3973,11 @@ dependencies = [

 [[package]]
 name = "okapi"
-version = "0.6.0-alpha-1"
+version = "0.7.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb085e00daf8d75b9dbf0ffdb4738e69503e28898d9641fa8bdc6ad536c7bcf4"
+checksum = "ce66b6366e049880a35c378123fddb630b1a1a3c37fa1ca70caaf4a09f6e2893"
 dependencies = [
+ "log",
 "schemars",
 "serde",
 "serde_json",
@@ -5150,10 +5214,12 @@ dependencies = [

 [[package]]
 name = "rocket_okapi"
-version = "0.7.0-alpha-1"
+version = "0.8.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b2f4f48fb070f9f6c56d5663df5fa8a514406207744f4abd84661bfb24efd7d"
+checksum = "0025aa04994af8cd8e1fcdd5a73579a395c941ae090ecb0a39b41cca7e237a20"
 dependencies = [
+ "either",
+ "log",
 "okapi",
 "rocket",
 "rocket_okapi_codegen",
@@ -5164,9 +5230,9 @@ dependencies = [

 [[package]]
 name = "rocket_okapi_codegen"
-version = "0.7.0-alpha-1"
+version = "0.8.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ccf1550e1c806461a6b08e2ab64eb10701d41bf50bde59ab9aa3a57ab14d41"
+checksum = "dc114779fc27afb78179233e966f469e47fd7a98dc15181cff2574cdddb65612"
 dependencies = [
 "darling 0.13.0",
 "proc-macro2",
@@ -7160,6 +7226,23 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"

+[[package]]
+name = "vergen"
+version = "5.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6cf88d94e969e7956d924ba70741316796177fa0c79a2c9f4ab04998d96e966e"
+dependencies = [
+ "anyhow",
+ "cfg-if 1.0.0",
+ "chrono",
+ "enum-iterator",
+ "getset",
+ "git2",
+ "rustc_version 0.4.0",
+ "rustversion",
+ "thiserror",
+]
+
 [[package]]
 name = "version-checker"
 version = "0.1.0"
@@ -7192,7 +7275,9 @@ dependencies = [
 "config",
 "cosmwasm-std",
 "cw-storage-plus",
+ "getrandom 0.2.3",
 "mixnet-contract",
+ "rand 0.8.4",
 "schemars",
 "serde",
 "thiserror",
@@ -25,7 +25,7 @@ members = [
    "common/config",
    "common/credentials",
    "common/crypto",
-    "common/erc20-bridge-contract",
+    "common/bandwidth-claim-contract",
    "common/mixnet-contract",
    "common/mixnode-common",
    "common/network-defaults",
@@ -1,25 +1,36 @@
-all: clippy test fmt
-clippy: clippy-main clippy-contracts clippy-wallet
+all: clippy-all test fmt
+happy: clippy-happy test fmt
+clippy-all: clippy-all-main clippy-all-contracts clippy-all-wallet
+clippy-happy: clippy-happy-main clippy-happy-contracts clippy-happy-wallet
 test: test-main test-contracts test-wallet
 fmt: fmt-main fmt-contracts fmt-wallet

-clippy-main:
+clippy-happy-main:
 	cargo clippy

-clippy-contracts:
-	cargo clippy --manifest-path contracts/Cargo.toml
+clippy-happy-contracts:
+	cargo clippy --manifest-path contracts/Cargo.toml --target wasm32-unknown-unknown

-clippy-wallet: 
+clippy-happy-wallet: 
 	cargo clippy --manifest-path nym-wallet/Cargo.toml

+clippy-all-main:
+	cargo clippy --all-features -- -D warnings 
+
+clippy-all-contracts:
+	cargo clippy --manifest-path contracts/Cargo.toml --all-features --target wasm32-unknown-unknown -- -D warnings
+
+clippy-all-wallet: 
+	cargo clippy --manifest-path nym-wallet/Cargo.toml --all-features -- -D warnings
+
 test-main:
-	cargo test
+	cargo test --all-features

 test-contracts:
-	cargo test --manifest-path contracts/Cargo.toml
+	cargo test --manifest-path contracts/Cargo.toml --all-features

 test-wallet:
-	cargo test --manifest-path nym-wallet/Cargo.toml
+	cargo test --manifest-path nym-wallet/Cargo.toml --all-features

 fmt-main:
 	cargo fmt --all
@@ -29,3 +40,6 @@ fmt-contracts:

 fmt-wallet:
 	cargo fmt --manifest-path nym-wallet/Cargo.toml --all
+
+wasm:
+	RUSTFLAGS='-C link-arg=-s' cargo build --manifest-path contracts/Cargo.toml --release --target wasm32-unknown-unknown
@@ -40,13 +40,13 @@ Node, node operator and delegator rewards are determined according to the princi
 |<img src="https://render.githubusercontent.com/render/math?math=R">|global share of rewards available, starts at 2% of the reward pool. 
 |<img src="https://render.githubusercontent.com/render/math?math=R_{i}">|node reward for mixnode `i`.
 |<img src="https://render.githubusercontent.com/render/math?math=\sigma_{i}">|ratio of total node stake (node bond + all delegations) to the token circulating supply.
-|<img src="https://render.githubusercontent.com/render/math?math=\lambda_{i}">|ratio of stake operator has plaged to their node to the token circulating supply.
-|<img src="https://render.githubusercontent.com/render/math?math=\omega_{i}">|fraction of total effort undertaken by node `i`, set to `1/k` in testnet Milhon.
-|<img src="https://render.githubusercontent.com/render/math?math=k">|number of nodes stakeholders are incentivised to create, set by the validators, a matter of governance. Currently determined by the `active set` size, and set to 5000 in testnet Milhon.
+|<img src="https://render.githubusercontent.com/render/math?math=\lambda_{i}">|ratio of stake operator has pledged to their node to the token circulating supply.
+|<img src="https://render.githubusercontent.com/render/math?math=\omega_{i}">|fraction of total effort undertaken by node `i`, set to `1/k`.
+|<img src="https://render.githubusercontent.com/render/math?math=k">|number of nodes stakeholders are incentivised to create, set by the validators, a matter of governance. Currently determined by the `reward set` size, and set to 720 in testnet Sandbox.
 |<img src="https://render.githubusercontent.com/render/math?math=\alpha">|Sybil attack resistance parameter - the higher this parameter is set the stronger the reduction in competitivness gets for a Sybil attacker.
-|<img src="https://render.githubusercontent.com/render/math?math=PM_{i}">|declared profit margin of operator `i`, defaults to 10% in testnet Milhon.
+|<img src="https://render.githubusercontent.com/render/math?math=PM_{i}">|declared profit margin of operator `i`, defaults to 10% in.
 |<img src="https://render.githubusercontent.com/render/math?math=PF_{i}">|uptime of node `i`, scaled to 0 - 1, for the rewarding epoch
-|<img src="https://render.githubusercontent.com/render/math?math=PP_{i}">|cost of operating node `i` for the duration of the rewarding eopoch, set to 40 Nym for testnet Milhon.
+|<img src="https://render.githubusercontent.com/render/math?math=PP_{i}">|cost of operating node `i` for the duration of the rewarding eopoch, set to 40 NYMT.

 Node reward for node `i` is determined as:

@@ -1,6 +1,6 @@
 [package]
 name = "client-core"
-version = "0.11.0"
+version = "0.12.0"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2018"

@@ -13,7 +13,6 @@ use nymsphinx::utils::sample_poisson_duration;
 use rand::{rngs::OsRng, CryptoRng, Rng};
 use std::pin::Pin;
 use std::sync::Arc;
-use tokio::runtime::Handle;
 use tokio::task::JoinHandle;
 use tokio::time;

@@ -165,8 +164,8 @@ impl LoopCoverTrafficStream<OsRng> {
        }
    }

-    pub fn start(mut self, handle: &Handle) -> JoinHandle<()> {
-        handle.spawn(async move {
+    pub fn start(mut self) -> JoinHandle<()> {
+        tokio::spawn(async move {
            self.run().await;
        })
    }
@@ -6,7 +6,6 @@ use futures::StreamExt;
 use gateway_client::GatewayClient;
 use log::*;
 use nymsphinx::forwarding::packet::MixPacket;
-use tokio::runtime::Handle;
 use tokio::task::JoinHandle;

 pub type BatchMixMessageSender = mpsc::UnboundedSender<Vec<MixPacket>>;
@@ -72,8 +71,8 @@ impl MixTrafficController {
        }
    }

-    pub fn start(mut self, handle: &Handle) -> JoinHandle<()> {
-        handle.spawn(async move {
+    pub fn start(mut self) -> JoinHandle<()> {
+        tokio::spawn(async move {
            self.run().await;
        })
    }
@@ -22,7 +22,6 @@ use nymsphinx::addressing::clients::Recipient;
 use rand::{rngs::OsRng, CryptoRng, Rng};
 use std::sync::Arc;
 use std::time::Duration;
-use tokio::runtime::Handle;
 use tokio::task::JoinHandle;

 mod acknowledgement_control;
@@ -170,10 +169,8 @@ impl RealMessagesController<OsRng> {
        self.ack_control = Some(ack_control_fut.await.unwrap());
    }

-    // &Handle is only passed for consistency sake with other client modules, but I think
-    // when we get to refactoring, we should apply gateway approach and make it implicit
-    pub fn start(mut self, handle: &Handle) -> JoinHandle<Self> {
-        handle.spawn(async move {
+    pub fn start(mut self) -> JoinHandle<Self> {
+        tokio::spawn(async move {
            self.run().await;
            self
        })
@@ -15,7 +15,6 @@ use nymsphinx::params::{ReplySurbEncryptionAlgorithm, ReplySurbKeyDigestAlgorith
 use nymsphinx::receiver::{MessageReceiver, MessageRecoveryError, ReconstructedMessage};
 use std::collections::HashSet;
 use std::sync::Arc;
-use tokio::runtime::Handle;
 use tokio::task::JoinHandle;

 // Buffer Requests to say "hey, send any reconstructed messages to this channel"
@@ -291,8 +290,8 @@ impl RequestReceiver {
        }
    }

-    fn start(mut self, handle: &Handle) -> JoinHandle<()> {
-        handle.spawn(async move {
+    fn start(mut self) -> JoinHandle<()> {
+        tokio::spawn(async move {
            while let Some(request) = self.query_receiver.next().await {
                match request {
                    ReceivedBufferMessage::ReceiverAnnounce(sender) => {
@@ -322,8 +321,8 @@ impl FragmentedMessageReceiver {
            mixnet_packet_receiver,
        }
    }
-    fn start(mut self, handle: &Handle) -> JoinHandle<()> {
-        handle.spawn(async move {
+    fn start(mut self) -> JoinHandle<()> {
+        tokio::spawn(async move {
            while let Some(new_messages) = self.mixnet_packet_receiver.next().await {
                self.received_buffer.handle_new_received(new_messages).await;
            }
@@ -355,9 +354,9 @@ impl ReceivedMessagesBufferController {
        }
    }

-    pub fn start(self, handle: &Handle) {
+    pub fn start(self) {
        // TODO: should we do anything with JoinHandle(s) returned by start methods?
-        self.fragmented_message_receiver.start(handle);
-        self.request_receiver.start(handle);
+        self.fragmented_message_receiver.start();
+        self.request_receiver.start();
    }
 }
@@ -10,7 +10,6 @@ use std::ops::Deref;
 use std::sync::Arc;
 use std::time;
 use std::time::Duration;
-use tokio::runtime::Handle;
 use tokio::sync::{RwLock, RwLockReadGuard};
 use tokio::task::JoinHandle;
 use topology::{nym_topology_from_bonds, NymTopology};
@@ -304,8 +303,8 @@ impl TopologyRefresher {
        self.topology_accessor.is_routable().await
    }

-    pub fn start(mut self, handle: &Handle) -> JoinHandle<()> {
-        handle.spawn(async move {
+    pub fn start(mut self) -> JoinHandle<()> {
+        tokio::spawn(async move {
            loop {
                tokio::time::sleep(self.refresh_rate).await;
                self.refresh().await;
@@ -117,6 +117,10 @@ impl<T: NymConfig> Config<T> {
        self.client.id = id;
    }

+    pub fn with_testnet_mode(&mut self, testnet_mode: bool) {
+        self.client.testnet_mode = testnet_mode;
+    }
+
    pub fn with_gateway_id<S: Into<String>>(&mut self, id: S) {
        self.client.gateway_id = id.into();
    }
@@ -153,6 +157,10 @@ impl<T: NymConfig> Config<T> {
        self.client.id.clone()
    }

+    pub fn get_testnet_mode(&self) -> bool {
+        self.client.testnet_mode
+    }
+
    pub fn get_nym_root_directory(&self) -> PathBuf {
        self.client.nym_root_directory.clone()
    }
@@ -273,6 +281,11 @@ pub struct Client<T> {
    /// ID specifies the human readable ID of this particular client.
    id: String,

+    /// Indicates whether this client is running in a testnet mode, thus attempting
+    /// to claim bandwidth without presenting bandwidth credentials.
+    #[serde(default)]
+    testnet_mode: bool,
+
    /// Addresses to APIs running on validator from which the client gets the view of the network.
    validator_api_urls: Vec<Url>,

@@ -335,6 +348,7 @@ impl<T: NymConfig> Default for Client<T> {
        Client {
            version: env!("CARGO_PKG_VERSION").to_string(),
            id: "".to_string(),
+            testnet_mode: false,
            validator_api_urls: default_api_endpoints(),
            private_identity_key_file: Default::default(),
            public_identity_key_file: Default::default(),
@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "0.11.0"
+version = "0.12.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2018"
 rust-version = "1.56"
@@ -48,6 +48,10 @@ network-defaults = { path = "../../common/network-defaults" }

 [features]
 coconut = ["coconut-interface", "credentials", "gateway-requests/coconut", "gateway-client/coconut"]
+eth = []

 [dev-dependencies]
 serde_json = "1.0" # for the "textsend" example
+
+[build-dependencies]
+vergen = { version = "5", default-features = false, features = ["build", "git", "rustc", "cargo"] }
@@ -0,0 +1,8 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use vergen::{vergen, Config};
+
+fn main() {
+    vergen(Config::default()).expect("failed to extract build metadata")
+}
@@ -5,7 +5,7 @@ pub(crate) fn config_template() -> &'static str {
    // While using normal toml marshalling would have been way simpler with less overhead,
    // I think it's useful to have comments attached to the saved config file to explain behaviour of
    // particular fields.
-    // Note: any changes to the template must be reflected in the appropriate structs in verloc.
+    // Note: any changes to the template must be reflected in the appropriate structs.
    r#"
 # This is a TOML config file.
 # For more information, see https://github.com/toml-lang/toml
@@ -19,6 +19,10 @@ version = '{{ client.version }}'
 # Human readable ID of this particular client.
 id = '{{ client.id }}'

+# Indicates whether this client is running in a testnet mode, thus attempting
+# to claim bandwidth without presenting bandwidth credentials.
+testnet_mode = {{ client.testnet_mode }}
+
 # Addresses to APIs running on validator from which the client gets the view of the network.
 validator_api_urls = [
    {{#each client.validator_api_urls }}
@@ -32,7 +32,6 @@ use nymsphinx::addressing::clients::Recipient;
 use nymsphinx::addressing::nodes::NodeIdentity;
 use nymsphinx::anonymous_replies::ReplySurb;
 use nymsphinx::receiver::ReconstructedMessage;
-use tokio::runtime::Runtime;

 use crate::client::config::{Config, SocketType};
 use crate::websocket;
@@ -44,11 +43,6 @@ pub struct NymClient {
    /// key filepaths, etc.
    config: Config,

-    /// Tokio runtime used for futures execution.
-    // TODO: JS: Personally I think I prefer the implicit way of using it that we've done with the
-    // gateway.
-    runtime: Runtime,
-
    /// KeyManager object containing smart pointers to all relevant keys used by the client.
    key_manager: KeyManager,

@@ -68,7 +62,6 @@ impl NymClient {
        let key_manager = KeyManager::load_keys(&pathfinder).expect("failed to load stored keys");

        NymClient {
-            runtime: Runtime::new().unwrap(),
            config,
            key_manager,
            input_tx: None,
@@ -94,9 +87,6 @@ impl NymClient {
        mix_tx: BatchMixMessageSender,
    ) {
        info!("Starting loop cover traffic stream...");
-        // we need to explicitly enter runtime due to "next_delay: time::delay_for(Default::default())"
-        // set in the constructor which HAS TO be called within context of a tokio runtime
-        let _guard = self.runtime.enter();

        LoopCoverTrafficStream::new(
            self.key_manager.ack_key(),
@@ -109,7 +99,7 @@ impl NymClient {
            self.as_mix_recipient(),
            topology_accessor,
        )
-        .start(self.runtime.handle());
+        .start();
    }

    fn start_real_traffic_controller(
@@ -131,10 +121,6 @@ impl NymClient {
        );

        info!("Starting real traffic stream...");
-        // we need to explicitly enter runtime due to "next_delay: time::delay_for(Default::default())"
-        // set in the constructor [of OutQueueControl] which HAS TO be called within context of a tokio runtime
-        // When refactoring this restriction should definitely be removed.
-        let _guard = self.runtime.enter();

        RealMessagesController::new(
            controller_config,
@@ -144,7 +130,7 @@ impl NymClient {
            topology_accessor,
            reply_key_storage,
        )
-        .start(self.runtime.handle());
+        .start();
    }

    // buffer controlling all messages fetched from provider
@@ -162,10 +148,10 @@ impl NymClient {
            mixnet_receiver,
            reply_key_storage,
        )
-        .start(self.runtime.handle())
+        .start()
    }

-    fn start_gateway_client(
+    async fn start_gateway_client(
        &mut self,
        mixnet_message_sender: MixnetMessageSender,
        ack_sender: AcknowledgementSender,
@@ -182,43 +168,44 @@ impl NymClient {
        let gateway_identity = identity::PublicKey::from_base58_string(gateway_id)
            .expect("provided gateway id is invalid!");

-        self.runtime.block_on(async {
-            #[cfg(feature = "coconut")]
-            let bandwidth_controller = BandwidthController::new(
-                self.config.get_base().get_validator_api_endpoints(),
-                *self.key_manager.identity_keypair().public_key(),
-            );
-            #[cfg(not(feature = "coconut"))]
-            let bandwidth_controller = BandwidthController::new(
-                self.config.get_base().get_eth_endpoint(),
-                self.config.get_base().get_eth_private_key(),
-                self.config.get_base().get_backup_bandwidth_token_keys_dir(),
-            )
-            .expect("Could not create bandwidth controller");
+        #[cfg(feature = "coconut")]
+        let bandwidth_controller = BandwidthController::new(
+            self.config.get_base().get_validator_api_endpoints(),
+            *self.key_manager.identity_keypair().public_key(),
+        );
+        #[cfg(not(feature = "coconut"))]
+        let bandwidth_controller = BandwidthController::new(
+            self.config.get_base().get_eth_endpoint(),
+            self.config.get_base().get_eth_private_key(),
+            self.config.get_base().get_backup_bandwidth_token_keys_dir(),
+        )
+        .expect("Could not create bandwidth controller");

-            let mut gateway_client = GatewayClient::new(
-                gateway_address,
-                self.key_manager.identity_keypair(),
-                gateway_identity,
-                Some(self.key_manager.gateway_shared_key()),
-                mixnet_message_sender,
-                ack_sender,
-                self.config.get_base().get_gateway_response_timeout(),
-                Some(bandwidth_controller),
-            );
+        let mut gateway_client = GatewayClient::new(
+            gateway_address,
+            self.key_manager.identity_keypair(),
+            gateway_identity,
+            Some(self.key_manager.gateway_shared_key()),
+            mixnet_message_sender,
+            ack_sender,
+            self.config.get_base().get_gateway_response_timeout(),
+            Some(bandwidth_controller),
+        );

-            gateway_client
-                .authenticate_and_start()
-                .await
-                .expect("could not authenticate and start up the gateway connection");
+        if self.config.get_base().get_testnet_mode() {
+            gateway_client.set_testnet_mode(true)
+        }
+        gateway_client
+            .authenticate_and_start()
+            .await
+            .expect("could not authenticate and start up the gateway connection");

-            gateway_client
-        })
+        gateway_client
    }

    // future responsible for periodically polling directory server and updating
    // the current global view of topology
-    fn start_topology_refresher(&mut self, topology_accessor: TopologyAccessor) {
+    async fn start_topology_refresher(&mut self, topology_accessor: TopologyAccessor) {
        let topology_refresher_config = TopologyRefresherConfig::new(
            self.config.get_base().get_validator_api_endpoints(),
            self.config.get_base().get_topology_refresh_rate(),
@@ -229,13 +216,10 @@ impl NymClient {
        // before returning, block entire runtime to refresh the current network view so that any
        // components depending on topology would see a non-empty view
        info!("Obtaining initial network topology");
-        self.runtime.block_on(topology_refresher.refresh());
+        topology_refresher.refresh().await;

        // TODO: a slightly more graceful termination here
-        if !self
-            .runtime
-            .block_on(topology_refresher.is_topology_routable())
-        {
+        if !topology_refresher.is_topology_routable().await {
            panic!(
                "The current network topology seem to be insufficient to route any packets through\
                - check if enough nodes and a gateway are online"
@@ -243,7 +227,7 @@ impl NymClient {
        }

        info!("Starting topology refresher...");
-        topology_refresher.start(self.runtime.handle());
+        topology_refresher.start();
    }

    // controller for sending sphinx packets to mixnet (either real traffic or cover traffic)
@@ -256,7 +240,7 @@ impl NymClient {
        gateway_client: GatewayClient,
    ) {
        info!("Starting mix traffic controller...");
-        MixTrafficController::new(mix_rx, gateway_client).start(self.runtime.handle());
+        MixTrafficController::new(mix_rx, gateway_client).start();
    }

    fn start_websocket_listener(
@@ -269,8 +253,7 @@ impl NymClient {
        let websocket_handler =
            websocket::Handler::new(msg_input, buffer_requester, self.as_mix_recipient());

-        websocket::Listener::new(self.config.get_listening_port())
-            .start(self.runtime.handle(), websocket_handler);
+        websocket::Listener::new(self.config.get_listening_port()).start(websocket_handler);
    }

    /// EXPERIMENTAL DIRECT RUST API
@@ -317,9 +300,9 @@ impl NymClient {
    }

    /// blocking version of `start` method. Will run forever (or until SIGINT is sent)
-    pub fn run_forever(&mut self) {
-        self.start();
-        if let Err(e) = self.runtime.block_on(tokio::signal::ctrl_c()) {
+    pub async fn run_forever(&mut self) {
+        self.start().await;
+        if let Err(e) = tokio::signal::ctrl_c().await {
            error!(
                "There was an error while capturing SIGINT - {:?}. We will terminate regardless",
                e
@@ -331,7 +314,7 @@ impl NymClient {
        );
    }

-    pub fn start(&mut self) {
+    pub async fn start(&mut self) {
        info!("Starting nym client");
        // channels for inter-component communication
        // TODO: make the channels be internally created by the relevant components
@@ -363,14 +346,17 @@ impl NymClient {

        // the components are started in very specific order. Unless you know what you are doing,
        // do not change that.
-        self.start_topology_refresher(shared_topology_accessor.clone());
+        self.start_topology_refresher(shared_topology_accessor.clone())
+            .await;
        self.start_received_messages_buffer_controller(
            received_buffer_request_receiver,
            mixnet_messages_receiver,
            reply_key_storage.clone(),
        );

-        let gateway_client = self.start_gateway_client(mixnet_messages_sender, ack_sender);
+        let gateway_client = self
+            .start_gateway_client(mixnet_messages_sender, ack_sender)
+            .await;

        self.start_mix_traffic_controller(sphinx_message_receiver, gateway_client);
        self.start_real_traffic_controller(
@@ -31,6 +31,12 @@ use url::Url;

 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, ETH_ENDPOINT_ARG_NAME, ETH_PRIVATE_KEY_ARG_NAME,
+    TESTNET_MODE_ARG_NAME,
+};

 pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
    let app = App::new("init")
@@ -66,18 +72,28 @@ pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
            .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("eth_endpoint")
-            .long("eth_endpoint")
-            .help("URL of an Ethereum full node that we want to use for getting bandwidth tokens from ERC20 tokens")
+        .arg(
+            Arg::with_name(TESTNET_MODE_ARG_NAME)
+                .long(TESTNET_MODE_ARG_NAME)
+                .help("Set this client to work in a testnet 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(TESTNET_MODE_ARG_NAME, None, DEFAULT_ETH_ENDPOINT)
            .required(true))
-        .arg(Arg::with_name("eth_private_key")
-            .long("eth_private_key")
-            .help("Ethereum private key used for obtaining bandwidth tokens from ERC20 tokens")
+        .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)
-            .required(true));
+            .default_value_if(TESTNET_MODE_ARG_NAME, None, DEFAULT_ETH_PRIVATE_KEY)
+            .required(true)
+        );

    app
 }
@@ -203,7 +219,7 @@ fn show_address(config: &Config) {
    println!("\nThe address of this client is: {}", client_recipient);
 }

-pub fn execute(matches: &ArgMatches) {
+pub async fn execute(matches: ArgMatches<'static>) {
    println!("Initialising client...");

    let id = matches.value_of("id").unwrap(); // required for now
@@ -221,7 +237,7 @@ pub fn execute(matches: &ArgMatches) {

    // TODO: ideally that should be the last thing that's being done to config.
    // However, we are later further overriding it with gateway id
-    config = override_config(config, matches);
+    config = override_config(config, &matches);
    if matches.is_present("fastmode") {
        config.get_base_mut().set_high_default_traffic_volume();
    }
@@ -234,26 +250,20 @@ pub fn execute(matches: &ArgMatches) {

        let chosen_gateway_id = matches.value_of("gateway");

-        let registration_fut = async {
-            let gate_details = gateway_details(
-                config.get_base().get_validator_api_endpoints(),
-                chosen_gateway_id,
-            )
-            .await;
-            config
-                .get_base_mut()
-                .with_gateway_id(gate_details.identity_key.to_base58_string());
-            let shared_keys =
-                register_with_gateway(&gate_details, key_manager.identity_keypair()).await;
-            (shared_keys, gate_details.clients_address())
-        };
-
-        // TODO: is there perhaps a way to make it work without having to spawn entire runtime?
-        let rt = tokio::runtime::Runtime::new().unwrap();
-        let (shared_keys, gateway_listener) = rt.block_on(registration_fut);
+        let gateway_details = gateway_details(
+            config.get_base().get_validator_api_endpoints(),
+            chosen_gateway_id,
+        )
+        .await;
        config
            .get_base_mut()
-            .with_gateway_listener(gateway_listener);
+            .with_gateway_id(gateway_details.identity_key.to_base58_string());
+        let shared_keys =
+            register_with_gateway(&gateway_details, key_manager.identity_keypair()).await;
+
+        config
+            .get_base_mut()
+            .with_gateway_listener(gateway_details.clients_address());
        key_manager.insert_gateway_shared_key(shared_keys);

        let pathfinder = ClientKeyPathfinder::new_from_config(config.get_base());
@@ -5,6 +5,18 @@ use crate::client::config::{Config, SocketType};
 use clap::ArgMatches;
 use url::Url;

+pub(crate) const TESTNET_MODE_ARG_NAME: &str = "testnet-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";
+#[cfg(not(feature = "coconut"))]
+pub(crate) const DEFAULT_ETH_PRIVATE_KEY: &str =
+    "0000000000000000000000000000000000000000000000000000000000000001";
+
 pub(crate) mod init;
 pub(crate) mod run;
 pub(crate) mod upgrade;
@@ -44,12 +56,24 @@ pub(crate) fn override_config(mut config: Config, matches: &ArgMatches) -> Confi
    }

    #[cfg(not(feature = "coconut"))]
-    if let Some(eth_endpoint) = matches.value_of("eth_endpoint") {
+    if let Some(eth_endpoint) = matches.value_of(ETH_ENDPOINT_ARG_NAME) {
        config.get_base_mut().with_eth_endpoint(eth_endpoint);
+    } else {
+        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") {
+    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 {
+        config
+            .get_base_mut()
+            .with_eth_private_key(DEFAULT_ETH_PRIVATE_KEY);
+    }
+
+    if !cfg!(feature = "eth") || matches.is_present(TESTNET_MODE_ARG_NAME) {
+        config.get_base_mut().with_testnet_mode(true)
    }

    config
@@ -4,6 +4,9 @@
 use crate::client::config::Config;
 use crate::client::NymClient;
 use crate::commands::override_config;
+#[cfg(feature = "eth")]
+#[cfg(not(feature = "coconut"))]
+use crate::commands::{ETH_ENDPOINT_ARG_NAME, ETH_PRIVATE_KEY_ARG_NAME, TESTNET_MODE_ARG_NAME};
 use clap::{App, Arg, ArgMatches};
 use config::NymConfig;
 use log::*;
@@ -39,15 +42,22 @@ pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
            .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("eth_endpoint")
-            .long("eth_endpoint")
-            .help("URL of an Ethereum full node that we want to use for getting bandwidth tokens from ERC20 tokens")
+        .arg(
+            Arg::with_name(TESTNET_MODE_ARG_NAME)
+                .long(TESTNET_MODE_ARG_NAME)
+                .help("Set this client to work in a testnet 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")
-            .long("eth_private_key")
-            .help("Ethereum private key used for obtaining bandwidth tokens from ERC20 tokens")
+        .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));

    app
@@ -72,7 +82,7 @@ fn version_check(cfg: &Config) -> bool {
    }
 }

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

    let mut config = match Config::load_from_file(Some(id)) {
@@ -83,12 +93,12 @@ pub fn execute(matches: &ArgMatches) {
        }
    };

-    config = override_config(config, matches);
+    config = override_config(config, &matches);

    if !version_check(&config) {
        error!("failed the local version check");
        return;
    }

-    NymClient::new(config).run_forever();
+    NymClient::new(config).run_forever().await;
 }
@@ -1,19 +1,21 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use clap::{App, ArgMatches};
+use clap::{crate_version, App, ArgMatches};

 pub mod client;
 pub mod commands;
 pub mod websocket;

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

    let arg_matches = App::new("Nym Client")
-        .version(env!("CARGO_PKG_VERSION"))
+        .version(crate_version!())
+        .long_version(&*long_version())
        .author("Nymtech")
        .about("Implementation of the Nym Client")
        .subcommand(commands::init::command_args())
@@ -21,13 +23,13 @@ fn main() {
        .subcommand(commands::upgrade::command_args())
        .get_matches();

-    execute(arg_matches);
+    execute(arg_matches).await;
 }

-fn execute(matches: ArgMatches) {
+async fn execute(matches: ArgMatches<'static>) {
    match matches.subcommand() {
-        ("init", Some(m)) => commands::init::execute(m),
-        ("run", Some(m)) => commands::run::execute(m),
+        ("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()),
    }
@@ -50,7 +52,38 @@ fn banner() -> String {
             (client - version {:})

    "#,
-        env!("CARGO_PKG_VERSION")
+        crate_version!()
+    )
+}
+
+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"),
    )
 }

@@ -5,7 +5,6 @@ use super::handler::Handler;
 use log::*;
 use std::{net::SocketAddr, process, sync::Arc};
 use tokio::io::AsyncWriteExt;
-use tokio::runtime;
 use tokio::{sync::Notify, task::JoinHandle};

 enum State {
@@ -87,9 +86,9 @@ impl Listener {
        }
    }

-    pub(crate) fn start(mut self, rt_handle: &runtime::Handle, handler: Handler) -> JoinHandle<()> {
+    pub(crate) fn start(mut self, handler: Handler) -> JoinHandle<()> {
        info!("Running websocket on {:?}", self.address.to_string());

-        rt_handle.spawn(async move { self.run(handler).await })
+        tokio::spawn(async move { self.run(handler).await })
    }
 }
@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "0.11.0"
+version = "0.12.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2018"
 rust-version = "1.56"
@@ -43,3 +43,7 @@ network-defaults = { path = "../../common/network-defaults" }

 [features]
 coconut = ["coconut-interface", "credentials", "gateway-requests/coconut", "gateway-client/coconut"]
+eth = []
+
+[build-dependencies]
+vergen = { version = "5", default-features = false, features = ["build", "git", "rustc", "cargo"] }
@@ -0,0 +1,8 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use vergen::{vergen, Config};
+
+fn main() {
+    vergen(Config::default()).expect("failed to extract build metadata")
+}
@@ -5,7 +5,7 @@ pub(crate) fn config_template() -> &'static str {
    // While using normal toml marshalling would have been way simpler with less overhead,
    // I think it's useful to have comments attached to the saved config file to explain behaviour of
    // particular fields.
-    // Note: any changes to the template must be reflected in the appropriate structs in verloc.
+    // Note: any changes to the template must be reflected in the appropriate structs.
    r#"
 # This is a TOML config file.
 # For more information, see https://github.com/toml-lang/toml
@@ -19,6 +19,10 @@ version = '{{ client.version }}'
 # Human readable ID of this particular client.
 id = '{{ client.id }}'

+# Indicates whether this client is running in a testnet mode, thus attempting
+# to claim bandwidth without presenting bandwidth credentials.
+testnet_mode = {{ client.testnet_mode }}
+
 # Addresses to APIs running on validator from which the client gets the view of the network.
 validator_api_urls = [
    {{#each client.validator_api_urls }}
@@ -28,7 +28,6 @@ use gateway_client::{
 use log::*;
 use nymsphinx::addressing::clients::Recipient;
 use nymsphinx::addressing::nodes::NodeIdentity;
-use tokio::runtime::Runtime;

 use crate::client::config::Config;
 use crate::socks::{
@@ -43,11 +42,6 @@ pub struct NymClient {
    /// key filepaths, etc.
    config: Config,

-    /// Tokio runtime used for futures execution.
-    // TODO: JS: Personally I think I prefer the implicit way of using it that we've done with the
-    // gateway.
-    runtime: Runtime,
-
    /// KeyManager object containing smart pointers to all relevant keys used by the client.
    key_manager: KeyManager,
 }
@@ -58,7 +52,6 @@ impl NymClient {
        let key_manager = KeyManager::load_keys(&pathfinder).expect("failed to load stored keys");

        NymClient {
-            runtime: Runtime::new().unwrap(),
            config,
            key_manager,
        }
@@ -82,9 +75,6 @@ impl NymClient {
        mix_tx: BatchMixMessageSender,
    ) {
        info!("Starting loop cover traffic stream...");
-        // we need to explicitly enter runtime due to "next_delay: time::delay_for(Default::default())"
-        // set in the constructor which HAS TO be called within context of a tokio runtime
-        let _guard = self.runtime.enter();

        LoopCoverTrafficStream::new(
            self.key_manager.ack_key(),
@@ -97,7 +87,7 @@ impl NymClient {
            self.as_mix_recipient(),
            topology_accessor,
        )
-        .start(self.runtime.handle());
+        .start();
    }

    fn start_real_traffic_controller(
@@ -119,10 +109,6 @@ impl NymClient {
        );

        info!("Starting real traffic stream...");
-        // we need to explicitly enter runtime due to "next_delay: time::delay_for(Default::default())"
-        // set in the constructor [of OutQueueControl] which HAS TO be called within context of a tokio runtime
-        // When refactoring this restriction should definitely be removed.
-        let _guard = self.runtime.enter();

        RealMessagesController::new(
            controller_config,
@@ -132,7 +118,7 @@ impl NymClient {
            topology_accessor,
            reply_key_storage,
        )
-        .start(self.runtime.handle());
+        .start();
    }

    // buffer controlling all messages fetched from provider
@@ -150,10 +136,10 @@ impl NymClient {
            mixnet_receiver,
            reply_key_storage,
        )
-        .start(self.runtime.handle())
+        .start()
    }

-    fn start_gateway_client(
+    async fn start_gateway_client(
        &mut self,
        mixnet_message_sender: MixnetMessageSender,
        ack_sender: AcknowledgementSender,
@@ -170,43 +156,44 @@ impl NymClient {
        let gateway_identity = identity::PublicKey::from_base58_string(gateway_id)
            .expect("provided gateway id is invalid!");

-        self.runtime.block_on(async {
-            #[cfg(feature = "coconut")]
-            let bandwidth_controller = BandwidthController::new(
-                self.config.get_base().get_validator_api_endpoints(),
-                *self.key_manager.identity_keypair().public_key(),
-            );
-            #[cfg(not(feature = "coconut"))]
-            let bandwidth_controller = BandwidthController::new(
-                self.config.get_base().get_eth_endpoint(),
-                self.config.get_base().get_eth_private_key(),
-                self.config.get_base().get_backup_bandwidth_token_keys_dir(),
-            )
-            .expect("Could not create bandwidth controller");
+        #[cfg(feature = "coconut")]
+        let bandwidth_controller = BandwidthController::new(
+            self.config.get_base().get_validator_api_endpoints(),
+            *self.key_manager.identity_keypair().public_key(),
+        );
+        #[cfg(not(feature = "coconut"))]
+        let bandwidth_controller = BandwidthController::new(
+            self.config.get_base().get_eth_endpoint(),
+            self.config.get_base().get_eth_private_key(),
+            self.config.get_base().get_backup_bandwidth_token_keys_dir(),
+        )
+        .expect("Could not create bandwidth controller");

-            let mut gateway_client = GatewayClient::new(
-                gateway_address,
-                self.key_manager.identity_keypair(),
-                gateway_identity,
-                Some(self.key_manager.gateway_shared_key()),
-                mixnet_message_sender,
-                ack_sender,
-                self.config.get_base().get_gateway_response_timeout(),
-                Some(bandwidth_controller),
-            );
+        let mut gateway_client = GatewayClient::new(
+            gateway_address,
+            self.key_manager.identity_keypair(),
+            gateway_identity,
+            Some(self.key_manager.gateway_shared_key()),
+            mixnet_message_sender,
+            ack_sender,
+            self.config.get_base().get_gateway_response_timeout(),
+            Some(bandwidth_controller),
+        );

-            gateway_client
-                .authenticate_and_start()
-                .await
-                .expect("could not authenticate and start up the gateway connection");
+        if self.config.get_base().get_testnet_mode() {
+            gateway_client.set_testnet_mode(true)
+        }
+        gateway_client
+            .authenticate_and_start()
+            .await
+            .expect("could not authenticate and start up the gateway connection");

-            gateway_client
-        })
+        gateway_client
    }

    // future responsible for periodically polling directory server and updating
    // the current global view of topology
-    fn start_topology_refresher(&mut self, topology_accessor: TopologyAccessor) {
+    async fn start_topology_refresher(&mut self, topology_accessor: TopologyAccessor) {
        let topology_refresher_config = TopologyRefresherConfig::new(
            self.config.get_base().get_validator_api_endpoints(),
            self.config.get_base().get_topology_refresh_rate(),
@@ -217,13 +204,10 @@ impl NymClient {
        // before returning, block entire runtime to refresh the current network view so that any
        // components depending on topology would see a non-empty view
        info!("Obtaining initial network topology");
-        self.runtime.block_on(topology_refresher.refresh());
+        topology_refresher.refresh().await;

        // TODO: a slightly more graceful termination here
-        if !self
-            .runtime
-            .block_on(topology_refresher.is_topology_routable())
-        {
+        if !topology_refresher.is_topology_routable().await {
            panic!(
                "The current network topology seem to be insufficient to route any packets through\
                - check if enough nodes and a gateway are online"
@@ -231,7 +215,7 @@ impl NymClient {
        }

        info!("Starting topology refresher...");
-        topology_refresher.start(self.runtime.handle());
+        topology_refresher.start();
    }

    // controller for sending sphinx packets to mixnet (either real traffic or cover traffic)
@@ -244,7 +228,7 @@ impl NymClient {
        gateway_client: GatewayClient,
    ) {
        info!("Starting mix traffic controller...");
-        MixTrafficController::new(mix_rx, gateway_client).start(self.runtime.handle());
+        MixTrafficController::new(mix_rx, gateway_client).start();
    }

    fn start_socks5_listener(
@@ -263,14 +247,13 @@ impl NymClient {
            self.config.get_provider_mix_address(),
            self.as_mix_recipient(),
        );
-        self.runtime
-            .spawn(async move { sphinx_socks.serve(msg_input, buffer_requester).await });
+        tokio::spawn(async move { sphinx_socks.serve(msg_input, buffer_requester).await });
    }

    /// blocking version of `start` method. Will run forever (or until SIGINT is sent)
-    pub fn run_forever(&mut self) {
-        self.start();
-        if let Err(e) = self.runtime.block_on(tokio::signal::ctrl_c()) {
+    pub async fn run_forever(&mut self) {
+        self.start().await;
+        if let Err(e) = tokio::signal::ctrl_c().await {
            error!(
                "There was an error while capturing SIGINT - {:?}. We will terminate regardless",
                e
@@ -282,7 +265,7 @@ impl NymClient {
        );
    }

-    pub fn start(&mut self) {
+    pub async fn start(&mut self) {
        info!("Starting nym client");
        // channels for inter-component communication
        // TODO: make the channels be internally created by the relevant components
@@ -314,14 +297,17 @@ impl NymClient {

        // the components are started in very specific order. Unless you know what you are doing,
        // do not change that.
-        self.start_topology_refresher(shared_topology_accessor.clone());
+        self.start_topology_refresher(shared_topology_accessor.clone())
+            .await;
        self.start_received_messages_buffer_controller(
            received_buffer_request_receiver,
            mixnet_messages_receiver,
            reply_key_storage.clone(),
        );

-        let gateway_client = self.start_gateway_client(mixnet_messages_sender, ack_sender);
+        let gateway_client = self
+            .start_gateway_client(mixnet_messages_sender, ack_sender)
+            .await;

        self.start_mix_traffic_controller(sphinx_message_receiver, gateway_client);
        self.start_real_traffic_controller(
@@ -29,6 +29,12 @@ use url::Url;

 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, ETH_ENDPOINT_ARG_NAME, ETH_PRIVATE_KEY_ARG_NAME,
+    TESTNET_MODE_ARG_NAME,
+};

 pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
    let app = App::new("init")
@@ -66,18 +72,28 @@ pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
            .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("eth_endpoint")
-            .long("eth_endpoint")
-            .help("URL of an Ethereum full node that we want to use for getting bandwidth tokens from ERC20 tokens")
+        .arg(
+            Arg::with_name(TESTNET_MODE_ARG_NAME)
+                .long(TESTNET_MODE_ARG_NAME)
+                .help("Set this client to work in a testnet 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(TESTNET_MODE_ARG_NAME, None, DEFAULT_ETH_ENDPOINT)
            .required(true))
-        .arg(Arg::with_name("eth_private_key")
-            .long("eth_private_key")
-            .help("Ethereum private key used for obtaining bandwidth tokens from ERC20 tokens")
+        .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)
-            .required(true));
+            .default_value_if(TESTNET_MODE_ARG_NAME, None, DEFAULT_ETH_PRIVATE_KEY)
+            .required(true)
+        );

    app
 }
@@ -203,7 +219,7 @@ fn show_address(config: &Config) {
    println!("\nThe address of this client is: {}", client_recipient);
 }

-pub fn execute(matches: &ArgMatches) {
+pub async fn execute(matches: ArgMatches<'static>) {
    println!("Initialising client...");

    let id = matches.value_of("id").unwrap(); // required for now
@@ -222,7 +238,7 @@ pub fn execute(matches: &ArgMatches) {

    // TODO: ideally that should be the last thing that's being done to config.
    // However, we are later further overriding it with gateway id
-    config = override_config(config, matches);
+    config = override_config(config, &matches);
    if matches.is_present("fastmode") {
        config.get_base_mut().set_high_default_traffic_volume();
    }
@@ -235,26 +251,20 @@ pub fn execute(matches: &ArgMatches) {

        let chosen_gateway_id = matches.value_of("gateway");

-        let registration_fut = async {
-            let gate_details = gateway_details(
-                config.get_base().get_validator_api_endpoints(),
-                chosen_gateway_id,
-            )
-            .await;
-            config
-                .get_base_mut()
-                .with_gateway_id(gate_details.identity_key.to_base58_string());
-            let shared_keys =
-                register_with_gateway(&gate_details, key_manager.identity_keypair()).await;
-            (shared_keys, gate_details.clients_address())
-        };
-
-        // TODO: is there perhaps a way to make it work without having to spawn entire runtime?
-        let rt = tokio::runtime::Runtime::new().unwrap();
-        let (shared_keys, gateway_listener) = rt.block_on(registration_fut);
+        let gateway_details = gateway_details(
+            config.get_base().get_validator_api_endpoints(),
+            chosen_gateway_id,
+        )
+        .await;
        config
            .get_base_mut()
-            .with_gateway_listener(gateway_listener);
+            .with_gateway_id(gateway_details.identity_key.to_base58_string());
+        let shared_keys =
+            register_with_gateway(&gateway_details, key_manager.identity_keypair()).await;
+
+        config
+            .get_base_mut()
+            .with_gateway_listener(gateway_details.clients_address());
        key_manager.insert_gateway_shared_key(shared_keys);

        let pathfinder = ClientKeyPathfinder::new_from_config(config.get_base());
@@ -9,6 +9,18 @@ pub(crate) mod init;
 pub(crate) mod run;
 pub(crate) mod upgrade;

+pub(crate) const TESTNET_MODE_ARG_NAME: &str = "testnet-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";
+#[cfg(not(feature = "coconut"))]
+pub(crate) const DEFAULT_ETH_PRIVATE_KEY: &str =
+    "0000000000000000000000000000000000000000000000000000000000000001";
+
 fn parse_validators(raw: &str) -> Vec<Url> {
    raw.split(',')
        .map(|raw_validator| {
@@ -40,12 +52,24 @@ pub(crate) fn override_config(mut config: Config, matches: &ArgMatches) -> Confi
    }

    #[cfg(not(feature = "coconut"))]
-    if let Some(eth_endpoint) = matches.value_of("eth_endpoint") {
+    if let Some(eth_endpoint) = matches.value_of(ETH_ENDPOINT_ARG_NAME) {
        config.get_base_mut().with_eth_endpoint(eth_endpoint);
+    } else {
+        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") {
+    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 {
+        config
+            .get_base_mut()
+            .with_eth_private_key(DEFAULT_ETH_PRIVATE_KEY);
+    }
+
+    if !cfg!(feature = "eth") || matches.is_present(TESTNET_MODE_ARG_NAME) {
+        config.get_base_mut().with_testnet_mode(true)
    }

    config
@@ -4,6 +4,9 @@
 use crate::client::config::Config;
 use crate::client::NymClient;
 use crate::commands::override_config;
+#[cfg(feature = "eth")]
+#[cfg(not(feature = "coconut"))]
+use crate::commands::{ETH_ENDPOINT_ARG_NAME, ETH_PRIVATE_KEY_ARG_NAME, TESTNET_MODE_ARG_NAME};
 use clap::{App, Arg, ArgMatches};
 use config::NymConfig;
 use log::*;
@@ -45,15 +48,22 @@ pub fn command_args<'a, 'b>() -> clap::App<'a, 'b> {
            .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("eth_endpoint")
-            .long("eth_endpoint")
-            .help("URL of an Ethereum full node that we want to use for getting bandwidth tokens from ERC20 tokens")
+        .arg(
+            Arg::with_name(TESTNET_MODE_ARG_NAME)
+                .long(TESTNET_MODE_ARG_NAME)
+                .help("Set this client to work in a testnet 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")
-            .long("eth_private_key")
-            .help("Ethereum private key used for obtaining bandwidth tokens from ERC20 tokens")
+        .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));

    app
@@ -78,7 +88,7 @@ fn version_check(cfg: &Config) -> bool {
    }
 }

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

    let mut config = match Config::load_from_file(Some(id)) {
@@ -89,12 +99,12 @@ pub fn execute(matches: &ArgMatches) {
        }
    };

-    config = override_config(config, matches);
+    config = override_config(config, &matches);

    if !version_check(&config) {
        error!("failed the local version check");
        return;
    }

-    NymClient::new(config).run_forever();
+    NymClient::new(config).run_forever().await;
 }
@@ -1,13 +1,14 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use clap::{App, ArgMatches};
+use clap::{crate_version, App, ArgMatches};

 pub mod client;
 mod commands;
 pub mod socks;

-fn main() {
+#[tokio::main]
+async fn main() {
    dotenv::dotenv().ok();
    setup_logging();
    println!("{}", banner());
@@ -15,19 +16,20 @@ fn main() {
    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);
+    execute(arg_matches).await;
 }

-fn execute(matches: ArgMatches) {
+async fn execute(matches: ArgMatches<'static>) {
    match matches.subcommand() {
-        ("init", Some(m)) => commands::init::execute(m),
-        ("run", Some(m)) => commands::run::execute(m),
+        ("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()),
    }
@@ -50,7 +52,38 @@ fn banner() -> String {
             (socks5 proxy - version {:})

    "#,
-        env!("CARGO_PKG_VERSION")
+        crate_version!()
+    )
+}
+
+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"),
    )
 }

@@ -0,0 +1,6 @@
+NYMD_URL=https://sandbox-validator.nymtech.net
+VALIDATOR_API=https://sandbox-validator.nymtech.net/api
+MIXNET_CONTRACT=nymt1ghd753shjuwexxywmgs4xz7x2q732vcnstz02j
+VESTING_CONTRACT=nymt1nc5tatafv6eyq7llkr2gv50ff9e22mnfp9pc5s
+CURRENCY_PREFIX=nymt
+CHAIN_ID=nym-sandbox
@@ -1,41 +1,83 @@
 {
    "root": true,
-    "parser": "@typescript-eslint/parser",
-    "plugins": [
-        "@typescript-eslint"
-    ],
    "env": {
+        "browser": true,
        "es6": true,
-        "node": true,
-        "mocha": true
+        "node": true
    },
-    "extends": [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/eslint-recommended",
-        "plugin:@typescript-eslint/recommended"
-    ],
    "parserOptions": {
-        "ecmaVersion": 2018,
+        "ecmaVersion": 2019,
        "sourceType": "module"
    },
+    "globals": {
+        "Atomics": "readonly",
+        "SharedArrayBuffer": "readonly"
+    },
+    "plugins": ["prettier", "mocha"],
+    "extends": [
+        "airbnb-base",
+        "airbnb-typescript/base",
+        "prettier"],
    "rules": {
-        "no-console": "off",
-        "linebreak-style": "off",
-        "quotes": [
-            "error",
-            "double",
-            {
-                "allowTemplateLiterals": true
-            }
-        ],
-        "keyword-spacing": [
+        "prettier/prettier": "error",
+        "import/prefer-default-export": "off",
+        "import/no-extraneous-dependencies": [
            "error",
            {
-                "before": true
+                "devDependencies": [
+                    "**/*.test.[jt]s",
+                    "**/*.spec.[jt]s"
+                ]
            }
        ],
-        "space-before-blocks": [
-            "error"
+        "import/extensions": [
+            "error",
+            "ignorePackages",
+            {
+                "ts": "never",
+                "js": "never"
+            }
        ]
-    }
-}
+    },
+    "overrides": [
+        {
+            "files": "**/*.ts",
+            "parser": "@typescript-eslint/parser",
+            "parserOptions": {
+                "project": "./tsconfig.json"
+            },
+            "plugins": ["@typescript-eslint/eslint-plugin"],
+            "extends": [
+                "plugin:@typescript-eslint/eslint-recommended",
+                "plugin:@typescript-eslint/recommended",
+                "prettier"
+            ],
+            "rules": {
+                "@typescript-eslint/explicit-function-return-type": "off",
+                "@typescript-eslint/no-explicit-any": "off",
+                "@typescript-eslint/no-var-requires": "off",
+                "no-use-before-define": [0],
+                "@typescript-eslint/no-use-before-define": [1],
+                "import/no-unresolved": 0,
+                "import/no-extraneous-dependencies": [
+                    "error",
+                    {
+                        "devDependencies": [
+                            "**/*.test.ts",
+                            "**/*.spec.ts"
+                        ]
+                    }
+                ],
+                "quotes": "off",
+                "@typescript-eslint/quotes": [
+                    2,
+                    "single",
+                    {
+                        "avoidEscape": true
+                    }
+                ],
+                "@typescript-eslint/no-unused-vars": [2, { "argsIgnorePattern": "^_" }]
+            }
+        }
+    ]
+}
@@ -0,0 +1,6 @@
+{
+  "trailingComma": "all",
+  "singleQuote": true,
+  "printWidth": 120,
+  "tabWidth": 2
+}
@@ -3,26 +3,20 @@ Nym Validator Client

 A TypeScript client for interacting with CosmWasm smart contracts in Nym validators. 

-Running examples
-----------------
-
-With the code checked out, `cd examples`. This folder contains runnable example code that will set up a blockchain and allow you to interact with it through the client. 
-
 Running tests
 -------------

+The tests will be separated into three categories: unit, integration and mock.
+
+Currently the command to run all tests: 
+
 ```
 npm test
 ```

-You can also trigger test execution with a test watcher. I don't have the centuries of life left to me that are needed to fight through the arcana of wiring up a working TypeScript mocha triggered execution setup, so for now my Cargo-based hack is:
+The tests require `.env.example` being renamed to `.env`. The variables and their values for these tests are currently pointing to the `nym-sandbox` environment.

-
-```
-cargo watch -s "cd clients/validator && npm test"
-```
-
-It's ugly but works fine if you have Cargo installed. TypeScript setup help happily accepted here. 
+`Tests are still in development` - the test libary is `jest` and the test script will execute currently with: `--coverage --verbosity false`

 Generating Documentation
 ------------------------
@@ -0,0 +1,6 @@
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  setupFiles: ["dotenv/config"]
+};
@@ -1,15 +1,14 @@
 {
  "name": "@nymproject/nym-validator-client",
-  "version": "0.18.0",
+  "version": "0.19.0",
  "description": "A TypeScript client for interacting with smart contracts in Nym validators",
  "repository": "https://github.com/nymtech/nym",
  "main": "./dist/index.js",
  "types": "dist/index.d.ts",
  "scripts": {
-    "build": "tsc",
-    "test": "ts-mocha tests/**/*.test.ts",
-    "coverage": "nyc npm test",
-    "lint": "eslint \"**/*.ts\"",
+    "test": "jest --coverage --verbose false",
+    "lint": "eslint src",
+    "lint:fix": "eslint src --fix",
    "docs": "typedoc --out docs src/index.ts"
  },
  "keywords": [],
@@ -20,25 +19,31 @@
  ],
  "license": "Apache-2.0",
  "devDependencies": {
-    "@types/chai": "^4.2.15",
-    "@types/expect": "^24.3.0",
-    "@types/mocha": "^8.2.1",
-    "@typescript-eslint/eslint-plugin": "^4.14.0",
-    "@typescript-eslint/parser": "^4.14.0",
-    "chai": "^4.2.0",
+    "@types/jest": "27.4.0",
+    "@typescript-eslint/eslint-plugin": "^5.7.0",
+    "@typescript-eslint/parser": "^5.7.0",
    "eslint": "^7.18.0",
-    "mocha": "^8.2.1",
-    "moq.ts": "^7.2.0",
-    "nyc": "^15.1.0",
-    "ts-mocha": "^8.0.0",
+    "eslint-config-airbnb": "^19.0.2",
+    "eslint-config-airbnb-typescript": "^16.1.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-import-resolver-root-import": "^1.0.4",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-prettier": "^4.0.0",
+    "jest": "^27.4.5",
+    "prettier": "^2.5.1",
+    "ts-jest": "^27.1.2",
    "typedoc": "^0.20.27",
-    "typescript": "^4.1.3"
+    "typescript": "^4.5.4"
  },
  "dependencies": {
+    "@cosmjs/cosmwasm-stargate": "^0.27.0-rc2",
+    "@cosmjs/crypto": "^0.27.0-rc2",
+    "@cosmjs/math": "^0.27.0-rc2",
+    "@cosmjs/proto-signing": "^0.27.0-rc2",
+    "@cosmjs/stargate": "^0.27.0-rc2",
+    "@cosmjs/tendermint-rpc": "^0.27.0-rc2",
    "axios": "^0.21.1",
-    "@cosmjs/cosmwasm-stargate": "^0.25.5",
-    "@cosmjs/stargate": "^0.25.5",
-    "@cosmjs/math": "^0.25.5",
-    "@cosmjs/proto-signing": "^0.25.5"
+    "cosmjs-types": "^0.4.0",
+    "dotenv": "^10.0.0"
  }
-}
+}
@@ -1,41 +0,0 @@
-{
-    "root": true,
-    "parser": "@typescript-eslint/parser",
-    "plugins": [
-        "@typescript-eslint"
-    ],
-    "env": {
-        "es6": true,
-        "node": true,
-        "mocha": true
-    },
-    "extends": [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/eslint-recommended",
-        "plugin:@typescript-eslint/recommended"
-    ],
-    "parserOptions": {
-        "ecmaVersion": 2018,
-        "sourceType": "module"
-    },
-    "rules": {
-        "no-console": "off",
-        "linebreak-style": "off",
-        "quotes": [
-            "error",
-            "double",
-            {
-                "allowTemplateLiterals": true
-            }
-        ],
-        "keyword-spacing": [
-            "error",
-            {
-                "before": true
-            }
-        ],
-        "space-before-blocks": [
-            "error"
-        ]
-    }
-}
@@ -1 +0,0 @@
-15.0.1
@@ -1,59 +0,0 @@
-import {GatewayBond, PagedGatewayResponse} from "../types";
-import {INetClient} from "../net-client"
-import {IQueryClient} from "../query-client";
-import {VALIDATOR_API_GATEWAYS, VALIDATOR_API_PORT} from "../index";
-import axios from "axios";
-
-
-/**
- * There are serious limits in smart contract systems, but we need to keep track of
- * potentially thousands of nodes. GatewaysCache instances repeatedly make requests for
- * paged data about what gateways exist, and keep them locally in memory so that they're
- * available for querying.
- **/
-export default class GatewaysCache {
-    gateways: GatewayBond[]
-    client: INetClient | IQueryClient
-    perPage: number
-
-    constructor(client: INetClient | IQueryClient, perPage: number) {
-        this.client = client;
-        this.gateways = [];
-        this.perPage = perPage;
-    }
-
-    /// Makes repeated requests to assemble a full list of gateways.
-    /// Requests continue to be make as long as `shouldMakeAnotherRequest()`
-    /// returns true.
-    async refreshGateways(contractAddress: string): Promise<GatewayBond[]> {
-        let newGateways: GatewayBond[] = [];
-        let response: PagedGatewayResponse;
-        let next: string | undefined = undefined;
-        for (;;) {
-            response = await this.client.getGateways(contractAddress, this.perPage, next);
-            newGateways = newGateways.concat(response.nodes)
-            next = response.start_next_after;
-            // if `start_next_after` is not set, we're done
-            if (!next) {
-                break
-            }
-        }
-
-        this.gateways = newGateways
-        return newGateways;
-    }
-
-    /// Makes requests to assemble a full list of gateways from validator-api
-    async refreshValidatorAPIGateways(urls: string[]): Promise<GatewayBond[]> {
-        for (const url of urls) {
-            const validator_api_url = new URL(url);
-            validator_api_url.port = VALIDATOR_API_PORT;
-            validator_api_url.pathname += VALIDATOR_API_GATEWAYS;
-            const response = await axios.get(validator_api_url.toString());
-            if (response.status == 200) {
-                return response.data;
-            }
-        }
-        throw new Error("None of the provided validators seem to be alive")
-    }
-}
@@ -1,60 +0,0 @@
-import {MixNodeBond, PagedMixnodeResponse} from "../types";
-import { INetClient } from "../net-client"
-import {IQueryClient} from "../query-client";
-import {VALIDATOR_API_MIXNODES, VALIDATOR_API_PORT} from "../index";
-import axios from "axios";
-
-export { MixnodesCache };
-
-/**
- * There are serious limits in smart contract systems, but we need to keep track of
- * potentially thousands of nodes. MixnodeCache instances repeatedly make requests for
- *  paged data about what mixnodes exist, and keep them locally in memory so that they're
- *  available for querying.
- *  */
-export default class MixnodesCache {
-    mixNodes: MixNodeBond[]
-    client: INetClient | IQueryClient
-    perPage: number
-
-    constructor(client: INetClient | IQueryClient, perPage: number) {
-        this.client = client;
-        this.mixNodes = [];
-        this.perPage = perPage;
-    }
-
-    /// Makes repeated requests to assemble a full list of nodes. 
-    /// Requests continue to be make as long as `shouldMakeAnotherRequest()`
-    // returns true. 
-    async refreshMixNodes(contractAddress: string): Promise<MixNodeBond[]> {
-        let newMixnodes: MixNodeBond[] = [];
-        let response: PagedMixnodeResponse;
-        let next: string | undefined = undefined;
-        for (;;) {
-            response = await this.client.getMixNodes(contractAddress, this.perPage, next);
-            newMixnodes = newMixnodes.concat(response.nodes)
-            next = response.start_next_after;
-            // if `start_next_after` is not set, we're done
-            if (!next) {
-                break
-            }
-        }
-
-        this.mixNodes = newMixnodes
-        return this.mixNodes;
-    }
-
-    /// Makes  requests to assemble a full list of mixnodes from validator-api
-    async refreshValidatorAPIMixNodes(urls: string[]): Promise<MixNodeBond[]> {
-        for (const url of urls) {
-            const validator_api_url = new URL(url);
-            validator_api_url.port = VALIDATOR_API_PORT;
-            validator_api_url.pathname += VALIDATOR_API_MIXNODES;
-            const response = await axios.get(validator_api_url.toString());
-            if (response.status == 200) {
-                return response.data;
-            }
-        }
-        throw new Error("None of the provided validators seem to be alive")
-    }
-}
@@ -1,73 +1,68 @@
-import { Decimal } from "@cosmjs/math";
-import { Coin } from ".";
+import { Decimal } from '@cosmjs/math';
+import { Coin } from '@cosmjs/stargate';

 // NARROW NO-BREAK SPACE (U+202F)
-const thinSpace = "\u202F";
+const thinSpace = '\u202F';

 export function printableCoin(coin?: Coin): string {
-    if (!coin) {
-        return "0";
-    }
-    if (coin.denom.startsWith("u")) {
-        const ticker = coin.denom.slice(1).toUpperCase();
-        return Decimal.fromAtomics(coin.amount, 6).toString() + thinSpace + ticker;
-    } else {
-        return coin.amount + thinSpace + coin.denom;
-    }
+  if (!coin) {
+    return '0';
+  }
+  if (coin.denom.startsWith('u')) {
+    const ticker = coin.denom.slice(1).toUpperCase();
+    return Decimal.fromAtomics(coin.amount, 6).toString() + thinSpace + ticker;
+  }
+  return coin.amount + thinSpace + coin.denom;
 }

 export function printableBalance(balance?: readonly Coin[]): string {
-    if (!balance || balance.length === 0) return "–";
-    return balance.map(printableCoin).join(", ");
+  if (!balance || balance.length === 0) return '–';
+  return balance.map(printableCoin).join(', ');
 }

 // converts display amount, such as "12.0346" to its native token representation,
 // with 6 fractional digits. So in that case it would result in "12034600"
 // Basically does the same job as `displayAmountToNative` but without the requirement
 // of having the coinMap
-export function printableBalanceToNative(amountToDisplay: string): string  {
-    const decimalAmount = Decimal.fromUserInput(amountToDisplay, 6);
-    return decimalAmount.atomics;
+export function printableBalanceToNative(amountToDisplay: string): string {
+  const decimalAmount = Decimal.fromUserInput(amountToDisplay, 6);
+  return decimalAmount.atomics;
 }

 // reciprocal of `printableBalanceToNative`, takes, for example 10000000 and returns 10
 export function nativeToPrintable(nativeValue: string): string {
-    return Decimal.fromAtomics(nativeValue, 6).toString()
+  return Decimal.fromAtomics(nativeValue, 6).toString();
 }

 export interface MappedCoin {
-    readonly denom: string;
-    readonly fractionalDigits: number;
+  readonly denom: string;
+  readonly fractionalDigits: number;
 }

 export interface CoinMap {
-    readonly [key: string]: MappedCoin;
+  readonly [key: string]: MappedCoin;
 }

 export function nativeCoinToDisplay(coin: Coin, coinMap: CoinMap): Coin {
-    if (!coinMap) return coin;
+  if (!coinMap) return coin;

-    const coinToDisplay = coinMap[coin.denom];
-    if (!coinToDisplay) return coin;
+  const coinToDisplay = coinMap[coin.denom];
+  if (!coinToDisplay) return coin;

-    const amountToDisplay = Decimal.fromAtomics(coin.amount, coinToDisplay.fractionalDigits).toString();
+  const amountToDisplay = Decimal.fromAtomics(coin.amount, coinToDisplay.fractionalDigits).toString();

-    return { denom: coinToDisplay.denom, amount: amountToDisplay };
+  return { denom: coinToDisplay.denom, amount: amountToDisplay };
 }

 // display amount is eg "12.0346", return is in native tokens
 // with 6 fractional digits, this would be eg. "12034600"
-export function displayAmountToNative(
-    amountToDisplay: string,
-    coinMap: CoinMap,
-    nativeDenom: string,
-): string {
-    const fractionalDigits = coinMap[nativeDenom]?.fractionalDigits;
-    if (fractionalDigits) {
-        // use https://github.com/CosmWasm/cosmjs/blob/v0.22.2/packages/math/src/decimal.ts
-        const decimalAmount = Decimal.fromUserInput(amountToDisplay, fractionalDigits);
-        return decimalAmount.atomics;
-    }
+export function displayAmountToNative(amountToDisplay: string, coinMap: CoinMap, nativeDenom: string): string {
+  const fractionalDigits = coinMap[nativeDenom]?.fractionalDigits;
+  if (fractionalDigits) {
+    // use https://github.com/CosmWasm/cosmjs/blob/v0.22.2/packages/math/src/decimal.ts
+    const decimalAmount = Decimal.fromUserInput(amountToDisplay, fractionalDigits);
+    return decimalAmount.atomics;
+  }

-    return amountToDisplay;
+  return amountToDisplay;
 }
@@ -1,207 +0,0 @@
-import { SigningCosmWasmClient, SigningCosmWasmClientOptions } from "@cosmjs/cosmwasm-stargate";
-import {
-    Delegation,
-    GatewayOwnershipResponse,
-    MixOwnershipResponse, PagedGatewayDelegationsResponse,
-    PagedGatewayResponse, PagedMixDelegationsResponse,
-    PagedMixnodeResponse,
-    StateParams
-} from "./types";
-import { DirectSecp256k1HdWallet, EncodeObject } from "@cosmjs/proto-signing";
-import { Coin, StdFee } from "@cosmjs/stargate";
-import { BroadcastTxResponse } from "@cosmjs/stargate"
-import { nymGasLimits, nymGasPrice } from "./stargate-helper"
-import {
-    ExecuteResult,
-    InstantiateOptions,
-    InstantiateResult,
-    MigrateResult,
-    UploadMeta,
-    UploadResult
-} from "@cosmjs/cosmwasm-stargate";
-
-export interface INetClient {
-    clientAddress: string;
-
-    getBalance(address: string, denom: string): Promise<Coin | null>;
-
-    getMixNodes(contractAddress: string, limit: number, start_after?: string): Promise<PagedMixnodeResponse>;
-
-    getGateways(contractAddress: string, limit: number, start_after?: string): Promise<PagedGatewayResponse>;
-
-    getMixDelegations(contractAddress: string, mixIdentity: string, limit: number, start_after?: string): Promise<PagedMixDelegationsResponse>
-
-    getMixDelegation(contractAddress: string, mixIdentity: string, delegatorAddress: string): Promise<Delegation>
-
-    getGatewayDelegations(contractAddress: string, gatewayIdentity: string, limit: number, start_after?: string): Promise<PagedGatewayDelegationsResponse>
-
-    getGatewayDelegation(contractAddress: string, gatewayIdentity: string, delegatorAddress: string): Promise<Delegation>
-
-    ownsMixNode(contractAddress: string, address: string): Promise<MixOwnershipResponse>;
-
-    ownsGateway(contractAddress: string, address: string): Promise<GatewayOwnershipResponse>;
-
-    getStateParams(contractAddress: string): Promise<StateParams>;
-
-    signAndBroadcast(signerAddress: string, messages: readonly EncodeObject[], fee: StdFee, memo?: string): Promise<BroadcastTxResponse>;
-
-    executeContract(senderAddress: string, contractAddress: string, handleMsg: Record<string, unknown>, memo?: string, transferAmount?: readonly Coin[]): Promise<ExecuteResult>;
-
-    instantiate(senderAddress: string, codeId: number, initMsg: Record<string, unknown>, label: string, options?: InstantiateOptions): Promise<InstantiateResult>;
-
-    sendTokens(senderAddress: string, recipientAddress: string, transferAmount: readonly Coin[], memo?: string): Promise<BroadcastTxResponse>;
-
-    upload(senderAddress: string, wasmCode: Uint8Array, meta?: UploadMeta, memo?: string): Promise<UploadResult>;
-
-    changeValidator(newUrl: string): Promise<void>
-}
-
-/**
- * Takes care of network communication between this code and the validator.
- * Depends on `SigningCosmWasClient`, which signs all requests using keypairs
- * derived from on bech32 mnemonics.
- *
- * Wraps several methods from CosmWasmSigningClient so we can mock them for
- * unit testing.
- */
-export default class NetClient implements INetClient {
-    clientAddress: string;
-    private cosmClient: SigningCosmWasmClient;
-
-    // helpers for changing validators without having to remake the wallet
-    private readonly wallet: DirectSecp256k1HdWallet;
-    private readonly signerOptions: SigningCosmWasmClientOptions;
-
-    private constructor(clientAddress: string, cosmClient: SigningCosmWasmClient, wallet: DirectSecp256k1HdWallet, signerOptions: SigningCosmWasmClientOptions) {
-        this.clientAddress = clientAddress;
-        this.cosmClient = cosmClient;
-        this.wallet = wallet;
-        this.signerOptions = signerOptions;
-    }
-
-    public static async connect(wallet: DirectSecp256k1HdWallet, url: string, prefix: string): Promise<INetClient> {
-        const [{ address }] = await wallet.getAccounts();
-        const signerOptions: SigningCosmWasmClientOptions = {
-            gasPrice: nymGasPrice(prefix),
-            gasLimits: nymGasLimits,
-        };
-        const client = await SigningCosmWasmClient.connectWithSigner(url, wallet, signerOptions);
-        return new NetClient(address, client, wallet, signerOptions);
-    }
-
-    async changeValidator(url: string): Promise<void> {
-        this.cosmClient = await SigningCosmWasmClient.connectWithSigner(url, this.wallet, this.signerOptions);
-    }
-
-    public getMixNodes(contractAddress: string, limit: number, start_after?: string): Promise<PagedMixnodeResponse> {
-        if (start_after == undefined) { // TODO: check if we can take this out, I'm not sure what will happen if we send an "undefined" so I'm playing it safe here.
-            return this.cosmClient.queryContractSmart(contractAddress, { get_mix_nodes: { limit } });
-        } else {
-            return this.cosmClient.queryContractSmart(contractAddress, { get_mix_nodes: { limit, start_after } });
-        }
-    }
-
-    public getGateways(contractAddress: string, limit: number, start_after?: string): Promise<PagedGatewayResponse> {
-        if (start_after == undefined) { // TODO: check if we can take this out, I'm not sure what will happen if we send an "undefined" so I'm playing it safe here.
-            return this.cosmClient.queryContractSmart(contractAddress, { get_gateways: { limit } });
-        } else {
-            return this.cosmClient.queryContractSmart(contractAddress, { get_gateways: { limit, start_after } });
-        }
-    }
-
-    public getMixDelegations(contractAddress: string, mixIdentity: string, limit: number, start_after?: string): Promise<PagedMixDelegationsResponse> {
-        if (start_after == undefined) { // TODO: check if we can take this out, I'm not sure what will happen if we send an "undefined" so I'm playing it safe here.
-            return this.cosmClient.queryContractSmart(contractAddress, {
-                get_mix_delegations: {
-                    mix_identity: mixIdentity,
-                    limit
-                }
-            });
-        } else {
-            return this.cosmClient.queryContractSmart(contractAddress, {
-                get_mix_delegations: {
-                    mix_identity: mixIdentity,
-                    limit,
-                    start_after
-                }
-            });
-        }
-    }
-
-    public getMixDelegation(contractAddress: string, mixIdentity: string, delegatorAddress: string): Promise<Delegation> {
-        return this.cosmClient.queryContractSmart(contractAddress, {
-            get_mix_delegation: {
-                mix_identity: mixIdentity,
-                address: delegatorAddress
-            }
-        });
-    }
-
-    public getGatewayDelegations(contractAddress: string, gatewayIdentity: string, limit: number, start_after?: string): Promise<PagedGatewayDelegationsResponse> {
-        if (start_after == undefined) { // TODO: check if we can take this out, I'm not sure what will happen if we send an "undefined" so I'm playing it safe here.
-            return this.cosmClient.queryContractSmart(contractAddress, {
-                get_gateway_delegations: {
-                    gateway_identity: gatewayIdentity,
-                    limit
-                }
-            });
-        } else {
-            return this.cosmClient.queryContractSmart(contractAddress, {
-                get_gateway_delegations: {
-                    gateway_identity: gatewayIdentity,
-                    limit,
-                    start_after
-                }
-            });
-        }
-    }
-
-    public getGatewayDelegation(contractAddress: string, gatewayIdentity: string, delegatorAddress: string): Promise<Delegation> {
-        return this.cosmClient.queryContractSmart(contractAddress, {
-            get_gateway_delegation: {
-                gateway_identity: gatewayIdentity,
-                address: delegatorAddress
-            }
-        });
-    }
-
-    public ownsMixNode(contractAddress: string, address: string): Promise<MixOwnershipResponse> {
-        return this.cosmClient.queryContractSmart(contractAddress, { owns_mixnode: { address } });
-    }
-
-    public ownsGateway(contractAddress: string, address: string): Promise<GatewayOwnershipResponse> {
-        return this.cosmClient.queryContractSmart(contractAddress, { owns_gateway: { address } });
-    }
-
-    public getBalance(address: string, denom: string): Promise<Coin | null> {
-        return this.cosmClient.getBalance(address, denom);
-    }
-
-    public getStateParams(contractAddress: string): Promise<StateParams> {
-        return this.cosmClient.queryContractSmart(contractAddress, { contract_settings_params: {} });
-    }
-
-    public executeContract(senderAddress: string, contractAddress: string, handleMsg: Record<string, unknown>, memo?: string, transferAmount?: readonly Coin[]): Promise<ExecuteResult> {
-        return this.cosmClient.execute(senderAddress, contractAddress, handleMsg, memo, transferAmount);
-    }
-
-    public signAndBroadcast(signerAddress: string, messages: readonly EncodeObject[], fee: StdFee, memo?: string): Promise<BroadcastTxResponse> {
-        return this.cosmClient.signAndBroadcast(signerAddress, messages, fee, memo)
-    }
-
-    public sendTokens(senderAddress: string, recipientAddress: string, transferAmount: readonly Coin[], memo?: string): Promise<BroadcastTxResponse> {
-        return this.cosmClient.sendTokens(senderAddress, recipientAddress, transferAmount, memo);
-    }
-
-    public upload(senderAddress: string, wasmCode: Uint8Array, meta?: UploadMeta, memo?: string): Promise<UploadResult> {
-        return this.cosmClient.upload(senderAddress, wasmCode, meta, memo);
-    }
-
-    public instantiate(senderAddress: string, codeId: number, initMsg: Record<string, unknown>, label: string, options?: InstantiateOptions): Promise<InstantiateResult> {
-        return this.cosmClient.instantiate(senderAddress, codeId, initMsg, label, options);
-    }
-
-    public migrate(senderAddress: string, contractAddress: string, codeId: number, migrateMsg: Record<string, unknown>, memo?: string): Promise<MigrateResult> {
-        return this.cosmClient.migrate(senderAddress, contractAddress, codeId, migrateMsg, memo)
-    }
-}
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { JsonObject } from '@cosmjs/cosmwasm-stargate/build/queries';
+// eslint-disable-next-line import/no-cycle
+import { INymdQuery } from './query-client';
+import {
+  ContractStateParams,
+  Delegation,
+  GatewayOwnershipResponse,
+  LayerDistribution,
+  MixnetContractVersion,
+  MixOwnershipResponse,
+  PagedAllDelegationsResponse,
+  PagedDelegatorDelegationsResponse,
+  PagedGatewayResponse,
+  PagedMixDelegationsResponse,
+  PagedMixnodeResponse,
+  RewardingIntervalResponse,
+  RewardingStatus,
+} from './types';
+
+interface SmartContractQuery {
+  queryContractSmart(address: string, queryMsg: Record<string, unknown>): Promise<JsonObject>;
+}
+
+export default class NymdQuerier implements INymdQuery {
+  client: SmartContractQuery;
+
+  constructor(client: SmartContractQuery) {
+    this.client = client;
+  }
+
+  getContractVersion(mixnetContractAddress: string): Promise<MixnetContractVersion> {
+    return this.client.queryContractSmart(mixnetContractAddress, {
+      get_contract_version: {},
+    });
+  }
+
+  getMixNodesPaged(mixnetContractAddress: string, limit?: number, startAfter?: string): Promise<PagedMixnodeResponse> {
+    return this.client.queryContractSmart(mixnetContractAddress, {
+      get_mix_nodes: {
+        limit,
+        start_after: startAfter,
+      },
+    });
+  }
+
+  getGatewaysPaged(mixnetContractAddress: string, limit?: number, startAfter?: string): Promise<PagedGatewayResponse> {
+    return this.client.queryContractSmart(mixnetContractAddress, {
+      get_gateways: {
+        limit,
+        start_after: startAfter,
+      },
+    });
+  }
+
+  ownsMixNode(mixnetContractAddress: string, address: string): Promise<MixOwnershipResponse> {
+    return this.client.queryContractSmart(mixnetContractAddress, {
+      owns_mixnode: {
+        address,
+      },
+    });
+  }
+
+  ownsGateway(mixnetContractAddress: string, address: string): Promise<GatewayOwnershipResponse> {
+    return this.client.queryContractSmart(mixnetContractAddress, {
+      owns_gateway: {
+        address,
+      },
+    });
+  }
+
+  getStateParams(mixnetContractAddress: string): Promise<ContractStateParams> {
+    return this.client.queryContractSmart(mixnetContractAddress, {
+      state_params: {},
+    });
+  }
+
+  getCurrentRewardingInterval(mixnetContractAddress: string): Promise<RewardingIntervalResponse> {
+    return this.client.queryContractSmart(mixnetContractAddress, {
+      current_rewarding_interval: {},
+    });
+  }
+
+  getAllNetworkDelegationsPaged(
+    mixnetContractAddress: string,
+    limit?: number,
+    startAfter?: [string, string],
+  ): Promise<PagedAllDelegationsResponse> {
+    return this.client.queryContractSmart(mixnetContractAddress, {
+      get_all_network_delegations: {
+        start_after: startAfter,
+        limit,
+      },
+    });
+  }
+
+  getMixNodeDelegationsPaged(
+    mixnetContractAddress: string,
+    mixIdentity: string,
+    limit?: number,
+    startAfter?: string,
+  ): Promise<PagedMixDelegationsResponse> {
+    return this.client.queryContractSmart(mixnetContractAddress, {
+      get_mixnode_delegations: {
+        mix_identity: mixIdentity,
+        start_after: startAfter,
+        limit,
+      },
+    });
+  }
+
+  getDelegatorDelegationsPaged(
+    mixnetContractAddress: string,
+    delegator: string,
+    limit?: number,
+    startAfter?: string,
+  ): Promise<PagedDelegatorDelegationsResponse> {
+    return this.client.queryContractSmart(mixnetContractAddress, {
+      get_delegator_delegations: {
+        delegator,
+        start_after: startAfter,
+        limit,
+      },
+    });
+  }
+
+  getDelegationDetails(mixnetContractAddress: string, mixIdentity: string, delegator: string): Promise<Delegation> {
+    return this.client.queryContractSmart(mixnetContractAddress, {
+      get_delegation_details: {
+        mix_identity: mixIdentity,
+        delegator,
+      },
+    });
+  }
+
+  getLayerDistribution(mixnetContractAddress: string): Promise<LayerDistribution> {
+    return this.client.queryContractSmart(mixnetContractAddress, {
+      layer_distribution: {},
+    });
+  }
+
+  getRewardPool(mixnetContractAddress: string): Promise<string> {
+    return this.client.queryContractSmart(mixnetContractAddress, {
+      get_reward_pool: {},
+    });
+  }
+
+  getCirculatingSupply(mixnetContractAddress: string): Promise<string> {
+    return this.client.queryContractSmart(mixnetContractAddress, {
+      get_circulating_supply: {},
+    });
+  }
+
+  getEpochRewardPercent(mixnetContractAddress: string): Promise<number> {
+    return this.client.queryContractSmart(mixnetContractAddress, {
+      get_epoch_reward_percent: {},
+    });
+  }
+
+  getSybilResistancePercent(mixnetContractAddress: string): Promise<number> {
+    return this.client.queryContractSmart(mixnetContractAddress, {
+      get_sybil_resistance_percent: {},
+    });
+  }
+
+  getRewardingStatus(
+    mixnetContractAddress: string,
+    mixIdentity: string,
+    rewardingIntervalNonce: number,
+  ): Promise<RewardingStatus> {
+    return this.client.queryContractSmart(mixnetContractAddress, {
+      get_rewarding_status: {
+        mix_identity: mixIdentity,
+        rewarding_interval_nonce: rewardingIntervalNonce,
+      },
+    });
+  }
+}
@@ -1,147 +1,218 @@
-import { Coin } from "@cosmjs/stargate";
-import { CosmWasmClient } from "@cosmjs/cosmwasm-stargate";
+import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate';
+import { Tendermint34Client } from '@cosmjs/tendermint-rpc';
 import {
-    Delegation,
-    GatewayOwnershipResponse,
-    MixOwnershipResponse, PagedGatewayDelegationsResponse,
-    PagedGatewayResponse, PagedMixDelegationsResponse,
-    PagedMixnodeResponse,
-    ContractSettingsParams
-} from "./types";
+  Account,
+  Block,
+  Coin,
+  DeliverTxResponse,
+  IndexedTx,
+  SearchTxFilter,
+  SearchTxQuery,
+  SequenceResponse,
+} from '@cosmjs/stargate';
+import { JsonObject } from '@cosmjs/cosmwasm-stargate/build/queries';
+import { Code, CodeDetails, Contract, ContractCodeHistoryEntry } from '@cosmjs/cosmwasm-stargate/build/cosmwasmclient';
+// eslint-disable-next-line import/no-cycle
+import NymdQuerier from './nymd-querier';
+import {
+  ContractStateParams,
+  Delegation,
+  GatewayBond,
+  GatewayOwnershipResponse,
+  LayerDistribution,
+  MixnetContractVersion,
+  MixNodeBond,
+  MixOwnershipResponse,
+  PagedAllDelegationsResponse,
+  PagedDelegatorDelegationsResponse,
+  PagedGatewayResponse,
+  PagedMixDelegationsResponse,
+  PagedMixnodeResponse,
+  RewardingIntervalResponse,
+  RewardingStatus,
+} from './types';
+import ValidatorApiQuerier, { IValidatorApiQuery } from './validator-api-querier';

-export interface IQueryClient {
-    getBalance(address: string, stakeDenom: string): Promise<Coin | null>;
-
-    getMixNodes(contractAddress: string, limit: number, start_after?: string): Promise<PagedMixnodeResponse>;
-
-    getGateways(contractAddress: string, limit: number, start_after?: string): Promise<PagedGatewayResponse>;
-
-    getMixDelegations(contractAddress: string, mixIdentity: string, limit: number, start_after?: string): Promise<PagedMixDelegationsResponse>
-
-    getMixDelegation(contractAddress: string, mixIdentity: string, delegatorAddress: string): Promise<Delegation>
-
-    getGatewayDelegations(contractAddress: string, gatewayIdentity: string, limit: number, start_after?: string): Promise<PagedGatewayDelegationsResponse>
-
-    getGatewayDelegation(contractAddress: string, gatewayIdentity: string, delegatorAddress: string): Promise<Delegation>
-
-    ownsMixNode(contractAddress: string, address: string): Promise<MixOwnershipResponse>;
-
-    ownsGateway(contractAddress: string, address: string): Promise<GatewayOwnershipResponse>;
-
-    getStateParams(contractAddress: string): Promise<ContractSettingsParams>;
-
-    changeValidator(newUrl: string): Promise<void>
+export interface ICosmWasmQuery {
+  // methods exposed by `CosmWasmClient`
+  getChainId(): Promise<string>;
+  getHeight(): Promise<number>;
+  getAccount(searchAddress: string): Promise<Account | null>;
+  getSequence(address: string): Promise<SequenceResponse>;
+  getBlock(height?: number): Promise<Block>;
+  getBalance(address: string, searchDenom: string): Promise<Coin>;
+  getTx(id: string): Promise<IndexedTx | null>;
+  searchTx(query: SearchTxQuery, filter?: SearchTxFilter): Promise<readonly IndexedTx[]>;
+  disconnect(): void;
+  broadcastTx(tx: Uint8Array, timeoutMs?: number, pollIntervalMs?: number): Promise<DeliverTxResponse>;
+  getCodes(): Promise<readonly Code[]>;
+  getCodeDetails(codeId: number): Promise<CodeDetails>;
+  getContracts(codeId: number): Promise<readonly string[]>;
+  getContract(address: string): Promise<Contract>;
+  getContractCodeHistory(address: string): Promise<readonly ContractCodeHistoryEntry[]>;
+  queryContractRaw(address: string, key: Uint8Array): Promise<Uint8Array | null>;
+  queryContractSmart(address: string, queryMsg: Record<string, unknown>): Promise<JsonObject>;
 }

-/**
- * Takes care of network communication between this code and the validator.
- * Depends on `SigningCosmWasClient`, which signs all requests using keypairs
- * derived from on bech32 mnemonics.
- *
- * Wraps several methods from CosmWasmSigningClient so we can mock them for
- * unit testing.
- */
-export default class QueryClient implements IQueryClient {
-    private cosmClient: CosmWasmClient;
+export interface INymdQuery {
+  // nym-specific implemented inside NymQuerier
+  getContractVersion(mixnetContractAddress: string): Promise<MixnetContractVersion>;

-    private constructor(cosmClient: CosmWasmClient) {
-        this.cosmClient = cosmClient;
-    }
+  getMixNodesPaged(mixnetContractAddress: string, limit?: number, startAfter?: string): Promise<PagedMixnodeResponse>;
+  getGatewaysPaged(mixnetContractAddress: string, limit?: number, startAfter?: string): Promise<PagedGatewayResponse>;
+  ownsMixNode(mixnetContractAddress: string, address: string): Promise<MixOwnershipResponse>;
+  ownsGateway(mixnetContractAddress: string, address: string): Promise<GatewayOwnershipResponse>;
+  getStateParams(mixnetContractAddress: string): Promise<ContractStateParams>;
+  getCurrentRewardingInterval(mixnetContractAddress: string): Promise<RewardingIntervalResponse>;

-    public static async connect(url: string): Promise<IQueryClient> {
-        const client = await CosmWasmClient.connect(url)
-        return new QueryClient(client)
-    }
+  getAllNetworkDelegationsPaged(
+    mixnetContractAddress: string,
+    limit?: number,
+    startAfter?: [string, string],
+  ): Promise<PagedAllDelegationsResponse>;
+  getMixNodeDelegationsPaged(
+    mixnetContractAddress: string,
+    mixIdentity: string,
+    limit?: number,
+    startAfter?: string,
+  ): Promise<PagedMixDelegationsResponse>;
+  getDelegatorDelegationsPaged(
+    mixnetContractAddress: string,
+    delegator: string,
+    limit?: number,
+    startAfter?: string,
+  ): Promise<PagedDelegatorDelegationsResponse>;
+  getDelegationDetails(mixnetContractAddress: string, mixIdentity: string, delegator: string): Promise<Delegation>;

-    async changeValidator(url: string): Promise<void> {
-        this.cosmClient = await CosmWasmClient.connect(url)
-    }
-
-    public getMixNodes(contractAddress: string, limit: number, start_after?: string): Promise<PagedMixnodeResponse> {
-        if (start_after == undefined) { // TODO: check if we can take this out, I'm not sure what will happen if we send an "undefined" so I'm playing it safe here.
-            return this.cosmClient.queryContractSmart(contractAddress, { get_mix_nodes: { limit } });
-        } else {
-            return this.cosmClient.queryContractSmart(contractAddress, { get_mix_nodes: { limit, start_after } });
-        }
-    }
-
-    public getGateways(contractAddress: string, limit: number, start_after?: string): Promise<PagedGatewayResponse> {
-        if (start_after == undefined) { // TODO: check if we can take this out, I'm not sure what will happen if we send an "undefined" so I'm playing it safe here.
-            return this.cosmClient.queryContractSmart(contractAddress, { get_gateways: { limit } });
-        } else {
-            return this.cosmClient.queryContractSmart(contractAddress, { get_gateways: { limit, start_after } });
-        }
-    }
-
-    public getMixDelegations(contractAddress: string, mixIdentity: string, limit: number, start_after?: string): Promise<PagedMixDelegationsResponse> {
-        if (start_after == undefined) { // TODO: check if we can take this out, I'm not sure what will happen if we send an "undefined" so I'm playing it safe here.
-            return this.cosmClient.queryContractSmart(contractAddress, {
-                get_mix_delegations: {
-                    mix_identity: mixIdentity,
-                    limit
-                }
-            });
-        } else {
-            return this.cosmClient.queryContractSmart(contractAddress, {
-                get_mix_delegations: {
-                    mix_identity: mixIdentity,
-                    limit,
-                    start_after
-                }
-            });
-        }
-    }
-
-    public getMixDelegation(contractAddress: string, mixIdentity: string, delegatorAddress: string): Promise<Delegation> {
-        return this.cosmClient.queryContractSmart(contractAddress, {
-            get_mix_delegation: {
-                mix_identity: mixIdentity,
-                address: delegatorAddress
-            }
-        });
-    }
-
-    public getGatewayDelegations(contractAddress: string, gatewayIdentity: string, limit: number, start_after?: string): Promise<PagedGatewayDelegationsResponse> {
-        if (start_after == undefined) { // TODO: check if we can take this out, I'm not sure what will happen if we send an "undefined" so I'm playing it safe here.
-            return this.cosmClient.queryContractSmart(contractAddress, {
-                get_gateway_delegations: {
-                    gateway_identity: gatewayIdentity,
-                    limit
-                }
-            });
-        } else {
-            return this.cosmClient.queryContractSmart(contractAddress, {
-                get_gateway_delegations: {
-                    gateway_identity: gatewayIdentity,
-                    limit,
-                    start_after
-                }
-            });
-        }
-    }
-
-    public getGatewayDelegation(contractAddress: string, gatewayIdentity: string, delegatorAddress: string): Promise<Delegation> {
-        return this.cosmClient.queryContractSmart(contractAddress, {
-            get_gateway_delegation: {
-                gateway_identity: gatewayIdentity,
-                address: delegatorAddress
-            }
-        });
-    }
-
-    public ownsMixNode(contractAddress: string, address: string): Promise<MixOwnershipResponse> {
-        return this.cosmClient.queryContractSmart(contractAddress, { owns_mixnode: { address } });
-    }
-
-    public ownsGateway(contractAddress: string, address: string): Promise<GatewayOwnershipResponse> {
-        return this.cosmClient.queryContractSmart(contractAddress, { owns_gateway: { address } });
-    }
-
-    public getBalance(address: string, stakeDenom: string): Promise<Coin | null> {
-        return this.cosmClient.getBalance(address, stakeDenom);
-    }
-
-    public getStateParams(contractAddress: string): Promise<ContractSettingsParams> {
-        return this.cosmClient.queryContractSmart(contractAddress, { contract_settings_params: {} });
-    }
+  getLayerDistribution(mixnetContractAddress: string): Promise<LayerDistribution>;
+  getRewardPool(mixnetContractAddress: string): Promise<string>;
+  getCirculatingSupply(mixnetContractAddress: string): Promise<string>;
+  getEpochRewardPercent(mixnetContractAddress: string): Promise<number>;
+  getSybilResistancePercent(mixnetContractAddress: string): Promise<number>;
+  getRewardingStatus(
+    mixnetContractAddress: string,
+    mixIdentity: string,
+    rewardingIntervalNonce: number,
+  ): Promise<RewardingStatus>;
+}
+
+export interface IQueryClient extends ICosmWasmQuery, INymdQuery, IValidatorApiQuery {}
+
+export default class QueryClient extends CosmWasmClient implements IQueryClient {
+  private nymdQuerier: NymdQuerier;
+
+  private validatorApiQuerier: ValidatorApiQuerier;
+
+  private constructor(tmClient: Tendermint34Client, validatorApiUrl: string) {
+    super(tmClient);
+    this.nymdQuerier = new NymdQuerier(this);
+    this.validatorApiQuerier = new ValidatorApiQuerier(validatorApiUrl);
+  }
+
+  public static async connectWithNym(nymdUrl: string, validatorApiUrl: string): Promise<QueryClient> {
+    const tmClient = await Tendermint34Client.connect(nymdUrl);
+    return new QueryClient(tmClient, validatorApiUrl);
+  }
+
+  getContractVersion(mixnetContractAddress: string): Promise<MixnetContractVersion> {
+    return this.nymdQuerier.getContractVersion(mixnetContractAddress);
+  }
+
+  getMixNodesPaged(mixnetContractAddress: string, limit?: number, startAfter?: string): Promise<PagedMixnodeResponse> {
+    return this.nymdQuerier.getMixNodesPaged(mixnetContractAddress, limit, startAfter);
+  }
+
+  getGatewaysPaged(mixnetContractAddress: string, limit?: number, startAfter?: string): Promise<PagedGatewayResponse> {
+    return this.nymdQuerier.getGatewaysPaged(mixnetContractAddress, limit, startAfter);
+  }
+
+  ownsMixNode(mixnetContractAddress: string, address: string): Promise<MixOwnershipResponse> {
+    return this.nymdQuerier.ownsMixNode(mixnetContractAddress, address);
+  }
+
+  ownsGateway(mixnetContractAddress: string, address: string): Promise<GatewayOwnershipResponse> {
+    return this.nymdQuerier.ownsGateway(mixnetContractAddress, address);
+  }
+
+  getStateParams(mixnetContractAddress: string): Promise<ContractStateParams> {
+    return this.nymdQuerier.getStateParams(mixnetContractAddress);
+  }
+
+  getCurrentRewardingInterval(mixnetContractAddress: string): Promise<RewardingIntervalResponse> {
+    return this.nymdQuerier.getCurrentRewardingInterval(mixnetContractAddress);
+  }
+
+  getAllNetworkDelegationsPaged(
+    mixnetContractAddress: string,
+    limit?: number,
+    startAfter?: [string, string],
+  ): Promise<PagedAllDelegationsResponse> {
+    return this.nymdQuerier.getAllNetworkDelegationsPaged(mixnetContractAddress, limit, startAfter);
+  }
+
+  getMixNodeDelegationsPaged(
+    mixnetContractAddress: string,
+    mixIdentity: string,
+    limit?: number,
+    startAfter?: string,
+  ): Promise<PagedMixDelegationsResponse> {
+    return this.nymdQuerier.getMixNodeDelegationsPaged(mixnetContractAddress, mixIdentity, limit, startAfter);
+  }
+
+  getDelegatorDelegationsPaged(
+    mixnetContractAddress: string,
+    delegator: string,
+    limit?: number,
+    startAfter?: string,
+  ): Promise<PagedDelegatorDelegationsResponse> {
+    return this.nymdQuerier.getDelegatorDelegationsPaged(mixnetContractAddress, delegator, limit, startAfter);
+  }
+
+  getDelegationDetails(mixnetContractAddress: string, mixIdentity: string, delegator: string): Promise<Delegation> {
+    return this.nymdQuerier.getDelegationDetails(mixnetContractAddress, mixIdentity, delegator);
+  }
+
+  getLayerDistribution(mixnetContractAddress: string): Promise<LayerDistribution> {
+    return this.nymdQuerier.getLayerDistribution(mixnetContractAddress);
+  }
+
+  getRewardPool(mixnetContractAddress: string): Promise<string> {
+    return this.nymdQuerier.getRewardPool(mixnetContractAddress);
+  }
+
+  getCirculatingSupply(mixnetContractAddress: string): Promise<string> {
+    return this.nymdQuerier.getCirculatingSupply(mixnetContractAddress);
+  }
+
+  getEpochRewardPercent(mixnetContractAddress: string): Promise<number> {
+    return this.nymdQuerier.getEpochRewardPercent(mixnetContractAddress);
+  }
+
+  getSybilResistancePercent(mixnetContractAddress: string): Promise<number> {
+    return this.nymdQuerier.getSybilResistancePercent(mixnetContractAddress);
+  }
+
+  getRewardingStatus(
+    mixnetContractAddress: string,
+    mixIdentity: string,
+    rewardingIntervalNonce: number,
+  ): Promise<RewardingStatus> {
+    return this.nymdQuerier.getRewardingStatus(mixnetContractAddress, mixIdentity, rewardingIntervalNonce);
+  }
+
+  getCachedGateways(): Promise<GatewayBond[]> {
+    return this.validatorApiQuerier.getCachedGateways();
+  }
+
+  getCachedMixnodes(): Promise<MixNodeBond[]> {
+    return this.validatorApiQuerier.getCachedMixnodes();
+  }
+
+  getActiveMixnodes(): Promise<MixNodeBond[]> {
+    return this.validatorApiQuerier.getActiveMixnodes();
+  }
+
+  getRewardedMixnodes(): Promise<MixNodeBond[]> {
+    return this.validatorApiQuerier.getRewardedMixnodes();
+  }
 }
@@ -0,0 +1,467 @@
+import {
+  ExecuteResult,
+  InstantiateOptions,
+  InstantiateResult,
+  MigrateResult,
+  SigningCosmWasmClient,
+  SigningCosmWasmClientOptions,
+  UploadResult,
+} from '@cosmjs/cosmwasm-stargate';
+import { DirectSecp256k1HdWallet, EncodeObject } from '@cosmjs/proto-signing';
+import { Coin, DeliverTxResponse, SignerData, StdFee } from '@cosmjs/stargate';
+import { Tendermint34Client } from '@cosmjs/tendermint-rpc';
+import { ChangeAdminResult } from '@cosmjs/cosmwasm-stargate/build/signingcosmwasmclient';
+import { TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx';
+import { nymGasPrice } from './stargate-helper';
+import { IQueryClient } from './query-client';
+import NymdQuerier from './nymd-querier';
+import {
+  ContractStateParams,
+  Delegation,
+  Gateway,
+  GatewayBond,
+  GatewayOwnershipResponse,
+  LayerDistribution,
+  MixnetContractVersion,
+  MixNode,
+  MixNodeBond,
+  MixOwnershipResponse,
+  PagedAllDelegationsResponse,
+  PagedDelegatorDelegationsResponse,
+  PagedGatewayResponse,
+  PagedMixDelegationsResponse,
+  PagedMixnodeResponse,
+  RewardingIntervalResponse,
+  RewardingStatus,
+} from './types';
+import ValidatorApiQuerier from './validator-api-querier';
+
+// methods exposed by `SigningCosmWasmClient`
+export interface ICosmWasmSigning {
+  simulate(signerAddress: string, messages: readonly EncodeObject[], memo: string | undefined): Promise<number>;
+
+  upload(
+    senderAddress: string,
+    wasmCode: Uint8Array,
+    fee: StdFee | 'auto' | number,
+    memo?: string,
+  ): Promise<UploadResult>;
+
+  instantiate(
+    senderAddress: string,
+    codeId: number,
+    msg: Record<string, unknown>,
+    label: string,
+    fee: StdFee | 'auto' | number,
+    options?: InstantiateOptions,
+  ): Promise<InstantiateResult>;
+
+  updateAdmin(
+    senderAddress: string,
+    contractAddress: string,
+    newAdmin: string,
+    fee: StdFee | 'auto' | number,
+    memo?: string,
+  ): Promise<ChangeAdminResult>;
+
+  clearAdmin(
+    senderAddress: string,
+    contractAddress: string,
+    fee: StdFee | 'auto' | number,
+    memo?: string,
+  ): Promise<ChangeAdminResult>;
+
+  migrate(
+    senderAddress: string,
+    contractAddress: string,
+    codeId: number,
+    migrateMsg: Record<string, unknown>,
+    fee: StdFee | 'auto' | number,
+    memo?: string,
+  ): Promise<MigrateResult>;
+
+  execute(
+    senderAddress: string,
+    contractAddress: string,
+    msg: Record<string, unknown>,
+    fee: StdFee | 'auto' | number,
+    memo?: string,
+    funds?: readonly Coin[],
+  ): Promise<ExecuteResult>;
+
+  sendTokens(
+    senderAddress: string,
+    recipientAddress: string,
+    amount: readonly Coin[],
+    fee: StdFee | 'auto' | number,
+    memo?: string,
+  ): Promise<DeliverTxResponse>;
+
+  delegateTokens(
+    delegatorAddress: string,
+    validatorAddress: string,
+    amount: Coin,
+    fee: StdFee | 'auto' | number,
+    memo?: string,
+  ): Promise<DeliverTxResponse>;
+
+  undelegateTokens(
+    delegatorAddress: string,
+    validatorAddress: string,
+    amount: Coin,
+    fee: StdFee | 'auto' | number,
+    memo?: string,
+  ): Promise<DeliverTxResponse>;
+
+  withdrawRewards(
+    delegatorAddress: string,
+    validatorAddress: string,
+    fee: StdFee | 'auto' | number,
+    memo?: string,
+  ): Promise<DeliverTxResponse>;
+
+  signAndBroadcast(
+    signerAddress: string,
+    messages: readonly EncodeObject[],
+    fee: StdFee | 'auto' | number,
+    memo?: string,
+  ): Promise<DeliverTxResponse>;
+
+  sign(
+    signerAddress: string,
+    messages: readonly EncodeObject[],
+    fee: StdFee,
+    memo: string,
+    explicitSignerData?: SignerData,
+  ): Promise<TxRaw>;
+}
+
+export interface INymSigning {
+  clientAddress: string;
+}
+
+export interface ISigningClient extends IQueryClient, ICosmWasmSigning, INymSigning {
+  bondMixNode(
+    mixnetContractAddress: string,
+    mixNode: MixNode,
+    ownerSignature: string,
+    pledge: Coin,
+    fee?: StdFee | 'auto' | number,
+    memo?: string,
+  ): Promise<ExecuteResult>;
+
+  unbondMixNode(mixnetContractAddress: string, fee?: StdFee | 'auto' | number, memo?: string): Promise<ExecuteResult>;
+
+  bondGateway(
+    mixnetContractAddress: string,
+    gateway: Gateway,
+    ownerSignature: string,
+    pledge: Coin,
+    fee?: StdFee | 'auto' | number,
+    memo?: string,
+  ): Promise<ExecuteResult>;
+
+  unbondGateway(mixnetContractAddress: string, fee?: StdFee | 'auto' | number, memo?: string): Promise<ExecuteResult>;
+
+  delegateToMixNode(
+    mixnetContractAddress: string,
+    mixIdentity: string,
+    amount: Coin,
+    fee?: StdFee | 'auto' | number,
+    memo?: string,
+  ): Promise<ExecuteResult>;
+
+  undelegateFromMixNode(
+    mixnetContractAddress: string,
+    mixIdentity: string,
+    fee?: StdFee | 'auto' | number,
+    memo?: string,
+  ): Promise<ExecuteResult>;
+
+  updateContractStateParams(
+    mixnetContractAddress: string,
+    newParams: ContractStateParams,
+    fee?: StdFee | 'auto' | number,
+    memo?: string,
+  ): Promise<ExecuteResult>;
+
+  // I don't see any point in exposing rewarding / vesting-related (INSIDE mixnet contract, like "BondMixnodeOnBehalf")
+  // functionalities in our typescript client. However, if for some reason, we find we need them
+  // they're rather trivial to add.
+}
+
+export default class SigningClient extends SigningCosmWasmClient implements ISigningClient {
+  private nymdQuerier: NymdQuerier;
+
+  private validatorApiQuerier: ValidatorApiQuerier;
+
+  clientAddress: string;
+
+  private constructor(
+    clientAddress: string,
+    validatorApiUrl: string,
+    tmClient: Tendermint34Client,
+    wallet: DirectSecp256k1HdWallet,
+    signerOptions: SigningCosmWasmClientOptions,
+  ) {
+    super(tmClient, wallet, signerOptions);
+    this.clientAddress = clientAddress;
+    this.nymdQuerier = new NymdQuerier(this);
+    this.validatorApiQuerier = new ValidatorApiQuerier(validatorApiUrl);
+  }
+
+  public static async connectWithNymSigner(
+    wallet: DirectSecp256k1HdWallet,
+    nymdUrl: string,
+    validatorApiUrl: string,
+    prefix: string,
+  ): Promise<SigningClient> {
+    const [{ address }] = await wallet.getAccounts();
+    const signerOptions: SigningCosmWasmClientOptions = {
+      gasPrice: nymGasPrice(prefix),
+    };
+    const tmClient = await Tendermint34Client.connect(nymdUrl);
+    return new SigningClient(address, validatorApiUrl, tmClient, wallet, signerOptions);
+  }
+
+  // query related:
+
+  getContractVersion(mixnetContractAddress: string): Promise<MixnetContractVersion> {
+    return this.nymdQuerier.getContractVersion(mixnetContractAddress);
+  }
+
+  getMixNodesPaged(mixnetContractAddress: string, limit?: number, startAfter?: string): Promise<PagedMixnodeResponse> {
+    return this.nymdQuerier.getMixNodesPaged(mixnetContractAddress, limit, startAfter);
+  }
+
+  getGatewaysPaged(mixnetContractAddress: string, limit?: number, startAfter?: string): Promise<PagedGatewayResponse> {
+    return this.nymdQuerier.getGatewaysPaged(mixnetContractAddress, limit, startAfter);
+  }
+
+  ownsMixNode(mixnetContractAddress: string, address: string): Promise<MixOwnershipResponse> {
+    return this.nymdQuerier.ownsMixNode(mixnetContractAddress, address);
+  }
+
+  ownsGateway(mixnetContractAddress: string, address: string): Promise<GatewayOwnershipResponse> {
+    return this.nymdQuerier.ownsGateway(mixnetContractAddress, address);
+  }
+
+  getStateParams(mixnetContractAddress: string): Promise<ContractStateParams> {
+    return this.nymdQuerier.getStateParams(mixnetContractAddress);
+  }
+
+  getCurrentRewardingInterval(mixnetContractAddress: string): Promise<RewardingIntervalResponse> {
+    return this.nymdQuerier.getCurrentRewardingInterval(mixnetContractAddress);
+  }
+
+  getAllNetworkDelegationsPaged(
+    mixnetContractAddress: string,
+    limit?: number,
+    startAfter?: [string, string],
+  ): Promise<PagedAllDelegationsResponse> {
+    return this.nymdQuerier.getAllNetworkDelegationsPaged(mixnetContractAddress, limit, startAfter);
+  }
+
+  getMixNodeDelegationsPaged(
+    mixnetContractAddress: string,
+    mixIdentity: string,
+    limit?: number,
+    startAfter?: string,
+  ): Promise<PagedMixDelegationsResponse> {
+    return this.nymdQuerier.getMixNodeDelegationsPaged(mixnetContractAddress, mixIdentity, limit, startAfter);
+  }
+
+  getDelegatorDelegationsPaged(
+    mixnetContractAddress: string,
+    delegator: string,
+    limit?: number,
+    startAfter?: string,
+  ): Promise<PagedDelegatorDelegationsResponse> {
+    return this.nymdQuerier.getDelegatorDelegationsPaged(mixnetContractAddress, delegator, limit, startAfter);
+  }
+
+  getDelegationDetails(mixnetContractAddress: string, mixIdentity: string, delegator: string): Promise<Delegation> {
+    return this.nymdQuerier.getDelegationDetails(mixnetContractAddress, mixIdentity, delegator);
+  }
+
+  getLayerDistribution(mixnetContractAddress: string): Promise<LayerDistribution> {
+    return this.nymdQuerier.getLayerDistribution(mixnetContractAddress);
+  }
+
+  getRewardPool(mixnetContractAddress: string): Promise<string> {
+    return this.nymdQuerier.getRewardPool(mixnetContractAddress);
+  }
+
+  getCirculatingSupply(mixnetContractAddress: string): Promise<string> {
+    return this.nymdQuerier.getCirculatingSupply(mixnetContractAddress);
+  }
+
+  getEpochRewardPercent(mixnetContractAddress: string): Promise<number> {
+    return this.nymdQuerier.getEpochRewardPercent(mixnetContractAddress);
+  }
+
+  getSybilResistancePercent(mixnetContractAddress: string): Promise<number> {
+    return this.nymdQuerier.getSybilResistancePercent(mixnetContractAddress);
+  }
+
+  getRewardingStatus(
+    mixnetContractAddress: string,
+    mixIdentity: string,
+    rewardingIntervalNonce: number,
+  ): Promise<RewardingStatus> {
+    return this.nymdQuerier.getRewardingStatus(mixnetContractAddress, mixIdentity, rewardingIntervalNonce);
+  }
+
+  getCachedGateways(): Promise<GatewayBond[]> {
+    return this.validatorApiQuerier.getCachedGateways();
+  }
+
+  getCachedMixnodes(): Promise<MixNodeBond[]> {
+    return this.validatorApiQuerier.getCachedMixnodes();
+  }
+
+  getActiveMixnodes(): Promise<MixNodeBond[]> {
+    return this.validatorApiQuerier.getActiveMixnodes();
+  }
+
+  getRewardedMixnodes(): Promise<MixNodeBond[]> {
+    return this.validatorApiQuerier.getRewardedMixnodes();
+  }
+
+  // signing related:
+
+  bondMixNode(
+    mixnetContractAddress: string,
+    mixNode: MixNode,
+    ownerSignature: string,
+    pledge: Coin,
+    fee: StdFee | 'auto' | number = 'auto',
+    memo = 'Default MixNode Bonding from Typescript',
+  ): Promise<ExecuteResult> {
+    return this.execute(
+      this.clientAddress,
+      mixnetContractAddress,
+      {
+        bond_mixnode: {
+          mix_node: mixNode,
+          owner_signature: ownerSignature,
+        },
+      },
+      fee,
+      memo,
+      [pledge],
+    );
+  }
+
+  unbondMixNode(
+    mixnetContractAddress: string,
+    fee: StdFee | 'auto' | number = 'auto',
+    memo = 'Default MixNode Unbonding from Typescript',
+  ): Promise<ExecuteResult> {
+    return this.execute(
+      this.clientAddress,
+      mixnetContractAddress,
+      {
+        unbond_mixnode: {},
+      },
+      fee,
+      memo,
+    );
+  }
+
+  bondGateway(
+    mixnetContractAddress: string,
+    gateway: Gateway,
+    ownerSignature: string,
+    pledge: Coin,
+    fee: StdFee | 'auto' | number = 'auto',
+    memo = 'Default Gateway Bonding from Typescript',
+  ): Promise<ExecuteResult> {
+    return this.execute(
+      this.clientAddress,
+      mixnetContractAddress,
+      {
+        bond_gateway: {
+          gateway,
+          owner_signature: ownerSignature,
+        },
+      },
+      fee,
+      memo,
+      [pledge],
+    );
+  }
+
+  unbondGateway(
+    mixnetContractAddress: string,
+    fee: StdFee | 'auto' | number = 'auto',
+    memo = 'Default Gateway Unbonding from Typescript',
+  ): Promise<ExecuteResult> {
+    return this.execute(
+      this.clientAddress,
+      mixnetContractAddress,
+      {
+        unbond_gateway: {},
+      },
+      fee,
+      memo,
+    );
+  }
+
+  delegateToMixNode(
+    mixnetContractAddress: string,
+    mixIdentity: string,
+    amount: Coin,
+    fee: StdFee | 'auto' | number = 'auto',
+    memo = 'Default MixNode Delegation from Typescript',
+  ): Promise<ExecuteResult> {
+    return this.execute(
+      this.clientAddress,
+      mixnetContractAddress,
+      {
+        delegate_to_mixnode: {
+          mix_identity: mixIdentity,
+        },
+      },
+      fee,
+      memo,
+      [amount],
+    );
+  }
+
+  undelegateFromMixNode(
+    mixnetContractAddress: string,
+    mixIdentity: string,
+    fee: StdFee | 'auto' | number = 'auto',
+    memo = 'Default MixNode Undelegation from Typescript',
+  ): Promise<ExecuteResult> {
+    return this.execute(
+      this.clientAddress,
+      mixnetContractAddress,
+      {
+        undelegate_from_mixnode: {
+          mix_identity: mixIdentity,
+        },
+      },
+      fee,
+      memo,
+    );
+  }
+
+  updateContractStateParams(
+    mixnetContractAddress: string,
+    newParams: ContractStateParams,
+    fee: StdFee | 'auto' | number = 'auto',
+    memo = 'Default Contract State Params Update from Typescript',
+  ): Promise<ExecuteResult> {
+    return this.execute(
+      this.clientAddress,
+      mixnetContractAddress,
+      {
+        update_contract_state_params: newParams,
+      },
+      fee,
+      memo,
+    );
+  }
+}
@@ -1,26 +1,19 @@
-import axios from "axios";
-import { GasLimits, GasPrice } from "@cosmjs/stargate";
-import { CosmWasmFeeTable, defaultGasLimits } from "@cosmjs/cosmwasm-stargate";
-
-export const nymGasLimits: GasLimits<CosmWasmFeeTable> = {
-    ...defaultGasLimits,
-    upload: 2_500_000,
-    init: 500_000,
-    migrate: 200_000,
-    exec: 250_000,
-    send: 80_000,
-    changeAdmin: 80_000,
-};
+import axios from 'axios';
+import { GasPrice } from '@cosmjs/stargate';

 export function nymGasPrice(prefix: string): GasPrice {
+  if (typeof prefix === 'string') {
    return GasPrice.fromString(`0.025u${prefix}`); // TODO: ideally this ugly conversion shouldn't be hardcoded here.
+  }
+  else {
+    throw new Error(`${prefix} is not of type string`);
+  }
 }

 export const downloadWasm = async (url: string): Promise<Uint8Array> => {
-    const r = await axios.get(url, {responseType: "arraybuffer"});
-    if (r.status !== 200) {
-        throw new Error(`Download error: ${r.status}`);
-    }
-    return r.data;
+  const r = await axios.get(url, { responseType: 'arraybuffer' });
+  if (r.status !== 200) {
+    throw new Error(`Download error: ${r.status}`);
+  }
+  return r.data;
 };
-
@@ -1,125 +1,162 @@
-import { Coin } from "@cosmjs/stargate";
+import { Coin } from '@cosmjs/stargate';

+// TODO: ideally we'd have re-exported those using that fancy crate that builds ts types from rust
+
+export type MixnetContractVersion = {
+  build_timestamp: string;
+  build_version: string;
+  commit_sha: string;
+  commit_timestamp: string;
+  commit_branch: string;
+  rustc_version: string;
+};

-/// One page of a possible multi-page set of mixnodes. The paging interface is quite
-/// inconvenient, as we don't have the two pieces of information we need to know
-/// in order to do paging nicely (namely `currentPage` and `totalPages` parameters).
-///
-/// Instead, we have only `start_next_page_after`, i.e. the key of the last record
-/// on this page. In order to get the *next* page, CosmWasm looks at that value,
-/// finds the next record, and builds the next page starting there. This happens
-/// **in series** rather than **in parallel** (!).
-///
-/// So we have some consistency problems:
-///
-/// * we can't make requests at a given block height, so the result set
-///    which we assemble over time may change while requests are being made.
-/// * at some point we will make a request for a `start_next_page_after` key
-///   which has just been deleted from the database.
-///
-/// TODO: more robust error handling on the "deleted key" case.
 export type PagedMixnodeResponse = {
-    nodes: MixNodeBond[],
-    per_page: number, // TODO: camelCase
-    start_next_after: string, // TODO: camelCase
-}
+  nodes: MixNodeBond[];
+  per_page: number;
+  start_next_after?: string;
+};

-// a temporary way of achieving the same paging behaviour for the gateways
-// the same points made for `PagedResponse` stand here.
 export type PagedGatewayResponse = {
-    nodes: GatewayBond[],
-    per_page: number, // TODO: camelCase
-    start_next_after: string, // TODO: camelCase
-}
+  nodes: GatewayBond[];
+  per_page: number;
+  start_next_after?: string;
+};

 export type MixOwnershipResponse = {
-    address: string,
-    has_node: boolean,
-}
+  address: string;
+  mixnode?: MixNodeBond;
+};

 export type GatewayOwnershipResponse = {
-    address: string,
-    has_gateway: boolean,
-}
+  address: string;
+  gateway?: GatewayBond;
+};

-export type ContractSettingsParams = {
-    epoch_length: number,
-    // ideally I'd want to define those as `number` rather than `string`, but
-    // rust-side they are defined as Uint128 and Decimal that don't have
-    // native javascript representations and therefore are interpreted as strings after deserialization
-    minimum_mixnode_bond: string,
-    minimum_gateway_bond: string,
-    mixnode_bond_reward_rate: string,
-    gateway_bond_reward_rate: string,
-    mixnode_delegation_reward_rate: string,
-    gateway_delegation_reward_rate: string,
-    mixnode_active_set_size: number,
-    gateway_active_set_size: number,
-}
+export type ContractStateParams = {
+  // ideally I'd want to define those as `number` rather than `string`, but
+  // rust-side they are defined as Uint128 and that don't have
+  // native javascript representations and therefore are interpreted as strings after deserialization
+  minimum_mixnode_pledge: string;
+  minimum_gateway_pledge: string;
+  mixnode_rewarded_set_size: number;
+  mixnode_active_set_size: number;
+};
+
+export type RewardingIntervalResponse = {
+  current_rewarding_interval_starting_block: number;
+  current_rewarding_interval_nonce: number;
+  rewarding_in_progress: boolean;
+};
+
+export type LayerDistribution = {
+  gateways: number;
+  layer1: number;
+  layer2: number;
+  layer3: number;
+};

 export type Delegation = {
-    owner: string,
-    amount: Coin,
-}
+  owner: string;
+  node_identity: string;
+  amount: Coin;
+  block_height: number;
+  proxy?: string;
+};

 export type PagedMixDelegationsResponse = {
-    node_owner: string,
-    delegations: Delegation[],
-    start_next_after: string
-}
+  delegations: Delegation[];
+  start_next_after?: string;
+};

-export type PagedGatewayDelegationsResponse = {
-    node_owner: string,
-    delegations: Delegation[],
-    start_next_after: string
-}
+export type PagedDelegatorDelegationsResponse = {
+  delegations: Delegation[];
+  start_next_after?: string;
+};

+export type PagedAllDelegationsResponse = {
+  delegations: Delegation[];
+  start_next_after?: [string, string];
+};
+
+export type RewardingResult = {
+  operator_reward: string;
+  total_delegator_reward: string;
+};
+
+export type NodeRewardParams = {
+  period_reward_pool: string;
+  k: string;
+  reward_blockstamp: number;
+  circulating_supply: string;
+  uptime: string;
+  sybil_resistance_percent: number;
+};
+
+export type DelegatorRewardParams = {
+  node_reward_params: NodeRewardParams;
+  sigma: number;
+  profit_margin: number;
+  node_profit: number;
+};
+
+export type PendingDelegatorRewarding = {
+  running_results: RewardingResult;
+  next_start: string;
+  rewarding_params: DelegatorRewardParams;
+};
+
+export type RewardingStatus = { Complete: RewardingResult } | { PendingNextDelegatorPage: PendingDelegatorRewarding };
+
+export type MixnodeRewardingStatusResponse = {
+  status?: RewardingStatus;
+};

 export enum Layer {
-    Gateway,
-    One,
-    Two,
-    Three,
+  Gateway,
+  One,
+  Two,
+  Three,
 }

-export type MixNodeBond = { // TODO: change name to MixNodeBond
-    owner: string,
-    mix_node: MixNode,    // TODO: camelCase this later once everything else works
-    layer: Layer,
-    bond_amount: Coin,
-    total_delegation: Coin,
-}
+export type MixNodeBond = {
+  owner: string;
+  mix_node: MixNode;
+  layer: Layer;
+  bond_amount: Coin;
+  total_delegation: Coin;
+};

 export type MixNode = {
-    host: string,
-    mix_port: number,
-    verloc_port: number,
-    http_api_port: number,
-    sphinx_key: string, // TODO: camelCase this later once everything else works
-    identity_key: string,
-    version: string,
-}
+  host: string;
+  mix_port: number;
+  verloc_port: number;
+  http_api_port: number;
+  sphinx_key: string;
+  identity_key: string;
+  version: string;
+};

 export type GatewayBond = {
-    owner: string
-    gateway: Gateway,
+  owner: string;
+  gateway: Gateway;

-    bond_amount: Coin,
-    total_delegation: Coin,
-}
+  bond_amount: Coin;
+  total_delegation: Coin;
+};

 export type Gateway = {
-    host: string,
-    mix_port: number,
-    clients_port: number,
-    location: string,
-    sphinx_key: string,
-    identity_key: string,
-    version: string
-}
+  host: string;
+  mix_port: number;
+  clients_port: number;
+  location: string;
+  sphinx_key: string;
+  identity_key: string;
+  version: string;
+};

 export type SendRequest = {
-    senderAddress: string,
-    recipientAddress: string,
-    transferAmount: readonly Coin[]
-}
+  senderAddress: string;
+  recipientAddress: string;
+  transferAmount: readonly Coin[];
+};
@@ -1,14 +1,18 @@
 // eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/explicit-module-boundary-types
-import { Coin } from "@cosmjs/stargate";
-import { EncodeObject } from "@cosmjs/proto-signing";
+import { Coin } from '@cosmjs/stargate';
+import { EncodeObject } from '@cosmjs/proto-signing';

-export function makeBankMsgSend(senderAddress: string, recipientAddress: string, transferAmount: readonly Coin[]): EncodeObject {
-    return {
-        typeUrl: "/cosmos.bank.v1beta1.MsgSend",
-        value: {
-            fromAddress: senderAddress,
-            toAddress: recipientAddress,
-            amount: transferAmount,
-        },
-    };
-}
+export function makeBankMsgSend(
+  senderAddress: string,
+  recipientAddress: string,
+  transferAmount: readonly Coin[],
+): EncodeObject {
+  return {
+    typeUrl: '/cosmos.bank.v1beta1.MsgSend',
+    value: {
+      fromAddress: senderAddress,
+      toAddress: recipientAddress,
+      amount: transferAmount,
+    },
+  };
+}
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import axios from 'axios';
+import { GatewayBond, MixNodeBond } from './types';
+
+export const VALIDATOR_API_VERSION = '/v1';
+export const VALIDATOR_API_GATEWAYS_PATH = `${VALIDATOR_API_VERSION}/gateways`;
+export const VALIDATOR_API_MIXNODES_PATH = `${VALIDATOR_API_VERSION}/mixnodes`;
+export const VALIDATOR_API_ACTIVE_MIXNODES_PATH = `${VALIDATOR_API_VERSION}/mixnodes/active`;
+export const VALIDATOR_API_REWARDED_MIXNODES_PATH = `${VALIDATOR_API_VERSION}/mixnodes/rewarded`;
+
+export interface IValidatorApiQuery {
+  getCachedMixnodes(): Promise<MixNodeBond[]>;
+
+  getCachedGateways(): Promise<GatewayBond[]>;
+
+  getActiveMixnodes(): Promise<MixNodeBond[]>;
+
+  getRewardedMixnodes(): Promise<MixNodeBond[]>;
+}
+
+export default class ValidatorApiQuerier implements IValidatorApiQuery {
+  validatorApiUrl: string;
+
+  constructor(validatorApiUrl: string) {
+    this.validatorApiUrl = validatorApiUrl;
+  }
+
+  async getCachedMixnodes(): Promise<MixNodeBond[]> {
+    const url = new URL(this.validatorApiUrl);
+    url.pathname += VALIDATOR_API_MIXNODES_PATH;
+
+    const response = await axios.get(url.toString());
+    if (response.status === 200) {
+      return response.data;
+    }
+    throw new Error('None of the provided validator APIs seem to be alive');
+  }
+
+  async getCachedGateways(): Promise<GatewayBond[]> {
+    const url = new URL(this.validatorApiUrl);
+    url.pathname += VALIDATOR_API_GATEWAYS_PATH;
+
+    const response = await axios.get(url.toString());
+    if (response.status === 200) {
+      return response.data;
+    }
+    throw new Error('None of the provided validator APIs seem to be alive');
+  }
+
+  async getActiveMixnodes(): Promise<MixNodeBond[]> {
+    const url = new URL(this.validatorApiUrl);
+    url.pathname += VALIDATOR_API_ACTIVE_MIXNODES_PATH;
+
+    const response = await axios.get(url.toString());
+    if (response.status === 200) {
+      return response.data;
+    }
+    throw new Error('None of the provided validator APIs seem to be alive');
+  }
+
+  async getRewardedMixnodes(): Promise<MixNodeBond[]> {
+    const url = new URL(this.validatorApiUrl);
+    url.pathname += VALIDATOR_API_REWARDED_MIXNODES_PATH;
+
+    const response = await axios.get(url.toString());
+    if (response.status === 200) {
+      return response.data;
+    }
+    throw new Error('None of the provided validator APIs seem to be alive');
+  }
+}
@@ -1,100 +0,0 @@
-import { assert } from "chai";
-import INetClient from "../../src/net-client";
-import { Fixtures } from "../fixtures"
-import { Mock, Times } from "moq.ts";
-import GatewaysCache from "../../src/caches/gateways";
-
-describe("Caching gateways: when the validator returns", () => {
-    context("an empty list", () => {
-        it("Should return an empty list", async () => {
-            const perPage = 100;
-            const contractAddress = "mockContractAddress";
-            const emptyPromise = Promise.resolve(Fixtures.GatewaysResp.empty());
-            const mockClient = new Mock<INetClient>().setup(netClient => netClient.getGateways(contractAddress, perPage, undefined)).returns(emptyPromise);
-            const cache = new GatewaysCache(mockClient.object(), perPage);
-
-            await cache.refreshGateways(contractAddress);
-
-            mockClient.verify(netClient => netClient.getGateways(contractAddress, perPage, undefined), Times.Exactly(1));
-            assert.deepEqual([], cache.gateways);
-        });
-    })
-
-    context("a list of gatways that fits in a page", () => {
-        it("Should return that one page list", async () => {
-            const perPage = 2;
-            const contractAddress = "mockContractAddress";
-            const onePagePromise = Promise.resolve(Fixtures.GatewaysResp.onePage());
-            const mockClient = new Mock<INetClient>().setup(netClient => netClient.getGateways(contractAddress, perPage, undefined)).returns(onePagePromise);
-            const cache = new GatewaysCache(mockClient.object(), perPage);
-
-            await cache.refreshGateways(contractAddress);
-
-            mockClient.verify(netClient => netClient.getGateways(contractAddress, perPage, undefined), Times.Exactly(1));
-            assert.deepEqual(Fixtures.Gateways.list2(), cache.gateways);
-        })
-    })
-
-    context("a list of gateways that is longer than one page", () => {
-        it("Should return the full list assembled from all pages", async () => {
-            const perPage = 2; // we get back 2 per page
-            const contractAddress = "mockContractAddress";
-            const fullPageResult = Fixtures.GatewaysResp.page1of2();
-            const halfPageResult = Fixtures.GatewaysResp.halfPage2of2();
-            const mockClient = new Mock<INetClient>()
-            mockClient.setup(instance => instance.getGateways(contractAddress, perPage, undefined)).returns(Promise.resolve(fullPageResult));
-            mockClient.setup(instance => instance.getGateways(contractAddress, perPage, fullPageResult.start_next_after)).returns(Promise.resolve(halfPageResult));
-            const cache = new GatewaysCache(mockClient.object(), perPage);
-
-            await cache.refreshGateways(contractAddress); // should make multiple paginated requests because there are two pages in the response fixture
-            mockClient.verify(instance => instance.getGateways(contractAddress, perPage, undefined), Times.Exactly(1));
-            mockClient.verify(instance => instance.getGateways(contractAddress, perPage, fullPageResult.start_next_after), Times.Exactly(1));
-
-            assert.deepEqual(Fixtures.Gateways.list3(), cache.gateways); // there are a total of 3 nodes in the validator lists, we get them all back
-        })
-    })
-
-    context("a list of gateways that is two filled pages", () => {
-        it("Should return the full list assembled from all pages", async () => {
-            const perPage = 2; // we get back 2 per page
-            const contractAddress = "mockContractAddress";
-            const fullPageResult1 = Fixtures.GatewaysResp.page1of2();
-            const fullPageResult2 = Fixtures.GatewaysResp.fullPage2of2();
-            const mockClient = new Mock<INetClient>()
-            mockClient.setup(netClient => netClient.getGateways(contractAddress, perPage, undefined)).returns(Promise.resolve(fullPageResult1));
-            mockClient.setup(netClient => netClient.getGateways(contractAddress, perPage, fullPageResult1.start_next_after)).returns(Promise.resolve(fullPageResult2));
-
-            const cache = new GatewaysCache(mockClient.object(), perPage);
-
-            await cache.refreshGateways(contractAddress); // should make multiple paginated requests because there are two pages in the response fixture
-            mockClient.verify(netClient => netClient.getGateways(contractAddress, perPage, undefined), Times.Exactly(1));
-            mockClient.verify(netClient => netClient.getGateways(contractAddress, perPage, fullPageResult1.start_next_after), Times.Exactly(1));
-
-            assert.deepEqual(Fixtures.Gateways.list4(), cache.gateways); // there are a total of 3 nodes in the validator lists, we get them all back
-        })
-    })
-
-    context("refreshing the cache twice", () => {
-        it("returns one full list assembled from all pages", async () => {
-            const perPage = 2; // we get back 2 per page
-            const contractAddress = "mockContractAddress";
-            const fullPageResult1 = Fixtures.GatewaysResp.page1of2();
-            const fullPageResult2 = Fixtures.GatewaysResp.fullPage2of2();
-            const mockClient = new Mock<INetClient>()
-            mockClient.setup(netClient => netClient.getGateways(contractAddress, perPage, undefined)).returns(Promise.resolve(fullPageResult1));
-            mockClient.setup(netClient => netClient.getGateways(contractAddress, perPage, fullPageResult1.start_next_after)).returns(Promise.resolve(fullPageResult2));
-
-            const cache = new GatewaysCache(mockClient.object(), perPage);
-
-            await cache.refreshGateways(contractAddress); // should make multiple paginated requests because there are two pages in the response fixture
-            mockClient.verify(netClient => netClient.getGateways(contractAddress, perPage, undefined), Times.Exactly(1));
-            mockClient.verify(netClient => netClient.getGateways(contractAddress, perPage, fullPageResult1.start_next_after), Times.Exactly(1));
-
-            await cache.refreshGateways(contractAddress);
-            mockClient.verify(netClient => netClient.getGateways(contractAddress, perPage, undefined), Times.Exactly(2));
-            mockClient.verify(netClient => netClient.getGateways(contractAddress, perPage, fullPageResult1.start_next_after), Times.Exactly(2));
-
-            assert.deepEqual(Fixtures.Gateways.list4(), cache.gateways); // there are a total of 3 nodes in the validator lists, we get them all back
-        })
-    })
-});
@@ -1,96 +0,0 @@
-import { assert } from "chai";
-import INetClient from "../../src/net-client";
-import { Fixtures } from "../fixtures"
-import { Mock, Times } from "moq.ts";
-import { MixnodesCache } from "../../src/caches/mixnodes"
-
-describe("Caching mixnodes: when the validator returns", () => {
-    context("an empty list", () => {
-        it("Should return an empty list", async () => {
-            const perPage = 100;
-            const contractAddress = "mockContractAddress";
-            const emptyPromise = Promise.resolve(Fixtures.MixNodesResp.empty());
-            const mockClient = new Mock<INetClient>().setup(netClient => netClient.getMixNodes(contractAddress, perPage, undefined)).returns(emptyPromise);
-            const cache = new MixnodesCache(mockClient.object(), perPage);
-
-            await cache.refreshMixNodes(contractAddress);
-
-            mockClient.verify(netClient => netClient.getMixNodes(contractAddress, perPage, undefined), Times.Exactly(1));
-            assert.deepEqual([], cache.mixNodes);
-        });
-    })
-    context("a list of nodes that fits in a page", () => {
-        it("Should return that one page list", async () => {
-            const perPage = 2;
-            const contractAddress = "mockContractAddress";
-            const onePagePromise = Promise.resolve(Fixtures.MixNodesResp.onePage());
-            const mockClient = new Mock<INetClient>().setup(netClient => netClient.getMixNodes(contractAddress, perPage, undefined)).returns(onePagePromise);
-            const cache = new MixnodesCache(mockClient.object(), perPage);
-
-            await cache.refreshMixNodes(contractAddress);
-
-            mockClient.verify(netClient => netClient.getMixNodes(contractAddress, perPage, undefined), Times.Exactly(1));
-            assert.deepEqual(Fixtures.MixNodes.list2(), cache.mixNodes);
-        })
-    })
-
-    context("a list of nodes that is longer than one page", () => {
-        it("Should return the full list assembled from all pages", async () => {
-            const perPage = 2; // we get back 2 per page
-            const contractAddress = "mockContractAddress";
-            const fullPageResult = Fixtures.MixNodesResp.page1of2();
-            const halfPageResult = Fixtures.MixNodesResp.halfPage2of2();
-            const mockClient = new Mock<INetClient>()
-            mockClient.setup(instance => instance.getMixNodes(contractAddress, perPage, undefined)).returns(Promise.resolve(fullPageResult));
-            mockClient.setup(instance => instance.getMixNodes(contractAddress, perPage, fullPageResult.start_next_after)).returns(Promise.resolve(halfPageResult));
-            const cache = new MixnodesCache(mockClient.object(), perPage);
-
-            await cache.refreshMixNodes(contractAddress); // should make multiple paginated requests because there are two pages in the response fixture
-            mockClient.verify(instance => instance.getMixNodes(contractAddress, perPage, undefined), Times.Exactly(1));
-            mockClient.verify(instance => instance.getMixNodes(contractAddress, perPage, fullPageResult.start_next_after), Times.Exactly(1));
-
-            assert.deepEqual(Fixtures.MixNodes.list3(), cache.mixNodes); // there are a total of 3 nodes in the validator lists, we get them all back
-        })
-    })
-
-    context("a list of nodes that is two filled pages", () => {
-        it("Should return the full list assembled from all pages", async () => {
-            const perPage = 2; // we get back 2 per page
-            const contractAddress = "mockContractAddress";
-            const fullPageResult1 = Fixtures.MixNodesResp.page1of2();
-            const fullPageResult2 = Fixtures.MixNodesResp.fullPage2of2();
-            const mockClient = new Mock<INetClient>()
-            mockClient.setup(netClient => netClient.getMixNodes(contractAddress, perPage, undefined)).returns(Promise.resolve(fullPageResult1));
-            mockClient.setup(netClient => netClient.getMixNodes(contractAddress, perPage, fullPageResult1.start_next_after)).returns(Promise.resolve(fullPageResult2));
-
-            const cache = new MixnodesCache(mockClient.object(), perPage);
-
-            await cache.refreshMixNodes(contractAddress); // should make multiple paginated requests because there are two pages in the response fixture
-            mockClient.verify(netClient => netClient.getMixNodes(contractAddress, perPage, undefined), Times.Exactly(1));
-            mockClient.verify(netClient => netClient.getMixNodes(contractAddress, perPage, fullPageResult1.start_next_after), Times.Exactly(1));
-
-            assert.deepEqual(Fixtures.MixNodes.list4(), cache.mixNodes); // there are a total of 3 nodes in the validator lists, we get them all back
-        })
-    })
-
-    context("refreshing the cache twice", () => {
-        it("returns one full list assembled from all pages", async () => {
-            const perPage = 2; // we get back 2 per page
-            const contractAddress = "mockContractAddress";
-            const fullPageResult1 = Fixtures.MixNodesResp.page1of2();
-            const fullPageResult2 = Fixtures.MixNodesResp.fullPage2of2();
-            const mockClient = new Mock<INetClient>()
-            mockClient.setup(netClient => netClient.getMixNodes(contractAddress, perPage, undefined)).returns(Promise.resolve(fullPageResult1));
-            mockClient.setup(netClient => netClient.getMixNodes(contractAddress, perPage, fullPageResult1.start_next_after)).returns(Promise.resolve(fullPageResult2));
-
-            const cache = new MixnodesCache(mockClient.object(), perPage);
-
-            await cache.refreshMixNodes(contractAddress); // should make multiple paginated requests because there are two pages in the response fixture
-            await cache.refreshMixNodes(contractAddress);
-            // mockClient.verify(netClient => netClient.getMixNodes(contractAddress, perPage, undefined), Times.Exactly(1));
-            // mockClient.verify(netClient => netClient.getMixNodes(contractAddress, perPage, fullPageResult1.start_next_after), Times.Exactly(1));
-
-            assert.deepEqual(Fixtures.MixNodes.list4(), cache.mixNodes); // there are a total of 3 nodes in the validator lists, we get them all back
-        })
-    })
-});
@@ -1,156 +0,0 @@
-import { coins } from "@cosmjs/launchpad";
-import {PagedGatewayResponse, PagedMixnodeResponse} from "../src/net-client";
-import {GatewayBond, MixNodeBond} from "../src/types"
-
-export namespace Fixtures {
-    export class MixNodes {
-        static single(): MixNodeBond {
-            return {
-                amount: coins(666, "unym"),
-                owner: "bob",
-                mix_node: {
-                    host: "1.1.1.1",
-                    layer: 1,
-                    location: "London, UK",
-                    sphinx_key: "foo",
-                    version: "0.10.0",
-                }
-            };
-        }
-
-        static list1(): MixNodeBond[] {
-            return [MixNodes.single()]
-        }
-
-        static list2(): MixNodeBond[] {
-            return [MixNodes.single(), MixNodes.single()]
-        }
-
-        static list3(): MixNodeBond[] {
-            return [MixNodes.single(), MixNodes.single(), MixNodes.single()]
-        }
-
-        static list4(): MixNodeBond[] {
-            return [MixNodes.single(), MixNodes.single(), MixNodes.single(), MixNodes.single()]
-        }
-    }
-
-    export class MixNodesResp {
-        static empty(): PagedResponse {
-            return {
-                nodes: [],
-                per_page: 2,
-                start_next_after: null,
-            }
-        }
-
-        static onePage(): PagedResponse {
-            return {
-                nodes: MixNodes.list2(),
-                per_page: 2,
-                start_next_after: null
-            }
-        }
-
-        static page1of2(): PagedResponse {
-            return {
-                nodes: MixNodes.list2(),
-                per_page: 2,
-                start_next_after: "2"
-            }
-        }
-
-        static halfPage2of2(): PagedResponse {
-            return {
-                nodes: MixNodes.list1(),
-                per_page: 2,
-                start_next_after: null
-
-            }
-        }
-
-        static fullPage2of2(): PagedResponse {
-            return {
-                nodes: MixNodes.list2(),
-                per_page: 2,
-                start_next_after: null,
-            }
-        }
-    }
-
-    export class Gateways {
-        static single(): GatewayBond {
-            return {
-                amount: coins(666, "unym"),
-                owner: "bob",
-                gateway: {
-                    mix_host: "1.1.1.1:1234",
-                    clients_host: "ws://1.1.1.1:1235",
-                    location: "London, UK",
-                    identity_key: "bar",
-                    sphinx_key: "foo",
-                    version: "0.10.0",
-                }
-            };
-        }
-
-        static list1(): GatewayBond[] {
-            return [Gateways.single()]
-        }
-
-        static list2(): GatewayBond[] {
-            return [Gateways.single(), Gateways.single()]
-        }
-
-        static list3(): GatewayBond[] {
-            return [Gateways.single(), Gateways.single(), Gateways.single()]
-        }
-
-        static list4(): GatewayBond[] {
-            return [Gateways.single(), Gateways.single(), Gateways.single(), Gateways.single()]
-        }
-    }
-
-    export class GatewaysResp {
-        static empty(): PagedGatewayResponse {
-            return {
-                nodes: [],
-                per_page: 2,
-                start_next_after: "",
-            }
-        }
-
-        static onePage(): PagedGatewayResponse {
-            return {
-                nodes: Gateways.list2(),
-                per_page: 2,
-                start_next_after: "",
-            }
-        }
-
-        static page1of2(): PagedGatewayResponse {
-            return {
-                nodes: Gateways.list2(),
-                per_page: 2,
-                start_next_after: "2"
-            }
-        }
-
-        static halfPage2of2(): PagedGatewayResponse {
-            return {
-                nodes: Gateways.list1(),
-                per_page: 2,
-                start_next_after: "",
-
-            }
-        }
-
-        static fullPage2of2(): PagedGatewayResponse {
-            return {
-                nodes: Gateways.list2(),
-                per_page: 2,
-                start_next_after: "",
-            }
-        }
-    }
-}
@@ -0,0 +1,92 @@
+import validatorClient from "../../src/index";
+import { config } from '../test-utils/config';
+
+let client: validatorClient;
+let mnemonic: string;
+
+beforeEach(async () => {
+    mnemonic = validatorClient.randomMnemonic();
+    client = await validatorClient.connect(
+        mnemonic,
+        config.NYMD_URL as string,
+        config.VALIDATOR_API as string,
+        config.CURRENCY_PREFIX as string,
+        config.MIXNET_CONTRACT as string,
+        config.VESTING_CONTRACT as string
+    );
+});
+
+//todos
+//we want to mock the majority of these tests
+//and keep a few integration tests in place
+
+describe("connect to the nym validator client and perform integration tests against the current testnet", () => {
+    test("get cached mixnodes", async () => {
+        try {
+            const response = await client.getCachedMixnodes();
+            //expect all mixnodes to have their owner address
+            response.forEach(mixnodeDetails => {
+                expect(mixnodeDetails.owner).toHaveLength(43)
+            });
+        }
+        catch (e) {
+            console.log(e);
+        }
+    });
+
+    test("get balance of address and denom of the network", async () => {
+        try {
+            //provide a users address and get their balance
+            //we expect their balance to be zero, as it's a new account
+            const address = await validatorClient.mnemonicToAddress(mnemonic, config.CURRENCY_PREFIX as string);
+            const response = await client.getBalance(address);
+            expect(response.amount).toStrictEqual("0");
+            expect(response.denom).toBe("unymt");
+        }
+        catch (e) {
+            console.log(e);
+        }
+    });
+
+    test("get minimium pledge amount for a mixnode", async () => {
+        try {
+            const response = await client.minimumMixnodePledge();
+            expect(response.amount).toBe("100000000");
+            expect(response.denom).toBe(config.CURRENCY_PREFIX as string);
+        }
+        catch (e) {
+            console.log(e);
+        }
+    });
+
+    test("get minimium gateway pledge amount", async () => {
+        try {
+            const response = await client.minimumGatewayPledge();
+            expect(response.amount).toBe("100000000");
+            expect(response.denom).toBe(config.CURRENCY_PREFIX as string);
+        }
+        catch (e) {
+            console.log(e);
+        }
+    });
+
+    test("get current mixnet contract address", () => {
+        try {
+            const response = client.mixnetContract;
+            expect(response).toStrictEqual(config.MIXNET_CONTRACT as string)
+        }
+        catch (e) {
+            console.log(e);
+        }
+    });
+
+    test("get current vesting contract address", () => {
+        try {
+            const response = client.vestingContract;
+            expect(response).toStrictEqual(config.VESTING_CONTRACT as string)
+        }
+        catch (e) {
+            console.log(e);
+        }
+    });
+});
@@ -0,0 +1,66 @@
+import SigningClient from '../../src/signing-client';
+import validator from "../../src/index";
+import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate';
+import { DirectSecp256k1HdWallet } from '@cosmjs/proto-signing';
+import { config } from '../test-utils/config';
+
+let cosmWasmClient: CosmWasmClient;
+let signingClient: SigningClient;
+let mnemonic: string;
+
+beforeEach(async () => {
+    cosmWasmClient = await SigningClient.connect(config.NYMD_URL as string);
+    
+    mnemonic = validator.randomMnemonic();
+    const wallet = await DirectSecp256k1HdWallet.fromMnemonic(mnemonic)
+    signingClient = await SigningClient.connectWithNymSigner(
+        wallet,
+        config.NYMD_URL as string,
+        config.VALIDATOR_API as string,
+        config.CURRENCY_PREFIX as string);
+});
+
+describe("alternate between the signing clients of nym and perform basic requests", () => {
+    test("retrieve balance using the cosmwasm client", async () => {
+        try {
+            const randomAddress = await validator.mnemonicToAddress(mnemonic, config.CURRENCY_PREFIX as string);
+            const balance  = await cosmWasmClient.getBalance(randomAddress, config.CURRENCY_PREFIX as string);
+            expect(balance.denom).toStrictEqual(config.CURRENCY_PREFIX as string);
+            expect(balance.amount).toStrictEqual("0");
+        }
+        catch (e) {
+            console.log(e);
+        }
+    });
+    test("get the chain id of the network", async () => {
+        try {
+            //pass these values in environment variables in the future
+            const chainId = await cosmWasmClient.getChainId();
+            expect(chainId).toStrictEqual(config.CHAIN_ID as string);
+        }
+        catch (e) {
+            console.log(e);
+        }
+    });
+    test("get height then search its block", async () => {
+        try {
+            const height = await cosmWasmClient.getHeight()
+            const block = await cosmWasmClient.getBlock(height);
+            expect(block.header.chainId).toStrictEqual(config.CHAIN_ID as string);
+            expect(block.header.height).toStrictEqual(height);
+        }
+        catch (e) {
+            console.log(e);
+        }
+    });
+    test("get current reward pool", async () => {
+        try {
+            //this is due to change due to when rewards get distributed
+            const rewards = await signingClient.getRewardPool(config.MIXNET_CONTRACT as string);
+            expect(rewards).toStrictEqual("250000000000000");
+        }
+        catch (e) {
+            console.log(e);
+        }
+    });
+});
@@ -0,0 +1,70 @@
+import ValidatorApiQuerier from '../../src/validator-api-querier';
+import { config } from '../test-utils/config';
+import { now, elapsed} from '../test-utils/utils';
+
+let client: ValidatorApiQuerier;
+
+beforeEach(() => {
+    client = new ValidatorApiQuerier(config.VALIDATOR_API as string);
+});
+
+//todos
+//we want to mock the majority of these tests
+//and keep a few integration tests in place
+
+describe("call out to the validator api and run queries", () => {
+    test.skip("build client and get all mixnodes", async () => {
+        try {
+            //this test was currently ran against a set of prefix data
+            //this will change
+            const ownerAddress = "nymt1ydqkmz0ddpvkd3l0vyf8k5xjrqtcnxxvhlpdsr";
+            let response = await client.getActiveMixnodes();
+            expect(response[0].owner).toStrictEqual(ownerAddress);
+        }
+        catch (e) {
+            console.log(e);
+        }
+    });
+
+    test("get rewarded mixnodes", async () => {
+        try {
+            // we assume that all mixnodes will have their owners address
+            // also active sets will determine rewarded mixnodes
+            let response = await client.getRewardedMixnodes();
+
+            response.forEach(rNode => {
+                expect(rNode.owner.length).toStrictEqual(43);
+            })
+        }
+        catch (e) {
+            console.log(e);
+        }
+    });
+
+    test("get cached gateways and it should be six", async () => {
+        try {
+            //current gateways running in sandbox-testnet 6
+            let response = await client.getCachedGateways();
+            expect(response.length).toStrictEqual(6);
+        }
+        catch (e) {
+            console.log(e);
+        }
+    });
+
+
+    test("get cached mixnodes", async () => {
+        try {
+            const start = now();
+            let response = await client.getCachedMixnodes();
+            response.forEach(mixnode => {
+                expect(mixnode.owner.length).toStrictEqual(43);
+            })
+            console.log(elapsed(start, true));
+        }
+        catch (e) {
+            console.log(e);
+        }
+    });
+});
+
@@ -0,0 +1,9 @@
+export const config = {
+    NYMD_URL: process.env.NYMD_URL,
+    VALIDATOR_API: process.env.VALIDATOR_API,
+    MIXNET_CONTRACT: process.env.MIXNET_CONTRACT,
+    VESTING_CONTRACT: process.env.MIXNET_CONTRACT,
+    USER_MNEMONIC: process.env.MNEMONIC,
+    CURRENCY_PREFIX: process.env.CURRENCY_PREFIX,
+    CHAIN_ID: process.env.CHAIN_ID
+}
@@ -0,0 +1,17 @@
+// timer actions
+// Store current time as `start`
+export const now = (eventName = null) => {
+    if (eventName) {
+        console.log(`Started ${eventName}..`);
+    }
+    return new Date().getTime();
+}
+
+//takes arg of start time 
+export const elapsed = (beginning: number, log = false) => {
+    const duration = new Date().getTime() - beginning;
+    if (log) {
+        console.log(`${duration / 1000}s`);
+    }
+    return duration;
+}
@@ -0,0 +1,10 @@
+const currency = require('../../src/currency');
+
+describe("provide unit tests around the the currency module", () => {
+    test.skip("convert to native balance", () => {
+        const decimal = "12.0346";
+        const value = currency.printableBalanceToNative(decimal);
+        expect(value).toStrictEqual("12034600");
+    });
+});
+
@@ -0,0 +1,27 @@
+const stargate = require("../../src/stargate-helper");
+import { config } from '../test-utils/config';
+
+describe("test the stargate functions within the client", () => {
+    test("test that the gas price is returned correctly", () => {
+        const nymCurrency = config.CURRENCY_PREFIX as string;
+        const getGasPrice = stargate.nymGasPrice(nymCurrency);
+        expect(getGasPrice.denom).toBe(`u${nymCurrency}`);
+    });
+
+    test("provide invalid type returns an error message", () => {
+        //pass invalid type
+        expect(() => {
+            const nymCurrency = 13;
+            stargate.nymGasPrice(nymCurrency);
+        }).toThrow("13 is not of type string");
+    });
+
+    //provide test for downloading wasm 
+    //mock this test  
+    // test.skip("providing nothing returns", async () => {
+    //     //pass invalid type
+    //     const downloadWasm = stargate.downloadWasm("http://localhost");
+    //     console.log(downloadWasm);
+    // })
+});
+
@@ -0,0 +1,19 @@
+import validator from "../../src/index";
+import { config } from '../test-utils/config';
+
+const NETWORK_DENOM = config.CURRENCY_PREFIX as string;
+
+describe("perform basic interactions with the validator", () => {
+    test("build client and get all mixnodes", async () => {
+        const mnemonic = validator.randomMnemonic();
+        const mnemonicCount = mnemonic.split(" ").length;
+        expect(mnemonicCount).toStrictEqual(24);
+    });
+
+    test("build client and get all mixnodes", async () => {
+        const buildMnemonic = validator.randomMnemonic();
+        const mnemonic = await validator.mnemonicToAddress(buildMnemonic, NETWORK_DENOM);
+        expect(mnemonic).toHaveLength(43);
+        expect(mnemonic).toContain(NETWORK_DENOM);
+    });
+});
@@ -5,7 +5,11 @@
        "esModuleInterop": true,
        "strict": true,
        "declaration": true,
-        "outDir": "./dist"
+        "outDir": "./dist",
+        "types": [
+            "jest",
+            "node",
+        ]
    },
    "typedocOptions": {
        "entryPoints": [
@@ -16,7 +20,11 @@
    "exclude": [
        "dist",
        "examples",
-        "tests",
        "node_modules"
+    ],
+    "include": [
+        "tests",
+        "./tests/*/*.tsx",
+        "./tests/*/*.ts" 
    ]
 }
@@ -1,7 +1,7 @@
 [package]
 name = "nym-client-wasm"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jedrzej Stuczynski <andrew@nymtech.net>"]
-version = "0.11.0"
+version = "0.12.0"
 edition = "2018"
 keywords = ["nym", "sphinx", "wasm", "webassembly", "privacy", "client"]
 license = "Apache-2.0"
@@ -27,6 +27,7 @@ const DEFAULT_GATEWAY_RESPONSE_TIMEOUT: Duration = Duration::from_millis(1_500);
 #[wasm_bindgen]
 pub struct NymClient {
    validator_server: Url,
+    testnet_mode: bool,

    // TODO: technically this doesn't need to be an Arc since wasm is run on a single thread
    // however, once we eventually combine this code with the native-client's, it will make things
@@ -72,6 +73,7 @@ impl NymClient {

            on_message: None,
            on_gateway_connect: None,
+            testnet_mode: false,
        }
    }

@@ -84,6 +86,11 @@ impl NymClient {
        self.on_gateway_connect = Some(on_connect)
    }

+    pub fn set_testnet_mode(&mut self, testnet_mode: bool) {
+        console_log!("Setting testnet mode to {}", testnet_mode);
+        self.testnet_mode = testnet_mode;
+    }
+
    fn self_recipient(&self) -> Recipient {
        Recipient::new(
            *self.identity.public_key(),
@@ -101,6 +108,8 @@ impl NymClient {

    // Right now it's impossible to have async exported functions to take `&self` rather than self
    pub async fn initial_setup(self) -> Self {
+        let testnet_mode = self.testnet_mode;
+
        #[cfg(feature = "coconut")]
        let bandwidth_controller = Some(BandwidthController::new(
            vec![self.validator_server.clone()],
@@ -126,6 +135,10 @@ impl NymClient {
            bandwidth_controller,
        );

+        if testnet_mode {
+            gateway_client.set_testnet_mode(true)
+        }
+
        gateway_client
            .authenticate_and_start()
            .await
@@ -1,5 +1,5 @@
 [package]
-name = "erc20-bridge-contract"
+name = "bandwidth-claim-contract"
 version = "0.1.0"
 edition = "2018"

@@ -40,6 +40,7 @@ const DEFAULT_RECONNECTION_BACKOFF: Duration = Duration::from_secs(5);

 pub struct GatewayClient {
    authenticated: bool,
+    testnet_mode: bool,
    bandwidth_remaining: i64,
    gateway_address: String,
    gateway_identity: identity::PublicKey,
@@ -75,6 +76,7 @@ impl GatewayClient {
    ) -> Self {
        GatewayClient {
            authenticated: false,
+            testnet_mode: false,
            bandwidth_remaining: 0,
            gateway_address,
            gateway_identity,
@@ -90,6 +92,10 @@ impl GatewayClient {
        }
    }

+    pub fn set_testnet_mode(&mut self, testnet_mode: bool) {
+        self.testnet_mode = testnet_mode
+    }
+
    // TODO: later convert into proper builder methods
    pub fn with_reconnection_on_failure(&mut self, should_reconnect_on_failure: bool) {
        self.should_reconnect_on_failure = should_reconnect_on_failure
@@ -119,6 +125,7 @@ impl GatewayClient {

        GatewayClient {
            authenticated: false,
+            testnet_mode: false,
            bandwidth_remaining: 0,
            gateway_address,
            gateway_identity,
@@ -513,6 +520,17 @@ impl GatewayClient {
        Ok(())
    }

+    async fn try_claim_testnet_bandwidth(&mut self) -> Result<(), GatewayClientError> {
+        let msg = ClientControlRequest::ClaimFreeTestnetBandwidth.into();
+        self.bandwidth_remaining = match self.send_websocket_message(msg).await? {
+            ServerResponse::Bandwidth { available_total } => Ok(available_total),
+            ServerResponse::Error { message } => Err(GatewayClientError::GatewayError(message)),
+            _ => Err(GatewayClientError::UnexpectedResponse),
+        }?;
+
+        Ok(())
+    }
+
    pub async fn claim_bandwidth(&mut self) -> Result<(), GatewayClientError> {
        if !self.authenticated {
            return Err(GatewayClientError::NotAuthenticated);
@@ -525,6 +543,10 @@ impl GatewayClient {
        }

        warn!("Not enough bandwidth. Trying to get more bandwidth, this might take a while");
+        if self.testnet_mode {
+            info!("The client is running in testnet mode - attempting to claim bandwidth without a credential");
+            return self.try_claim_testnet_bandwidth().await;
+        }

        #[cfg(feature = "coconut")]
        let credential = self
@@ -33,7 +33,7 @@ prost = { version = "0.9", default-features = false, optional = true }
 flate2 = { version = "1.0.20", optional = true }
 sha2 = { version = "0.9.5", optional = true }
 itertools = { version = "0.10", optional = true }
-cosmwasm-std = { version = "1.0.0-beta2", optional = true }
+cosmwasm-std = { version = "1.0.0-beta3", optional = true }
 ts-rs = {version = "5.1", optional = true}

 [features]
@@ -234,11 +234,25 @@ impl<C> NymdClient<C> {
            .map(|block| block.block_id.hash)
    }

-    pub async fn get_balance(&self, address: &AccountId) -> Result<Option<CosmosCoin>, NymdError>
+    pub async fn get_balance(
+        &self,
+        address: &AccountId,
+        denom: Denom,
+    ) -> Result<Option<CosmosCoin>, NymdError>
    where
        C: CosmWasmClient + Sync,
    {
-        self.client.get_balance(address, self.denom()?).await
+        self.client.get_balance(address, denom).await
+    }
+
+    pub async fn get_mixnet_balance(
+        &self,
+        address: &AccountId,
+    ) -> Result<Option<CosmosCoin>, NymdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        self.get_balance(address, self.denom()?).await
    }

    pub async fn get_contract_settings(&self) -> Result<ContractStateParams, NymdError>
@@ -64,7 +64,8 @@ pub trait VestingSigningClient {

    async fn create_periodic_vesting_account(
        &self,
-        address: &str,
+        owner_address: &str,
+        staking_address: Option<String>,
        start_time: Option<u64>,
        amount: Coin,
    ) -> Result<ExecuteResult, NymdError>;
@@ -271,13 +272,15 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
    }
    async fn create_periodic_vesting_account(
        &self,
-        address: &str,
+        owner_address: &str,
+        staking_address: Option<String>,
        start_time: Option<u64>,
        amount: Coin,
    ) -> Result<ExecuteResult, NymdError> {
        let fee = self.operation_fee(Operation::CreatePeriodicVestingAccount);
        let req = VestingExecuteMsg::CreateAccount {
-            address: address.to_string(),
+            owner_address: owner_address.to_string(),
+            staking_address,
            start_time,
        };
        self.client
@@ -202,14 +202,28 @@ impl DirectSecp256k1HdWalletBuilder {
 #[cfg(test)]
 mod tests {
    use super::*;
+    use network_defaults::BECH32_PREFIX;

    #[test]
    fn generating_account_addresses() {
+        let (addr1, addr2, addr3) = match BECH32_PREFIX {
+            "punk" => (
+                "punk1jw6mp7d5xqc7w6xm79lha27glmd0vdt32a3fj2",
+                "punk1h5hgn94nsq4kh99rjj794hr5h5q6yfm22mcqqn",
+                "punk17n9flp6jflljg6fp05dsy07wcprf2uuujse962",
+            ),
+            "nymt" => (
+                "nymt1jw6mp7d5xqc7w6xm79lha27glmd0vdt339me94",
+                "nymt1h5hgn94nsq4kh99rjj794hr5h5q6yfm23rjshv",
+                "nymt17n9flp6jflljg6fp05dsy07wcprf2uuufgn4d4",
+            ),
+            _ => panic!("Test needs to be updated with new bech32 prefix"),
+        };
        // test vectors produced from our js wallet
        let mnemonic_address = vec![
-            ("crush minute paddle tobacco message debate cabin peace bar jacket execute twenty winner view sure mask popular couch penalty fragile demise fresh pizza stove", "punk1jw6mp7d5xqc7w6xm79lha27glmd0vdt32a3fj2"),
-            ("acquire rebel spot skin gun such erupt pull swear must define ill chief turtle today flower chunk truth battle claw rigid detail gym feel", "punk1h5hgn94nsq4kh99rjj794hr5h5q6yfm22mcqqn"),
-            ("step income throw wheat mobile ship wave drink pool sudden upset jaguar bar globe rifle spice frost bless glimpse size regular carry aspect ball", "punk17n9flp6jflljg6fp05dsy07wcprf2uuujse962")
+            ("crush minute paddle tobacco message debate cabin peace bar jacket execute twenty winner view sure mask popular couch penalty fragile demise fresh pizza stove", addr1),
+            ("acquire rebel spot skin gun such erupt pull swear must define ill chief turtle today flower chunk truth battle claw rigid detail gym feel", addr2),
+            ("step income throw wheat mobile ship wave drink pool sudden upset jaguar bar globe rifle spice frost bless glimpse size regular carry aspect ball", addr3)
        ];

        for (mnemonic, address) in mnemonic_address.into_iter() {
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
@@ -19,7 +19,9 @@ x25519-dalek = "1.1"
 ed25519-dalek = "1.0"
 log = "0.4"
 rand = { version = "0.7.3", features = ["wasm-bindgen"] }
+subtle-encoding = { version = "0.5", features =  ["bech32-preview"]}

 # internal
 nymsphinx-types = { path = "../nymsphinx/types" }
 pemstore = { path = "../../common/pemstore" }
+config = { path="../../common/config" }
@@ -189,6 +189,13 @@ impl PrivateKey {
        let sig = expanded_secret_key.sign(message, &public_key.0);
        Signature(sig)
    }
+
+    /// Signs text with the provided Ed25519 private key, returning a base58 signature
+    pub fn sign_text(&self, text: &str) -> String {
+        let signature_bytes = self.sign(text.as_ref()).to_bytes();
+        let signature = bs58::encode(signature_bytes).into_string();
+        signature
+    }
 }

 impl PemStorableKey for PrivateKey {
@@ -0,0 +1,87 @@
+use config::defaults;
+use subtle_encoding::bech32;
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum Bech32Error {
+    DecodeFailed(String),
+    WrongPrefix(String),
+}
+
+/// Try to decode the address (to make sure it's a valid bech32 encoding)
+pub fn try_bech32_decode(address: &str) -> Result<String, Bech32Error> {
+    match bech32::decode(address) {
+        Err(e) => Err(Bech32Error::DecodeFailed(e.to_string())),
+        Ok((prefix, _)) => Ok(prefix),
+    }
+}
+
+pub fn validate_bech32_prefix(address: &str) -> Result<(), Bech32Error> {
+    let prefix = try_bech32_decode(address)?;
+
+    if prefix == defaults::BECH32_PREFIX {
+        Ok(())
+    } else {
+        Err(Bech32Error::WrongPrefix(format!(
+            "your bech32 address prefix should be {}, not {}",
+            defaults::BECH32_PREFIX,
+            prefix
+        )))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    mod decoding_bech32_addresses {
+        use super::*;
+
+        #[test]
+        fn total_crap_fails() {
+            let res = try_bech32_decode("crap");
+            assert_eq!(
+                Err(Bech32Error::DecodeFailed("bad encoding".to_string())),
+                res
+            );
+        }
+
+        #[test]
+        fn bad_checksum_fails() {
+            let chopped_address = "punk1h3w4nj7kny5dfyjw2le4vm74z03v9vd4dstpu"; // this has the final "0" chopped off
+            let res = try_bech32_decode(chopped_address);
+            assert_eq!(
+                Err(Bech32Error::DecodeFailed("checksum mismatch".to_string())),
+                res
+            );
+        }
+
+        #[test]
+        fn good_address_returns_prefix() {
+            let prefix = try_bech32_decode("punk1h3w4nj7kny5dfyjw2le4vm74z03v9vd4dstpu0");
+            assert_eq!(Ok("punk".to_string()), prefix);
+        }
+    }
+
+    #[cfg(test)]
+    mod ensuring_correct_bech32_prefix {
+        use super::*;
+
+        #[test]
+        fn wrong_prefix_fails() {
+            assert_eq!(
+                Err(Bech32Error::WrongPrefix(
+                    "your bech32 address prefix should be nymt, not punk".to_string()
+                )),
+                validate_bech32_prefix("punk1h3w4nj7kny5dfyjw2le4vm74z03v9vd4dstpu0")
+            )
+        }
+
+        #[test]
+        fn correct_prefix_works() {
+            assert_eq!(
+                Ok(()),
+                validate_bech32_prefix("nymt1z9egw0knv47nmur0p8vk4rcx59h9gg4zuxrrr9")
+            )
+        }
+    }
+}
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 pub mod asymmetric;
+pub mod bech32_address_validation;
 pub mod crypto_hash;
 pub mod hkdf;
 pub mod hmac;
@@ -7,7 +7,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-cosmwasm-std = "1.0.0-beta2"
+cosmwasm-std = "1.0.0-beta3"

 serde = { version = "1.0", features = ["derive"] }
 serde_repr = "0.1"
@@ -0,0 +1,11 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+fn main() {
+    match option_env!("NETWORK") {
+        Some("milhon") => println!("cargo:rustc-cfg=network=\"milhon\"",),
+        None | Some("sandbox") => println!("cargo:rustc-cfg=network=\"sandbox\"",),
+        Some("qa") => println!("cargo:rustc-cfg=network=\"qa\""),
+        _ => panic!("No such network"),
+    }
+}
@@ -6,6 +6,15 @@ use time::OffsetDateTime;
 use url::Url;

 pub mod eth_contract;
+#[cfg(network = "milhon")]
+pub mod milhon;
+#[cfg(network = "sandbox")]
+pub mod sandbox;
+
+#[cfg(network = "milhon")]
+pub use milhon::*;
+#[cfg(network = "sandbox")]
+pub use sandbox::*;

 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct ValidatorDetails {
@@ -38,6 +47,7 @@ impl ValidatorDetails {
    }
 }

+#[cfg(network = "milhon")]
 pub fn default_validators() -> Vec<ValidatorDetails> {
    vec![
        ValidatorDetails::new(
@@ -48,6 +58,14 @@ pub fn default_validators() -> Vec<ValidatorDetails> {
    ]
 }

+#[cfg(network = "sandbox")]
+pub fn default_validators() -> Vec<ValidatorDetails> {
+    vec![ValidatorDetails::new(
+        "https://sandbox-validator.nymtech.net",
+        Some("https://sandbox-validator.nymtech.net/api"),
+    )]
+}
+
 pub fn default_nymd_endpoints() -> Vec<Url> {
    default_validators()
        .iter()
@@ -62,10 +80,7 @@ pub fn default_api_endpoints() -> Vec<Url> {
        .collect()
 }

-pub const DEFAULT_MIXNET_CONTRACT_ADDRESS: &str = "punk10pyejy66429refv3g35g2t7am0was7yalwrzen";
-pub const DEFAULT_VESTING_CONTRACT_ADDRESS: &str = "";
-pub const REWARDING_VALIDATOR_ADDRESS: &str = "punk1v9qauwdq5terag6uvfsdytcs2d0sdmfdy7hgk3";
-
+// Ethereum constants used for token bridge
 /// How much bandwidth (in bytes) one token can buy
 const BYTES_PER_TOKEN: u64 = 1024 * 1024 * 1024;
 /// How many ERC20 tokens should be burned to buy bandwidth
@@ -73,20 +88,10 @@ pub const TOKENS_TO_BURN: u64 = 10;
 /// Default bandwidth (in bytes) that we try to buy
 pub const BANDWIDTH_VALUE: u64 = TOKENS_TO_BURN * BYTES_PER_TOKEN;

-// Ethereum constants used for token bridge
-pub const ETH_CONTRACT_ADDRESS: [u8; 20] =
-    hex_literal::hex!("9fEE3e28c17dbB87310A51F13C4fbf4331A6f102");
 pub const ETH_MIN_BLOCK_DEPTH: usize = 7;
-pub const COSMOS_CONTRACT_ADDRESS: &str = "punk1jld76tqw4wnpfenmay2xkv86nr3j0w426eka82";
-// Name of the event triggered by the eth contract. If the event name is changed,
-// this would also need to be changed; It is currently tested against the json abi
-pub const ETH_EVENT_NAME: &str = "Burned";
-pub const ETH_BURN_FUNCTION_NAME: &str = "burnTokenForAccessCode";

 /// Defaults Cosmos Hub/ATOM path
 pub const COSMOS_DERIVATION_PATH: &str = "m/44'/118'/0'/0/0";
-pub const BECH32_PREFIX: &str = "punk";
-pub const DENOM: &str = "upunk";
 // as set by validators in their configs
 // (note that the 'amount' postfix is relevant here as the full gas price also includes denom)
 pub const GAS_PRICE_AMOUNT: f64 = 0.025;
@@ -0,0 +1,17 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+pub const BECH32_PREFIX: &str = "punk";
+pub const DENOM: &str = "upunk";
+
+pub const DEFAULT_MIXNET_CONTRACT_ADDRESS: &str = "punk10pyejy66429refv3g35g2t7am0was7yalwrzen";
+pub const DEFAULT_VESTING_CONTRACT_ADDRESS: &str = "";
+pub const BANDWIDTH_CLAIM_CONTRACT_ADDRESS: &str = "punk1jld76tqw4wnpfenmay2xkv86nr3j0w426eka82";
+pub const REWARDING_VALIDATOR_ADDRESS: &str = "punk1v9qauwdq5terag6uvfsdytcs2d0sdmfdy7hgk3";
+pub const ETH_CONTRACT_ADDRESS: [u8; 20] =
+    hex_literal::hex!("9fEE3e28c17dbB87310A51F13C4fbf4331A6f102");
+
+// Name of the event triggered by the eth contract. If the event name is changed,
+// this would also need to be changed; It is currently tested against the json abi
+pub const ETH_EVENT_NAME: &str = "Burned";
+pub const ETH_BURN_FUNCTION_NAME: &str = "burnTokenForAccessCode";
@@ -0,0 +1,17 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+pub const BECH32_PREFIX: &str = "nymt";
+pub const DENOM: &str = "unymt";
+
+pub const DEFAULT_MIXNET_CONTRACT_ADDRESS: &str = "nymt1ghd753shjuwexxywmgs4xz7x2q732vcnstz02j";
+pub const DEFAULT_VESTING_CONTRACT_ADDRESS: &str = "nymt1nc5tatafv6eyq7llkr2gv50ff9e22mnfp9pc5s";
+pub const BANDWIDTH_CLAIM_CONTRACT_ADDRESS: &str = "nymt17p9rzwnnfxcjp32un9ug7yhhzgtkhvl9f8xzkv";
+pub const REWARDING_VALIDATOR_ADDRESS: &str = "nymt17zujduc46wvkwvp6f062mm5xhr7jc3fewvqu9e";
+pub const ETH_CONTRACT_ADDRESS: [u8; 20] =
+    hex_literal::hex!("9fEE3e28c17dbB87310A51F13C4fbf4331A6f102");
+
+// Name of the event triggered by the eth contract. If the event name is changed,
+// this would also need to be changed; It is currently tested against the json abi
+pub const ETH_EVENT_NAME: &str = "Burned";
+pub const ETH_BURN_FUNCTION_NAME: &str = "burnTokenForAccessCode";
@@ -45,6 +45,27 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d6dff4a1892b54d70af377bf7a17064192e822865791d812957f21e3108c325"

+[[package]]
+name = "bandwidth-claim"
+version = "0.1.0"
+dependencies = [
+ "bandwidth-claim-contract",
+ "config",
+ "cosmwasm-std",
+ "cosmwasm-storage",
+ "schemars",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "bandwidth-claim-contract"
+version = "0.1.0"
+dependencies = [
+ "schemars",
+ "serde",
+]
+
 [[package]]
 name = "base64"
 version = "0.13.0"
@@ -215,24 +236,11 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"

-[[package]]
-name = "cosmos_contract"
-version = "0.1.0"
-dependencies = [
- "config",
- "cosmwasm-std",
- "cosmwasm-storage",
- "erc20-bridge-contract",
- "schemars",
- "serde",
- "thiserror",
-]
-
 [[package]]
 name = "cosmwasm-crypto"
-version = "1.0.0-beta2"
+version = "1.0.0-beta3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c16b255449b3f5cd7fa4b79acd5225b5185655261087a3d8aaac44f88a0e23e9"
+checksum = "a380b87642204557629c9b72988c47b55fbfe6d474960adba56b22331504956a"
 dependencies = [
 "digest 0.9.0",
 "ed25519-zebra",
@@ -243,18 +251,18 @@ dependencies = [

 [[package]]
 name = "cosmwasm-derive"
-version = "1.0.0-beta2"
+version = "1.0.0-beta3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abad1a6ff427a2f66890a4dce6354b4563cd07cee91a942300e011c921c09ed2"
+checksum = "866713b2fe13f23038c7d8824c3059d1f28dd94685fb406d1533c4eeeefeefae"
 dependencies = [
 "syn",
 ]

 [[package]]
 name = "cosmwasm-schema"
-version = "1.0.0-beta2"
+version = "1.0.0-beta3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe52b19d45fe3f8359db6cc24df44dbe05e5ae32539afc0f5b7f790a21aa6fd0"
+checksum = "818b928263c09a3269c2bed22494a62107a43ef87900e273af8ad2cb9f7e4440"
 dependencies = [
 "schemars",
 "serde_json",
@@ -262,9 +270,9 @@ dependencies = [

 [[package]]
 name = "cosmwasm-std"
-version = "1.0.0-beta2"
+version = "1.0.0-beta3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1660ee3d5734672e1eb4f0ceda403e2d83345e15143a48845f340f3252ce99a6"
+checksum = "8dbb9939b31441dfa9af3ec9740c8a24d585688401eff1b6b386abb7ad0d10a8"
 dependencies = [
 "base64",
 "cosmwasm-crypto",
@@ -278,9 +286,9 @@ dependencies = [

 [[package]]
 name = "cosmwasm-storage"
-version = "1.0.0-beta2"
+version = "1.0.0-beta3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3b4efe3b4f86df668520a02e9a29c23eea99b64dfcacb0e59b98346418af7f"
+checksum = "b4a4e55f0d64fed54cd2202301b8d466af8de044589247dabd77a4222f52f749"
 dependencies = [
 "cosmwasm-std",
 "serde",
@@ -309,6 +317,7 @@ dependencies = [
 "blake3",
 "bs58",
 "cipher",
+ "config",
 "digest 0.9.0",
 "ed25519-dalek",
 "generic-array 0.14.4",
@@ -317,7 +326,8 @@ dependencies = [
 "log",
 "nymsphinx-types",
 "pemstore",
- "rand",
+ "rand 0.7.3",
+ "subtle-encoding",
 "x25519-dalek",
 ]

@@ -448,7 +458,7 @@ checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
 dependencies = [
 "curve25519-dalek",
 "ed25519",
- "rand",
+ "rand 0.7.3",
 "serde",
 "sha2",
 "zeroize",
@@ -504,14 +514,6 @@ dependencies = [
 "syn",
 ]

-[[package]]
-name = "erc20-bridge-contract"
-version = "0.1.0"
-dependencies = [
- "schemars",
- "serde",
-]
-
 [[package]]
 name = "fake-simd"
 version = "0.1.2"
@@ -590,8 +592,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
 dependencies = [
 "cfg-if",
+ "js-sys",
 "libc",
 "wasi 0.10.2+wasi-snapshot-preview1",
+ "wasm-bindgen",
 ]

 [[package]]
@@ -854,8 +858,8 @@ dependencies = [
 "cw-storage-plus",
 "fixed",
 "mixnet-contract",
- "rand",
- "rand_chacha",
+ "rand 0.7.3",
+ "rand_chacha 0.2.2",
 "schemars",
 "serde",
 "thiserror",
@@ -1063,9 +1067,21 @@ checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 dependencies = [
 "getrandom 0.1.16",
 "libc",
- "rand_chacha",
+ "rand_chacha 0.2.2",
 "rand_core 0.5.1",
- "rand_hc",
+ "rand_hc 0.2.0",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
+dependencies = [
+ "libc",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.3",
+ "rand_hc 0.3.1",
 ]

 [[package]]
@@ -1078,6 +1094,16 @@ dependencies = [
 "rand_core 0.5.1",
 ]

+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.3",
+]
+
 [[package]]
 name = "rand_core"
 version = "0.5.1"
@@ -1103,7 +1129,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9e9532ada3929fb8b2e9dbe28d1e06c9b2cc65813f074fcb6bd5fbefeff9d56"
 dependencies = [
 "num-traits",
- "rand",
+ "rand 0.7.3",
 ]

 [[package]]
@@ -1115,6 +1141,15 @@ dependencies = [
 "rand_core 0.5.1",
 ]

+[[package]]
+name = "rand_hc"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
+dependencies = [
+ "rand_core 0.6.3",
+]
+
 [[package]]
 name = "regex"
 version = "1.5.4"
@@ -1295,7 +1330,7 @@ dependencies = [
 "hmac",
 "lioness",
 "log",
- "rand",
+ "rand 0.7.3",
 "rand_distr",
 "sha2",
 "subtle 2.4.1",
@@ -1328,6 +1363,15 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"

+[[package]]
+name = "subtle-encoding"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dcb1ed7b8330c5eed5441052651dd7a12c75e2ed88f2ec024ae1fa3a5e59945"
+dependencies = [
+ "zeroize",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.81"
@@ -1514,7 +1558,9 @@ dependencies = [
 "config",
 "cosmwasm-std",
 "cw-storage-plus",
+ "getrandom 0.2.3",
 "mixnet-contract",
+ "rand 0.8.4",
 "schemars",
 "serde",
 "thiserror",
@@ -1,5 +1,5 @@
 [workspace]
-members = ["erc20-bridge", "mixnet", "vesting"]
+members = ["bandwidth-claim", "mixnet", "vesting"]

 [profile.release]
 opt-level = 3
@@ -1,5 +1,5 @@
 [package]
-name = "cosmos_contract"
+name = "bandwidth-claim"
 version = "0.1.0"
 edition = "2018"

@@ -8,18 +8,14 @@ edition = "2018"
 [lib]
 crate-type = ["cdylib", "rlib"]

-[features]
-# for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm-std/backtraces"]
-
 [dev-dependencies]
 config = { path = "../../common/config"}

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

-cosmwasm-std = "1.0.0-beta2"
-cosmwasm-storage = "1.0.0-beta2"
+cosmwasm-std = "1.0.0-beta3"
+cosmwasm-storage = "1.0.0-beta3"

 schemars = "0.8"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
@@ -12,7 +12,7 @@ use cosmwasm_std::{
 };

 use crate::error::ContractError;
-use erc20_bridge_contract::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
+use bandwidth_claim_contract::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};

 /// Instantiate the contract.
 ///
@@ -61,10 +61,10 @@ pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response,
 #[cfg(test)]
 pub mod tests {
    use super::*;
+    use bandwidth_claim_contract::payment::PagedPaymentResponse;
    use config::defaults::DENOM;
    use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
    use cosmwasm_std::{coins, from_binary};
-    use erc20_bridge_contract::payment::PagedPaymentResponse;

    #[test]
    fn initialize_contract() {
@@ -4,8 +4,8 @@
 use cosmwasm_std::{Deps, Order, StdResult};

 use crate::storage::payments_read;
-use erc20_bridge_contract::keys::PublicKey;
-use erc20_bridge_contract::payment::{PagedPaymentResponse, Payment};
+use bandwidth_claim_contract::keys::PublicKey;
+use bandwidth_claim_contract::payment::{PagedPaymentResponse, Payment};

 const PAYMENT_PAGE_MAX_LIMIT: u32 = 100;
 const PAYMENT_PAGE_DEFAULT_LIMIT: u32 = 50;
@@ -6,7 +6,7 @@ use cosmwasm_storage::{bucket, bucket_read, Bucket, ReadonlyBucket};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};

-use erc20_bridge_contract::payment::Payment;
+use bandwidth_claim_contract::payment::Payment;

 // buckets
 const PREFIX_PAYMENTS: &[u8] = b"payments";
@@ -35,8 +35,8 @@ pub fn status(storage: &mut dyn Storage) -> Bucket<Status> {
 mod tests {
    use super::*;
    use crate::support::tests::helpers;
+    use bandwidth_claim_contract::keys::PublicKey;
    use cosmwasm_std::testing::MockStorage;
-    use erc20_bridge_contract::keys::PublicKey;

    #[test]
    fn payments_single_read_retrieval() {
@@ -4,11 +4,11 @@
 #[cfg(test)]
 pub mod helpers {
    use crate::instantiate;
+    use bandwidth_claim_contract::keys::PublicKey;
+    use bandwidth_claim_contract::msg::InstantiateMsg;
+    use bandwidth_claim_contract::payment::Payment;
    use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info, MockApi, MockQuerier};
    use cosmwasm_std::{Empty, MemoryStorage, OwnedDeps};
-    use erc20_bridge_contract::keys::PublicKey;
-    use erc20_bridge_contract::msg::InstantiateMsg;
-    use erc20_bridge_contract::payment::Payment;

    pub fn init_contract() -> OwnedDeps<MemoryStorage, MockApi, MockQuerier<Empty>> {
        let mut deps = mock_dependencies();
@@ -5,7 +5,7 @@ use cosmwasm_std::{DepsMut, Env, MessageInfo, Response};

 use crate::error::ContractError;
 use crate::storage::{payments, status, Status};
-use erc20_bridge_contract::payment::{LinkPaymentData, Payment};
+use bandwidth_claim_contract::payment::{LinkPaymentData, Payment};

 pub(crate) fn link_payment(
    deps: DepsMut,
@@ -49,8 +49,8 @@ mod tests {
    use super::*;
    use crate::storage::payments_read;
    use crate::support::tests::helpers;
+    use bandwidth_claim_contract::keys::PublicKey;
    use cosmwasm_std::testing::{mock_env, mock_info};
-    use erc20_bridge_contract::keys::PublicKey;

    #[test]
    fn bad_signature_payment() {
@@ -0,0 +1,6 @@
+node_modules
+../.env
+
+#Hardhat files
+cache
+artifacts
@@ -0,0 +1,6 @@
+module.exports = {
+  skipFiles: [
+    'CosmosToken.sol', 
+    'Gravity.sol'
+  ]
+};
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tommy Verrall	f95e9a7d37	Implement base line for tests on the validator ts client - This will need to be separated and configured accordingly - This was a quick spin up, using jest as a library to implement some coverage - Further things to be refined - mocks, more coverage, better configuration, clean up methods, improve env vars	2022-01-06 10:01:08 +00:00
Bogdan-Ștefan Neacșu	2041b03046	Missed takes_value() call	2022-01-04 17:12:41 +01:00
Bogdan-Ștefan Neacşu	0b6adf59ce	Feature/fix gateway sign (#1004 ) * Include version check in sign command * Ask for wallet address the same way as mixnode The reason for this is that the cosmos mnemonic that is asked at init is for the address that gets rewarded for gateway usage. Since that address is not necessarly set now and it can take a default value, we won't be using that to derive the address in the signing process.	2022-01-04 13:49:24 +01:00
Jędrzej Stuczyński	d95df4b286	Feature/implicit runtime (#973 ) * Made mixnode runtime implicit * Ibid for native and socks5 clients	2022-01-04 11:00:48 +00:00
Bogdan-Ștefan Neacşu	4f109169af	Fix clippy (#1003 )	2022-01-03 14:32:37 +01:00
Bogdan-Ștefan Neacșu	0cef1abbb2	Update mixnode version	2021-12-23 15:05:11 +02:00
Tommy Verrall	1871c6b2e3	Merge pull request #998 from nymtech/feature/wallet-update-version Update wallet version	2021-12-23 10:01:13 +00:00
Tommy Verrall	75ad2a113f	Update wallet version - keep all the binaries aligned	2021-12-23 10:00:13 +00:00
Bogdan-Ștefan Neacşu	1d1496aa49	Make the separation between testnet-mode and erc20 bandwidth mode clearer (#994 ) * Make the separation between testnet-mode and erc20 bandwidth mode more clear * Update Cargo.toml * Remove eth bw from native client under a feature flag * Remove eth bw from socks5 client under a feature flag * Remove eth bw from gateway under a feature flag * Update gateway version * Fix coconut build warnings	2021-12-23 11:55:01 +02:00
Tommy Verrall	a48e06fe51	Fix wallet build instructions (#997 ) * Fix wallet build instructions - Supplying the .env file requirement * re-added the admin - address	2021-12-23 11:54:34 +02:00
Drazen Urch	614b99a36e	Differentiate staking and ownership (#961 ) * Differentiate staking and ownership * Ownership transfer, tests * Consistent random keys * Improve account tests * Update Cargo.lock * Make everybody happy Co-authored-by: Drazen Urch <durch@users.noreply.guthub.com>	2021-12-22 13:22:46 +01:00
dependabot[bot]	d8cb6199e0	Bump @openzeppelin/contracts in /contracts/basic-bandwidth-generation (#983 ) Bumps [@openzeppelin/contracts](https://github.com/OpenZeppelin/openzeppelin-contracts) from 3.4.0 to 4.4.1. - [Release notes](https://github.com/OpenZeppelin/openzeppelin-contracts/releases) - [Changelog](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/CHANGELOG.md) - [Commits](https://github.com/OpenZeppelin/openzeppelin-contracts/compare/v3.4.0...v4.4.1) --- updated-dependencies: - dependency-name: "@openzeppelin/contracts" dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-12-22 11:42:37 +01:00
Tommy Verrall	424c1695b3	Merge pull request #991 from nymtech/feature/change-wallet-version Update wallet to align with versioning on nodes and gateways	2021-12-21 11:39:12 +00:00
Tommy Verrall	3ceb6d711f	Update wallet to align with versioning on nodes and gateways	2021-12-21 11:38:13 +00:00
Dave Hrycyszyn	23d2279549	Merge branch 'develop' of github.com:nymtech/nym into develop	2021-12-21 11:21:28 +00:00
Dave Hrycyszyn	84d1909b18	Changelog for v0.12.0	2021-12-21 11:21:20 +00:00
Dave Hrycyszyn	29a22e95e6	Adding github_changelog_generator config files	2021-12-21 11:21:00 +00:00
Jess	0e0f9ed270	Update README.md	2021-12-21 10:34:29 +00:00
Jess	4c0c0bc49f	Update README.md	2021-12-21 10:33:32 +00:00
Tommy Verrall	ea350ef7dd	Merge pull request #990 from nymtech/feature/fix-success-text Fix success view messages.	2021-12-21 10:16:41 +00:00
Bogdan-Ștefan Neacșu	112820ad7b	Fix rebase going wrong	2021-12-21 12:15:07 +02:00
Tommy Verrall	fe27cbe7e2	Fix success view messages.	2021-12-21 10:07:35 +00:00
Bogdan-Ștefan Neacșu	bd892e00bd	Switch to sandbox as default build	2021-12-21 11:16:30 +02:00
Dave Hrycyszyn	8d2863e085	Back down on caching and we're good to redeploy	2021-12-20 18:01:19 +00:00
Dave Hrycyszyn	89cb931775	Cranking caching back up	2021-12-20 17:25:29 +00:00
Dave Hrycyszyn	0f58fb6437	Cutting client-side caching from 3.5 minutes to 5 seconds	2021-12-20 16:40:26 +00:00
Dave Hrycyszyn	837575c8d3	Knocking down cache interval some more	2021-12-20 15:19:48 +00:00
Dave Hrycyszyn	4cbe789f42	Merge branch 'develop' of github.com:nymtech/nym into develop	2021-12-20 15:13:29 +00:00
Dave Hrycyszyn	822c993f24	Setting cache to 2 seconds for explorer api	2021-12-20 15:13:22 +00:00
Bogdan-Ștefan Neacşu	9480233ca3	Feature/enable signature check (#989 ) * Revert "Do not set proxy only for this time" This reverts commit `47946ad79e`. * Reinstate signature check * Enable migrate entry point	2021-12-20 16:09:42 +02:00
Dave Hrycyszyn	72944905cd	Knocking down cache validation time	2021-12-20 14:08:49 +00:00
Dave Hrycyszyn	effb756e2f	Setting mixnode cache refresh to 30 seconds	2021-12-20 14:07:40 +00:00
Dave Hrycyszyn	583f5083e5	Merge branch 'develop' of github.com:nymtech/nym into develop	2021-12-20 14:00:04 +00:00
Dave Hrycyszyn	941e91d250	Re-enabling owner signature form on settings page	2021-12-20 13:59:52 +00:00
Bogdan-Ștefan Neacşu	0f1b9d138e	Update mixnet contract address (#988 )	2021-12-20 15:52:34 +02:00
mfahampshire	265696103c	updated env sample	2021-12-20 13:58:38 +01:00
Bogdan-Ștefan Neacşu	22ce25d821	Fix verloc print (#987 )	2021-12-20 12:52:32 +02:00
Dave Hrycyszyn	363f784714	Changing build command to match readme	2021-12-20 10:51:47 +00:00
Dave Hrycyszyn	1f360a5a27	Knocking validator-api refresh interval to 30 seconds	2021-12-20 10:36:43 +00:00
Dave Hrycyszyn	ea3f2e9beb	Moving country data refresh interval 15 minutes again	2021-12-20 10:35:04 +00:00
Dave Hrycyszyn	84924133b5	Knocking down the mixnode refresh interval to 30 seconds	2021-12-20 10:30:45 +00:00
Dave Hrycyszyn	860afc9086	Removing unused signing test module	2021-12-20 09:30:36 +00:00
Dave Hrycyszyn	0aab508633	Removing Dalek stuff, jst has already built this using cw apis	2021-12-19 16:18:08 +00:00
Dave Hrycyszyn	bdfce8f663	Merge branch 'develop' of github.com:nymtech/nym into develop	2021-12-19 15:55:20 +00:00
Dave Hrycyszyn	b5bb09588d	Fixing Cargo.lock	2021-12-19 15:55:13 +00:00
Dave Hrycyszyn	983322d273	Feature/refactor mixnet contract test helpers (#986 ) * Refactored test helpers * Renaming mixnode "bond" coins to "pledge" * Renaming gateway "bond" coins to "pledge" * ibid * Commenting out new tests, they will go in next PR	2021-12-19 15:54:11 +00:00
Dave Hrycyszyn	e761989c6a	Making the terminology consistent between mixnode/gateway output and … (#985 ) * Making the terminology consistent between mixnode/gateway output and wallet display * [ci skip] Generate TS types	2021-12-18 13:12:10 +00:00
futurechimp	bc981873ff	[ci skip] Generate TS types	2021-12-18 12:54:44 +00:00
Dave Hrycyszyn	8e99ae8979	Feature/add wallet to gateway init (#984 ) * Moving sign_text method into common/crypto to dry it up * Moved bech32 address validation into common/crypto * ibid * Gateway now requires a --wallet-address arg on init	2021-12-18 12:45:55 +00:00
Dave Hrycyszyn	ed2b515a83	Feature/add wallet address to init (#982 ) * Add a --wallet-adress parameter to init * Rearranging signing code locations * A bit more refactoring * ibid * Exiting if the stored bech32 address isn't valid at node start * A few docs comments * Moved crypto crate up to root src level * Friendlier startup messages for node verification code * Switching punk and nymt addresses in test	2021-12-18 10:44:30 +00:00
Fouad	aca31dbaac	Feature/wallet settings area (#974 ) * set up Settings component * Update network defaults * Short node identity signature check Fix tests * Do not set proxy only for this time * Update contract addresses * file restructure * file updates * add settings tab panels * update them color for nym fee * rework layout * update bond form to include signature and profit percent * create info tooltip + make status component optional * fix overflow * update sys vars tab * get mixnode bond details * use mixnode id in settings * set up profit percentage value on sys vars tab * profit percentage styling * add fix for delegations list * fix unbond UI bug * minor style updates * dont allow profit percent on gateway bonding * webpack prod fix * update profit percentage from settings area * hardcode signature for profit percentage update Co-authored-by: Bogdan-Ștefan Neacșu <bogdan@nymtech.net>	2021-12-18 07:54:53 +00:00
Mx	f8fb6f524e	Move cleaned up smart contracts to main code repo (#929 ) * moved contracts from gitlab to main codebase * added missing event param * removed erroneous from description * updates: * changed maths of token -> MB conversion * new tests for changed maths * length check on cosmos address * begun code doc * code documentation * small comment cleanup * cont. w tests, may have found bug in maths re: using not whole tokens: investigating * finished code doc * included requested changes to contract * change to maths operations, shrunk test error to < .9 * updates: * updated tests * updated readme * removed commented out code, changed variable name to be more informative * removed unnecessary byte32 length check	2021-12-18 01:32:47 +00:00
Bogdan-Ștefan Neacşu	036369226b	Bump version to 0.12.0 (#980 )	2021-12-18 01:13:30 +00:00
Bogdan-Ștefan Neacşu	4972ad8c53	Feature/rename erc20 (#979 ) * Rename erc20-bridge to bandwidth-claim * Rename contract constant in network defaults	2021-12-18 01:13:11 +00:00
Dave Hrycyszyn	a09581eea9	Removed web wallet (#978 )	2021-12-18 01:09:57 +00:00
Tommy Verrall	4d447706fc	Update message to bond mixnode (#981 ) - This prevents the user navigating to the deprecated web-wallet.	2021-12-17 17:51:07 +00:00
Jędrzej Stuczyński	6c6e16035a	Feature/optional bandwidth bypass (#965 ) * Removed outdated constant * ClaimFreeTestnetBandwidth ClientControlRequest * Configuration option for the testnet mode in gateway * Made testnet mode deserialize to default value if not present * Fixed testnet mode override * Testnet config options for clients and validator api * Changed error message for when gateway is not using testnet mode * Incorporated testnet mode into gateway client * Activating testnet mode based on config values * Allowing clippy warnings * Fixed use of moved value in wasm build Co-authored-by: Bogdan-Ștefan Neacșu <bogdan@nymtech.net>	2021-12-17 18:55:33 +02:00
Tommy Verrall	96aa814a61	Merge pull request #977 from nymtech/bugfix/network-explorer-uptime-graph Network Explorer: fix uptime history display to use new API response	2021-12-17 14:30:04 +00:00
Mark Sinclair	1fbf437786	Network Explorer: fix uptime history display to use new API response	2021-12-17 13:41:41 +00:00
Bogdan-Ștefan Neacşu	852d12b440	Make develop branch agnostic of the network (#976 ) * Make develop branch agnostic of the network * Update network defaults * Short node identity signature check Fix tests * Do not set proxy only for this time * Update contract addresses * Network Explorer: configure URLs with `.env` file * Network Explorer API improvements: - upgrade `okapi` for swagger generation across multiple resources - switched `GET mix-node` to `GET mix-nodes` - added error message when no geolocation env var is set and process continues * Network Explorer improvements: - fix up API urls after Network Explorer API changes - set currency denominations in `.env` file - set API endpoints in `.env` file * Network Explorer: change prod env to round robin DNS * Update test Co-authored-by: Mark Sinclair <mmsinclair@gmail.com>	2021-12-17 15:36:35 +02:00
Bogdan-Ștefan Neacşu	865759254f	Fix windows fmt (#975 )	2021-12-17 13:23:44 +02:00
Fouad	0a30eb1c64	Merge pull request #968 from nymtech/feature/new-testnet-wallet-updates Feature/new testnet wallet updates	2021-12-16 16:08:32 +00:00
Bogdan-Ștefan Neacşu	63bb35e1a1	Use the renamed balance function (#971 )	2021-12-16 17:36:50 +02:00
Jędrzej Stuczyński	c1e809fd99	Feature/ts client update (#956 ) * Made client compile again + set auto fees * Simplified client construction by allowing only a single URL * wip * Simplified signing assertion * Initial implementation of queries * Implemented all basic nymd queries * Validator API queries * Signing related queries * Using default arguments * Removed redundant else branches * `eslint` and `prettier` formatting on Typescript validator client * Removed cyclic import on Coin type * Missing direct dependencies * Ingoring cyclic imports * Removed unused argument Co-authored-by: Mark Sinclair <mmsinclair@gmail.com>	2021-12-16 15:35:30 +00:00
Jędrzej Stuczyński	77ab22999c	Feature/node info command (#972 ) * Removed code duplication and introduced node-details command for mixnode * ibid for the gateway * Added port information	2021-12-16 14:55:03 +00:00
Bogdan-Ștefan Neacşu	747bf85ad8	Add custom denom balance query (#957 ) * Add custom denom balance query * Apply PR comment	2021-12-16 13:59:08 +02:00
Jędrzej Stuczyński	cf4eadaa6b	Introduced 'version' command to all relevant binaries (#969 ) * Introduced 'version' command to all relevant binaries * Removed separate 'version' subcommand in favour of clap's 'long_version' field	2021-12-16 11:48:50 +00:00
Jędrzej Stuczyński	f43f07f0b9	Fixed invalid nodes being counted twice in unroutable category (#963 )	2021-12-16 10:58:57 +00:00
fmtabbara	c5cf7d19a3	add sample env	2021-12-16 10:10:39 +00:00
fmtabbara	7d7911c8e8	merge develop	2021-12-16 10:09:23 +00:00
Fouad	40d93e1eeb	Merge pull request #964 from nymtech/feature/bond-details-handlers Additional tauri commands to get bond details	2021-12-15 16:53:58 +00:00
Jędrzej Stuczyński	2f472c4e8e	Additional tauri commands to get bond details	2021-12-15 16:05:31 +00:00
fmtabbara	140cc3f769	correct profitPercent variable name	2021-12-13 21:11:12 +00:00
fmtabbara	2045d0bafd	update new fields	2021-12-13 15:26:35 +00:00
fmtabbara	e68b48f296	use config so that env vars can be destructured	2021-12-13 14:39:26 +00:00
fmtabbara	3a2b553e38	use variable for currency	2021-12-13 13:04:17 +00:00
fmtabbara	aa1955dc6b	update webpack configs	2021-12-13 13:03:23 +00:00