feat(wallet): add generic dialog component

2022-07-04 19:45:36 +02:00 · 2022-07-04 19:35:56 +02:00 · 2022-07-04 19:33:02 +02:00 · 2022-07-04 19:25:03 +02:00 · 2022-07-04 17:19:41 +02:00 · 2022-07-04 16:46:37 +02:00
126 changed files with 1091 additions and 2997 deletions
@@ -9,6 +9,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://

 - socks5 client/websocket client: add `--force-register-gateway` flag, useful when rerunning init ([#1353])
 - nym-connect: initial proof-of-concept of a UI around the socks5 client was added
+- nym-connect: add ability to select network requester and gateway ([#1427]).
 - all: added network compilation target to `--help` (or `--version`) commands ([#1256]).
 - explorer-api: learned how to sum the delegations by owner in a new endpoint.
 - explorer-api: add apy values to `mix_nodes` endpoint
@@ -29,6 +30,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://

 - mixnode, gateway: attempting to determine reconnection backoff to persistently failing mixnode could result in a crash ([#1260])
 - mixnode: the mixnode learned how to shutdown gracefully
+- mixnode: listen out for SIGTERM and SIGQUIT too, making it play nicely as a system service.
 - native & socks5 clients: fail early when clients try to re-init with a different gateway, which is not supported yet ([#1322])
 - native & socks5 clients: rerun init will now reuse previous gateway configuration instead of failing ([#1353])
 - native & socks5 clients: deduplicate big chunks of init logic
@@ -62,6 +64,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 [#1388]: https://github.com/nymtech/nym/pull/1388
 [#1393]: https://github.com/nymtech/nym/pull/1393
 [#1404]: https://github.com/nymtech/nym/pull/1404
+[#1427]: https://github.com/nymtech/nym/pull/1427

 ## [nym-contracts-v1.0.1](https://github.com/nymtech/nym/tree/nym-contracts-v1.0.1) (2022-06-22)

@@ -1343,9 +1343,9 @@ dependencies = [

 [[package]]
 name = "dirs"
-version = "3.0.2"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309"
+checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
 dependencies = [
 "dirs-sys",
 ]
@@ -3156,7 +3156,6 @@ dependencies = [
 "rand 0.7.3",
 "rocket",
 "serde",
- "serial_test",
 "sysinfo",
 "task",
 "tokio",
@@ -5019,28 +5018,6 @@ dependencies = [
 "yaml-rust",
 ]

-[[package]]
-name = "serial_test"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0bccbcf40c8938196944a3da0e133e031a33f4d6b72db3bda3cc556e361905d"
-dependencies = [
- "lazy_static",
- "parking_lot 0.11.2",
- "serial_test_derive",
-]
-
-[[package]]
-name = "serial_test_derive"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2acd6defeddb41eb60bb468f8825d0cfd0c2a76bc03bfd235b6a1dc4f6a1ad5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "sha-1"
 version = "0.8.2"
@@ -81,4 +81,4 @@ default-members = [
    "explorer-api",
 ]

-exclude = ["explorer", "contracts", "tokenomics-py", "clients/webassembly", "nym-wallet"]
+exclude = ["explorer", "contracts", "tokenomics-py", "clients/webassembly", "nym-wallet", "nym-connect"]
@@ -9,8 +9,8 @@ The platform is composed of multiple Rust crates. Top-level executable binary cr

 * nym-mixnode - shuffles [Sphinx](https://github.com/nymtech/sphinx) packets together to provide privacy against network-level attackers.
 * nym-client - an executable which you can build into your own applications. Use it for interacting with Nym nodes.
-* nym-socks5-client - a Socks5 proxy you can run on your machine, and use with existing applications
-* nym-gateway - acts sort of like a mailbox for mixnet messages, removing the need for directly delivery to potentially offline or firewalled devices.
+* nym-socks5-client - a Socks5 proxy you can run on your machine and use with existing applications.
+* nym-gateway - acts sort of like a mailbox for mixnet messages, which removes the need for direct delivery to potentially offline or firewalled devices.
 * nym-network-monitor - sends packets through the full system to check that they are working as expected, and stores node uptime histories as the basis of a rewards system ("mixmining" or "proof-of-mixing").
 * nym-explorer - a (projected) block explorer and (existing) mixnet viewer.
 * nym-wallet - a desktop wallet implemented using the [Tauri](https://tauri.studio/en/docs/about/intro) framework. 
@@ -7,7 +7,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-dirs = "3.0"
+dirs = "4.0"
 futures = "0.3"
 humantime-serde = "1.0"
 log = "0.4"
@@ -272,7 +272,7 @@ impl<T: NymConfig> Default for Config<T> {
    }
 }

-#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, PartialEq, Eq, Serialize)]
 pub struct GatewayEndpoint {
    /// gateway_id specifies ID of the gateway to which the client should send messages.
    /// If initially omitted, a random gateway will be chosen from the available topology.
@@ -296,7 +296,7 @@ impl From<topology::gateway::Node> for GatewayEndpoint {
    }
 }

-#[derive(Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Debug, Deserialize, PartialEq, Eq, Serialize)]
 pub struct Client<T> {
    /// Version of the client for which this configuration was created.
    #[serde(default = "missing_string_value")]
@@ -419,7 +419,7 @@ impl<T: NymConfig> Client<T> {
    }
 }

-#[derive(Debug, Default, Deserialize, PartialEq, Serialize)]
+#[derive(Debug, Default, Deserialize, PartialEq, Eq, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct Logging {}

@@ -20,7 +20,7 @@ futures = "0.3" # bunch of futures stuff, however, now that I think about it, it
 url = "2.2"

 clap = "2.33.0" # for the command line arguments
-dirs = "3.0" # for determining default store directories in config
+dirs = "4.0"
 dotenv = "0.15.0" # for obtaining environmental variables (only used for RUST_LOG for time being)
 log = "0.4" # self explanatory
 pretty_env_logger = "0.4" # for formatting log messages
@@ -11,7 +11,7 @@ use std::path::PathBuf;

 mod template;

-#[derive(Debug, Deserialize, PartialEq, Serialize, Clone, Copy)]
+#[derive(Debug, Deserialize, PartialEq, Eq, Serialize, Clone, Copy)]
 #[serde(deny_unknown_fields)]
 pub enum SocketType {
    WebSocket,
@@ -105,7 +105,7 @@ impl Config {
    }
 }

-#[derive(Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Debug, Deserialize, PartialEq, Eq, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct Socket {
    socket_type: SocketType,
@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 use std::fmt;

 // no need to go fancy here like we've done in other places.
-#[derive(PartialEq, Clone, Serialize, Deserialize)]
+#[derive(PartialEq, Eq, Clone, Serialize, Deserialize)]
 pub struct Error {
    pub kind: ErrorKind,
    pub message: String,
@@ -30,7 +30,7 @@ impl Error {
 }

 #[repr(u8)]
-#[derive(PartialEq, Clone, Serialize, Deserialize)]
+#[derive(PartialEq, Eq, Clone, Serialize, Deserialize)]
 pub enum ErrorKind {
    /// The received request contained no data.
    EmptyRequest = 0x01,
@@ -11,7 +11,7 @@ path = "src/lib.rs"

 [dependencies]
 clap = "2.33.0"
-dirs = "3.0" # for determining default store directories in config
+dirs = "4.0"
 dotenv = "0.15.0"
 futures = "0.3"
 log = "0.4"
@@ -89,7 +89,7 @@ impl Config {
    }
 }

-#[derive(Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Debug, Deserialize, PartialEq, Eq, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct Socks5 {
    /// The port on which the client will be listening for incoming requests
@@ -9,7 +9,7 @@ pub(crate) enum AuthenticationMethods {
    NoMethods = 0xFF,
 }

-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 /// A socks5 user with a matching password.
 pub struct User {
    pub username: String,
@@ -221,7 +221,7 @@
 "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
-  integrity sha1-m4sMxmPWaafY9vXQiToU00jzD78=
+  integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==

 "@protobufjs/base64@^1.1.2":
  version "1.1.2"
@@ -236,12 +236,12 @@
 "@protobufjs/eventemitter@^1.1.0":
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70"
-  integrity sha1-NVy8mLr61ZePntCV85diHx0Ga3A=
+  integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==

 "@protobufjs/fetch@^1.1.0":
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45"
-  integrity sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=
+  integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==
  dependencies:
    "@protobufjs/aspromise" "^1.1.1"
    "@protobufjs/inquire" "^1.1.0"
@@ -249,27 +249,27 @@
 "@protobufjs/float@^1.0.2":
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"
-  integrity sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=
+  integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==

 "@protobufjs/inquire@^1.1.0":
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089"
-  integrity sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=
+  integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==

 "@protobufjs/path@^1.1.2":
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"
-  integrity sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=
+  integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==

 "@protobufjs/pool@^1.1.0":
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"
-  integrity sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=
+  integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==

 "@protobufjs/utf8@^1.1.0":
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
-  integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
+  integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==

 "@types/json-schema@^7.0.9":
  version "7.0.11"
@@ -282,9 +282,9 @@
  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=

 "@types/long@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9"
-  integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
+  integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==

 "@types/node@>=13.7.0":
  version "17.0.23"
@@ -1642,9 +1642,9 @@ protobufjs@^6.8.8, protobufjs@~6.11.2:
    long "^4.0.0"

 protobufjs@~6.10.2:
-  version "6.10.2"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.10.2.tgz#b9cb6bd8ec8f87514592ba3fdfd28e93f33a469b"
-  integrity sha512-27yj+04uF6ya9l+qfpH187aqEzfCF4+Uit0I9ZBQVqK09hk/SQzKa2MUqUpXaVa7LOFRg1TSSr3lVxGOk6c0SQ==
+  version "6.10.3"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.10.3.tgz#11ed1dd02acbfcb330becf1611461d4b407f9eef"
+  integrity sha512-yvAslS0hNdBhlSKckI4R1l7wunVilX66uvrjzE4MimiAt7/qw1nLpMhZrn/ObuUTM/c3Xnfl01LYMdcSJe6dwg==
  dependencies:
    "@protobufjs/aspromise" "^1.1.2"
    "@protobufjs/base64" "^1.1.2"
@@ -5,7 +5,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};

 // Serializable structures for what we find in common/crypto
-#[derive(Serialize, Deserialize, Copy, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Copy, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub struct PublicKey([u8; 32]);

 impl PublicKey {
@@ -24,7 +24,7 @@ impl AsRef<[u8]> for PublicKey {
    }
 }

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub struct Signature([u8; 32], [u8; 32]);

 impl Signature {
@@ -7,16 +7,16 @@ use serde::{Deserialize, Serialize};
 use crate::keys::PublicKey;
 use crate::payment::LinkPaymentData;

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub struct InstantiateMsg {}

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
    LinkPayment { data: LinkPaymentData },
 }

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
    GetPayments {
@@ -25,6 +25,6 @@ pub enum QueryMsg {
    },
 }

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub struct MigrateMsg {}
@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};

 use crate::keys::{PublicKey, Signature};

-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
 pub struct Payment {
    verification_key: PublicKey,
    gateway_identity: PublicKey,
@@ -27,7 +27,7 @@ impl Payment {
    }
 }

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub struct LinkPaymentData {
    pub verification_key: PublicKey,
    pub gateway_identity: PublicKey,
@@ -51,7 +51,7 @@ impl LinkPaymentData {
    }
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
 pub struct PagedPaymentResponse {
    pub payments: Vec<Payment>,
    pub per_page: usize,
@@ -6,14 +6,14 @@ use std::fmt;
 pub use cosmrs::Coin as CosmosCoin;
 pub use cosmwasm_std::Coin as CosmWasmCoin;

-#[derive(Serialize, Deserialize, Clone, Copy, Default, Debug, PartialEq)]
+#[derive(Serialize, Deserialize, Clone, Copy, Default, Debug, PartialEq, Eq)]
 pub struct MismatchedDenoms;

 // the reason the coin is created here as opposed to different place in the codebase is that
 // eventually we want to either publish the cosmwasm client separately or commit it to
 // some other project, like cosmrs. Either way, in that case we can't really have
 // a dependency on an internal type
-#[derive(Serialize, Deserialize, Clone, Default, Debug, PartialEq)]
+#[derive(Serialize, Deserialize, Clone, Default, Debug, PartialEq, Eq)]
 pub struct Coin {
    pub amount: u128,
    pub denom: String,
@@ -10,7 +10,7 @@ use error::CoconutInterfaceError;

 pub use nymcoconut::*;

-#[derive(Debug, Serialize, Deserialize, Getters, CopyGetters, Clone, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, Getters, CopyGetters, Clone, PartialEq, Eq)]
 pub struct Credential {
    #[getset(get = "pub")]
    n_params: u32,
@@ -4,7 +4,7 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub struct DepositData {
    deposit_info: String,
    identity_key: String,
@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};

 use crate::deposit::DepositData;

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub struct InstantiateMsg {
    pub multisig_addr: String,
    pub pool_addr: String,
@@ -20,10 +20,10 @@ pub enum ExecuteMsg {
    ReleaseFunds { funds: Coin },
 }

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {}

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub struct MigrateMsg {}
@@ -123,7 +123,7 @@ impl Display for Delegation {
    }
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
 pub struct PagedMixDelegationsResponse {
    pub delegations: Vec<Delegation>,
    pub start_next_after: Option<(String, u64)>,
@@ -138,7 +138,7 @@ impl PagedMixDelegationsResponse {
    }
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
 pub struct PagedDelegatorDelegationsResponse {
    pub delegations: Vec<Delegation>,
    pub start_next_after: Option<IdentityKey>,
@@ -153,7 +153,7 @@ impl PagedDelegatorDelegationsResponse {
    }
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
 pub struct PagedAllDelegationsResponse {
    pub delegations: Vec<Delegation>,
    pub start_next_after: Option<(IdentityKey, Vec<u8>, u64)>,
@@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
 use std::fmt::Display;

-#[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, PartialOrd, Serialize, JsonSchema)]
 pub struct Gateway {
    pub host: String,
    pub mix_port: u16,
@@ -59,7 +59,7 @@ pub(crate) mod string_rfc3339_offset_date_time {
    }
 }

-#[derive(Clone, Copy, Debug, Deserialize, PartialEq, PartialOrd, Serialize)]
+#[derive(Clone, Copy, Debug, Deserialize, PartialEq, Eq, PartialOrd, Serialize)]
 pub struct Interval {
    id: u32,
    #[serde(with = "string_rfc3339_offset_date_time")]
@@ -19,7 +19,7 @@ use std::fmt::Display;
    feature = "generate-ts",
    ts(export_to = "ts-packages/types/src/types/rust/RewardedSetNodeStatus.ts")
 )]
-#[derive(Clone, Copy, Debug, Deserialize, Serialize, JsonSchema, PartialEq)]
+#[derive(Clone, Copy, Debug, Deserialize, Serialize, JsonSchema, PartialEq, Eq)]
 pub enum RewardedSetNodeStatus {
    Active,
    Standby,
@@ -106,7 +106,7 @@ impl PendingUndelegate {
    }
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, PartialOrd, Serialize, JsonSchema)]
 pub struct MixNode {
    pub host: String,
    pub mix_port: u16,
@@ -245,7 +245,7 @@ impl DelegatorRewardParams {
    }
 }

-#[derive(Debug, Clone, JsonSchema, PartialEq, Serialize, Deserialize, Copy)]
+#[derive(Debug, Clone, JsonSchema, PartialEq, Eq, Serialize, Deserialize, Copy)]
 pub struct StoredNodeRewardResult {
    reward: Uint128,

@@ -7,12 +7,12 @@ use crate::{Gateway, IdentityKey, MixNode};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};

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

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
    UpdateRewardingValidatorAddress {
@@ -112,7 +112,7 @@ pub enum ExecuteMsg {
    },
 }

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
    GetCurrentOperatorCost {},
@@ -205,6 +205,6 @@ pub enum QueryMsg {
    },
 }

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub struct MigrateMsg {}
@@ -4,7 +4,7 @@ use cosmwasm_std::Uint128;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};

-#[derive(Debug, Clone, JsonSchema, PartialEq, Serialize, Deserialize, Copy)]
+#[derive(Debug, Clone, JsonSchema, PartialEq, Eq, Serialize, Deserialize, Copy)]
 pub struct NodeEpochRewards {
    params: NodeRewardParams,
    result: StoredNodeRewardResult,
@@ -105,7 +105,7 @@ impl NodeEpochRewards {
    }
 }

-#[derive(Debug, Clone, JsonSchema, PartialEq, Serialize, Deserialize, Copy)]
+#[derive(Debug, Clone, JsonSchema, PartialEq, Eq, Serialize, Deserialize, Copy)]
 pub struct EpochRewardParams {
    epoch_reward_pool: Uint128,
    rewarded_set_size: Uint128,
@@ -175,7 +175,7 @@ impl EpochRewardParams {
    }
 }

-#[derive(Debug, Clone, JsonSchema, PartialEq, Serialize, Deserialize, Copy)]
+#[derive(Debug, Clone, JsonSchema, PartialEq, Eq, Serialize, Deserialize, Copy)]
 pub struct NodeRewardParams {
    reward_blockstamp: u64,
    uptime: Uint128,
@@ -208,7 +208,7 @@ impl NodeRewardParams {
    }
 }

-#[derive(Debug, Clone, JsonSchema, PartialEq, Serialize, Deserialize, Copy)]
+#[derive(Debug, Clone, JsonSchema, PartialEq, Eq, Serialize, Deserialize, Copy)]
 pub struct RewardParams {
    pub epoch: EpochRewardParams,
    pub node: NodeRewardParams,
@@ -27,7 +27,7 @@ impl LayerDistribution {
    }
 }

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub struct ContractStateParams {
    // so currently interval_length is being unused and validator API performs rewarding
    // based on its own interval length config value. I guess that's fine for time being
@@ -72,7 +72,7 @@ impl Display for ContractStateParams {
    }
 }

-#[derive(Default, Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Default, Debug, Serialize, Deserialize, PartialEq, Eq)]
 pub struct RewardingResult {
    pub node_reward: Uint128,
 }
@@ -124,21 +124,21 @@ pub type IdentityKey = String;
 pub type IdentityKeyRef<'a> = &'a str;
 pub type SphinxKey = String;

-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, JsonSchema)]
 pub struct PagedRewardedSetResponse {
    pub identities: Vec<(IdentityKey, RewardedSetNodeStatus)>,
    pub start_next_after: Option<IdentityKey>,
    pub at_height: u64,
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
 pub struct RewardedSetUpdateDetails {
    pub refresh_rate_blocks: u64,
    pub last_refreshed_block: u64,
    pub current_height: u64,
 }

-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
 pub struct IntervalRewardedSetHeightsResponse {
    pub interval_id: u32,
    pub heights: Vec<u64>,
@@ -44,7 +44,7 @@ pub enum ExecuteMsg {
 }

 // We can also add this as a cw3 extension
-#[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
+#[derive(Serialize, Deserialize, Clone, PartialEq, Eq, JsonSchema, Debug)]
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
    /// Return ThresholdResponse
@@ -19,7 +19,7 @@ pub fn one_ucoin() -> Coin {
    feature = "generate-ts",
    ts(export_to = "ts-packages/types/src/types/rust/Period.ts")
 )]
-#[derive(Debug, PartialEq, Serialize, Deserialize, Clone, JsonSchema)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone, JsonSchema)]
 pub enum Period {
    Before,
    In(usize),
@@ -3,17 +3,17 @@ use mixnet_contract_common::{Gateway, IdentityKey, MixNode};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};

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

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

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema, Default)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema, Default)]
 pub struct VestingSpecification {
    start_time: Option<u64>,
    period_seconds: Option<u64>,
@@ -118,7 +118,7 @@ pub enum ExecuteMsg {
    },
 }

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
    LockedCoins {
@@ -15,7 +15,7 @@ use std::ops::Neg;
 use zeroize::Zeroize;

 #[derive(Debug)]
-#[cfg_attr(test, derive(Clone, PartialEq))]
+#[cfg_attr(test, derive(Clone, PartialEq, Eq))]
 pub struct Ciphertexts {
    pub rr: [G1Projective; NUM_CHUNKS],
    pub ss: [G1Projective; NUM_CHUNKS],
@@ -335,7 +335,7 @@ pub fn keygen(params: &Params, mut rng: impl RngCore) -> (DecryptionKey, PublicK
    (dk, key_with_proof)
 }

-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct PublicKey(pub(crate) G1Projective);

 impl PublicKey {
@@ -345,7 +345,7 @@ impl PublicKey {
 }

 #[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
+#[cfg_attr(test, derive(PartialEq, Eq))]
 pub struct PublicKeyWithProof {
    pub(crate) key: PublicKey,
    pub(crate) proof: ProofOfDiscreteLog,
@@ -243,7 +243,7 @@ impl Zeroize for Tau {
    }
 }

-#[derive(Copy, Clone, Debug, PartialEq, PartialOrd)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd)]
 pub struct Epoch(EpochStore);

 impl Epoch {
@@ -68,7 +68,7 @@ impl<'a> Instance<'a> {
 }

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

 #[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
+#[cfg_attr(test, derive(PartialEq, Eq))]
 pub struct ProofOfDiscreteLog {
    pub(crate) rand_commitment: G1Projective,
    pub(crate) response: Scalar,
@@ -77,7 +77,7 @@ impl<'a> Instance<'a> {
 }

 #[derive(Debug)]
-#[cfg_attr(test, derive(Clone, PartialEq))]
+#[cfg_attr(test, derive(Clone, PartialEq, Eq))]
 pub struct ProofOfSecretSharing {
    ff: G1Projective,
    aa: G2Projective,
@@ -18,7 +18,7 @@ use std::collections::BTreeMap;
 use zeroize::Zeroize;

 #[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
+#[cfg_attr(test, derive(PartialEq, Eq))]
 pub struct Dealing {
    pub public_coefficients: PublicCoefficients,
    pub ciphertexts: Ciphertexts,
@@ -10,7 +10,7 @@ use rand_core::RngCore;
 use std::ops::{Add, Index, IndexMut};
 use zeroize::Zeroize;

-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct PublicCoefficients {
    pub(crate) coefficients: Vec<G2Projective>,
 }
@@ -1,7 +1,7 @@
 use config::defaults::DEFAULT_NETWORK;
 use subtle_encoding::bech32;

-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Bech32Error {
    DecodeFailed(String),
    WrongPrefix(String),
@@ -100,8 +100,10 @@ impl Network {
    pub fn statistics_service_url(&self) -> &str {
        match self {
            Network::MAINNET => crate::mainnet::STATISTICS_SERVICE_DOMAIN_ADDRESS,
-            _ => {
-                panic!("statistics service url is only available for mainnet!")
+            Network::SANDBOX => crate::mainnet::STATISTICS_SERVICE_DOMAIN_ADDRESS,
+            Network::QA => crate::mainnet::STATISTICS_SERVICE_DOMAIN_ADDRESS,
+            Network::CUSTOM { .. } => {
+                panic!("statistics service url is unavailable for a custom network")
            }
        }
    }
@@ -23,7 +23,7 @@ pub(crate) const _ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] =
    hex_literal::hex!("0000000000000000000000000000000000000000");
 pub(crate) const REWARDING_VALIDATOR_ADDRESS: &str = "n10yyd98e2tuwu0f7ypz9dy3hhjw7v772q6287gy";

-pub(crate) const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "http://mainnet-stats.nymte.ch:8090";
+pub(crate) const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "http://127.0.0.1:8090";
 pub(crate) fn validators() -> Vec<ValidatorDetails> {
    vec![ValidatorDetails::new(
        "https://rpc.nyx.nodes.guru/",
@@ -23,7 +23,7 @@ pub(crate) const _ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] =
    hex_literal::hex!("0000000000000000000000000000000000000000");
 pub(crate) const REWARDING_VALIDATOR_ADDRESS: &str = "n1tfzd4qz3a45u8p4mr5zmzv66457uwjgcl05jdq";

-pub(crate) const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "";
+pub(crate) const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "http://0.0.0.0";
 pub(crate) fn validators() -> Vec<ValidatorDetails> {
    vec![ValidatorDetails::new(
        "https://qa-validator.nymtech.net",
@@ -21,7 +21,7 @@ pub(crate) const _ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] =
    hex_literal::hex!("E8883BAeF3869e14E4823F46662e81D4F7d2A81F");
 pub(crate) const REWARDING_VALIDATOR_ADDRESS: &str = "nymt1jh0s6qu6tuw9ut438836mmn7f3f2wencrnmdj4";

-pub(crate) const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "";
+pub(crate) const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "http://0.0.0.0";
 pub(crate) fn validators() -> Vec<ValidatorDetails> {
    vec![ValidatorDetails::new(
        "https://sandbox-validator.nymtech.net",
@@ -20,7 +20,7 @@ pub type EphemeralKey = Scalar;

 /// Two G1 points representing ElGamal ciphertext
 #[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
+#[cfg_attr(test, derive(PartialEq, Eq))]
 pub struct Ciphertext(pub(crate) G1Projective, pub(crate) G1Projective);

 impl TryFrom<&[u8]> for Ciphertext {
@@ -73,7 +73,7 @@ impl Ciphertext {

 /// PrivateKey used in the ElGamal encryption scheme to recover the plaintext
 #[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
+#[cfg_attr(test, derive(PartialEq, Eq))]
 pub struct PrivateKey(pub(crate) Scalar);

 impl PrivateKey {
@@ -121,7 +121,7 @@ impl Base58 for PrivateKey {}
 // TODO: perhaps be more explicit and apart from gamma also store generator and group order?
 /// PublicKey used in the ElGamal encryption scheme to produce the ciphertext
 #[derive(Debug, Clone)]
-#[cfg_attr(test, derive(PartialEq))]
+#[cfg_attr(test, derive(PartialEq, Eq))]
 pub struct PublicKey(G1Projective);

 impl PublicKey {
@@ -23,7 +23,7 @@ use crate::Attribute;
 type ChallengeDigest = Sha256;

 #[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
+#[cfg_attr(test, derive(PartialEq, Eq))]
 pub struct ProofCmCs {
    challenge: Scalar,
    response_opening: Scalar,
@@ -327,7 +327,7 @@ impl ProofCmCs {
    }
 }

-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub struct ProofKappaZeta {
    // c
    challenge: Scalar,
@@ -25,7 +25,7 @@ use crate::utils::{hash_g1, try_deserialize_g1_projective};
 // TODO NAMING: double check this one
 // Lambda
 #[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
+#[cfg_attr(test, derive(PartialEq, Eq))]
 pub struct BlindSignRequest {
    // cm
    commitment: G1Projective,
@@ -23,7 +23,7 @@ use crate::utils::{
 use crate::Base58;

 #[derive(Debug, Clone)]
-#[cfg_attr(test, derive(PartialEq))]
+#[cfg_attr(test, derive(PartialEq, Eq))]
 pub struct SecretKey {
    pub(crate) x: Scalar,
    pub(crate) ys: Vec<Scalar>,
@@ -114,7 +114,7 @@ impl Base58 for SecretKey {}

 // TODO: perhaps change points to affine representation
 // to make verification slightly more efficient?
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub struct VerificationKey {
    // TODO add gen2 as per the paper or imply it from the fact library is using bls381?
    pub(crate) alpha: G2Projective,
@@ -351,7 +351,7 @@ impl Bytable for VerificationKey {
 impl Base58 for VerificationKey {}

 #[derive(Debug, Serialize, Deserialize)]
-#[cfg_attr(test, derive(PartialEq))]
+#[cfg_attr(test, derive(PartialEq, Eq))]
 pub struct KeyPair {
    secret_key: SecretKey,
    verification_key: VerificationKey,
@@ -28,7 +28,7 @@ pub mod verification;
 pub type SignerIndex = u64;

 // (h, s)
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct Signature(pub(crate) G1Projective, pub(crate) G1Projective);

 pub type PartialSignature = Signature;
@@ -103,7 +103,7 @@ impl Bytable for Signature {
 impl Base58 for Signature {}

 #[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
+#[cfg_attr(test, derive(PartialEq, Eq))]
 pub struct BlindedSignature(G1Projective, G1Projective);

 impl Bytable for BlindedSignature {
@@ -20,7 +20,7 @@ use crate::Attribute;

 // TODO NAMING: this whole thing
 // Theta
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub struct Theta {
    // blinded_message (kappa)
    pub blinded_message: G2Projective,
@@ -45,7 +45,7 @@ pub mod set;
 /// Both of those concepts as well as their structures, i.e. `Set` and `Fragment`
 /// are further explained in the respective files.

-#[derive(PartialEq, Debug)]
+#[derive(PartialEq, Eq, Debug)]
 pub enum ChunkingError {
    InvalidPayloadLengthError,
    TooBigMessageToSplit,
@@ -46,7 +46,7 @@ impl FramedSphinxPacket {
 // Contains any metadata that might be useful for sending between mix nodes.
 // TODO: in theory all those data could be put in a single `u8` by setting appropriate bits,
 // but would that really be worth it?
-#[derive(Debug, Default, PartialEq, Copy, Clone)]
+#[derive(Debug, Default, PartialEq, Eq, Copy, Clone)]
 pub struct Header {
    /// Represents type and consequently size of the included SphinxPacket.
    pub(crate) packet_size: PacketSize,
@@ -7,7 +7,7 @@ use std::convert::TryFrom;
 pub struct InvalidPacketMode;

 #[repr(u8)]
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum PacketMode {
    /// Represents 'normal' packet sent through the network that should be delayed by an appropriate
    /// value at each hop.
@@ -21,7 +21,7 @@ const EXTENDED_PACKET_SIZE: usize = HEADER_SIZE + PAYLOAD_OVERHEAD_SIZE + 32 * 1
 pub struct InvalidPacketSize;

 #[repr(u8)]
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum PacketSize {
    // for example instant messaging use case
    RegularPacket = 1,
@@ -1,6 +1,6 @@
 use std::cmp::Ordering;

-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum MessageError {
    NoData,
    IndexTooShort,
@@ -1,6 +1,6 @@
 use crate::ConnectionId;

-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum ResponseError {
    ConnectionIdTooShort,
    NoData,
@@ -18,4 +18,4 @@ sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "chrono"]}
 thiserror = "1"
 tokio = { version = "1.19.1", features = [ "time" ] }

-network-defaults = { path = "../network-defaults" }
+network-defaults = { path = "../network-defaults" }
@@ -34,16 +34,12 @@ pub enum StatsData {

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

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

@@ -26,6 +26,7 @@ use validator_client::nymd::{Coin, CosmosCoin};
    EnumString,
    EnumVariantNames,
    PartialEq,
+    Eq,
    JsonSchema,
 )]
 #[serde(rename_all = "UPPERCASE")]
@@ -59,7 +60,7 @@ impl TryFrom<CosmosDenom> for CurrencyDenom {
    type Error = TypesError;

    fn try_from(value: CosmosDenom) -> Result<Self, Self::Error> {
-        CurrencyDenom::parse(&value.to_string())
+        CurrencyDenom::parse(value.as_ref())
    }
 }

@@ -68,7 +69,7 @@ impl TryFrom<CosmosDenom> for CurrencyDenom {
    feature = "generate-ts",
    ts(export_to = "ts-packages/types/src/types/rust/CurrencyStringMajorAmount.ts")
 )]
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub struct MajorAmountString(String); // see https://github.com/Aleph-Alpha/ts-rs/issues/51 for exporting type aliases

 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
@@ -77,7 +78,7 @@ pub struct MajorAmountString(String); // see https://github.com/Aleph-Alpha/ts-r
    ts(export_to = "ts-packages/types/src/types/rust/Currency.ts")
 )]
 // #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub struct MajorCurrencyAmount {
    // temporarly going back to original impl to speed up merge
    pub amount: MajorAmountString,
@@ -14,7 +14,7 @@ use crate::error::TypesError;
    feature = "generate-ts",
    ts(export_to = "ts-packages/types/src/types/rust/Delegation.ts")
 )]
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, JsonSchema)]
 pub struct Delegation {
    pub owner: String,
    pub node_identity: String,
@@ -52,7 +52,7 @@ impl TryFrom<MixnetContractDelegation> for Delegation {
    feature = "generate-ts",
    ts(export_to = "ts-packages/types/src/types/rust/DelegationRecord.ts")
 )]
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, JsonSchema)]
 pub struct DelegationRecord {
    pub amount: MajorCurrencyAmount,
    pub block_height: u64,
@@ -88,7 +88,7 @@ pub struct DelegationWithEverything {
    feature = "generate-ts",
    ts(export_to = "ts-packages/types/src/types/rust/DelegationResult.ts")
 )]
-#[derive(Serialize, Deserialize, JsonSchema, Clone, PartialEq, Debug)]
+#[derive(Serialize, Deserialize, JsonSchema, Clone, PartialEq, Eq, Debug)]
 pub struct DelegationResult {
    source_address: String,
    target_address: String,
@@ -127,7 +127,7 @@ impl TryFrom<MixnetContractDelegation> for DelegationResult {
    feature = "generate-ts",
    ts(export_to = "ts-packages/types/src/types/rust/DelegationEventKind.ts")
 )]
-#[derive(Clone, Deserialize, Serialize, PartialEq, JsonSchema, Debug)]
+#[derive(Clone, Deserialize, Serialize, PartialEq, Eq, JsonSchema, Debug)]
 pub enum DelegationEventKind {
    Delegate,
    Undelegate,
@@ -138,7 +138,7 @@ pub enum DelegationEventKind {
    feature = "generate-ts",
    ts(export_to = "ts-packages/types/src/types/rust/DelegationEvent.ts")
 )]
-#[derive(Clone, Deserialize, Serialize, PartialEq, JsonSchema, Debug)]
+#[derive(Clone, Deserialize, Serialize, PartialEq, Eq, JsonSchema, Debug)]
 pub struct DelegationEvent {
    pub kind: DelegationEventKind,
    pub node_identity: String,
@@ -181,7 +181,7 @@ impl TryFrom<ContractDelegationEvent> for DelegationEvent {
    feature = "generate-ts",
    ts(export_to = "ts-packages/types/src/types/rust/PendingUndelegate.ts")
 )]
-#[derive(Deserialize, Serialize, PartialEq, JsonSchema, Clone, Debug)]
+#[derive(Deserialize, Serialize, PartialEq, Eq, JsonSchema, Clone, Debug)]
 pub struct PendingUndelegate {
    mix_identity: String,
    delegate: String,
@@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize};
    feature = "generate-ts",
    ts(export_to = "ts-packages/types/src/types/rust/Gateway.ts")
 )]
-#[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, PartialOrd, Serialize, JsonSchema)]
 pub struct Gateway {
    pub host: String,
    pub mix_port: u16,
@@ -52,7 +52,7 @@ impl From<MixnetContractGateway> for Gateway {
    feature = "generate-ts",
    ts(export_to = "ts-packages/types/src/types/rust/GatewayBond.ts")
 )]
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
 pub struct GatewayBond {
    pub pledge_amount: MajorCurrencyAmount,
    pub owner: String,
@@ -12,7 +12,7 @@ use serde::{Deserialize, Serialize};
    feature = "generate-ts",
    ts(export_to = "ts-packages/types/src/types/rust/Mixnode.ts")
 )]
-#[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, PartialOrd, Serialize, JsonSchema)]
 pub struct MixNode {
    pub host: String,
    pub mix_port: u16,
@@ -56,7 +56,7 @@ impl From<MixnetContractMixNode> for MixNode {
    feature = "generate-ts",
    ts(export_to = "ts-packages/types/src/types/rust/MixNodeBond.ts")
 )]
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
 pub struct MixNodeBond {
    pub pledge_amount: MajorCurrencyAmount,
    pub total_delegation: MajorCurrencyAmount,
@@ -12,7 +12,7 @@ use bandwidth_claim_contract::payment::Payment;
 const PREFIX_PAYMENTS: &[u8] = b"payments";
 const PREFIX_STATUS: &[u8] = b"status";

-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
 pub enum Status {
    Unchecked,
    Checked,
@@ -9,7 +9,7 @@ use serde::{Deserialize, Serialize};

 pub const ADMIN: Admin = Admin::new("admin");

-#[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
+#[derive(Serialize, Deserialize, Clone, PartialEq, Eq, JsonSchema, Debug)]
 pub struct Config {
    pub multisig_addr: Addr,
    pub pool_addr: Addr,
@@ -1076,168 +1076,168 @@ mod tests {
        use super::*;

        // TODO: Probably delete due to reconciliation logic
-        #[ignore]
-        #[test]
-        fn fails_if_delegation_never_existed() {
-            let mut deps = test_helpers::init_contract();
-            let env = mock_env();
-            let mixnode_owner = "bob";
-            let identity = test_helpers::add_mixnode(
-                mixnode_owner,
-                tests::fixtures::good_mixnode_pledge(),
-                deps.as_mut(),
-            );
-            let delegation_owner = Addr::unchecked("sender");
-            assert_eq!(
-                Err(ContractError::NoMixnodeDelegationFound {
-                    identity: identity.clone(),
-                    address: delegation_owner.to_string(),
-                }),
-                try_remove_delegation_from_mixnode(
-                    deps.as_mut(),
-                    env,
-                    mock_info(delegation_owner.as_str(), &[]),
-                    identity,
-                )
-            );
-        }
+        //#[ignore]
+        //#[test]
+        //fn fails_if_delegation_never_existed() {
+        //    let mut deps = test_helpers::init_contract();
+        //    let env = mock_env();
+        //    let mixnode_owner = "bob";
+        //    let identity = test_helpers::add_mixnode(
+        //        mixnode_owner,
+        //        tests::fixtures::good_mixnode_pledge(),
+        //        deps.as_mut(),
+        //    );
+        //    let delegation_owner = Addr::unchecked("sender");
+        //    assert_eq!(
+        //        Err(ContractError::NoMixnodeDelegationFound {
+        //            identity: identity.clone(),
+        //            address: delegation_owner.to_string(),
+        //        }),
+        //        try_remove_delegation_from_mixnode(
+        //            deps.as_mut(),
+        //            env,
+        //            mock_info(delegation_owner.as_str(), &[]),
+        //            identity,
+        //        )
+        //    );
+        //}

        // TODO: Update to work with reconciliation
-        #[ignore]
-        #[test]
-        fn succeeds_if_delegation_existed() {
-            let mut deps = test_helpers::init_contract();
-            let mixnode_owner = "bob";
-            let env = mock_env();
-            let identity = test_helpers::add_mixnode(
-                mixnode_owner,
-                tests::fixtures::good_mixnode_pledge(),
-                deps.as_mut(),
-            );
-            let delegation_owner = Addr::unchecked("sender");
-            try_delegate_to_mixnode(
-                deps.as_mut(),
-                mock_env(),
-                mock_info(delegation_owner.as_str(), &coins(100, MIX_DENOM.base)),
-                identity.clone(),
-            )
-            .unwrap();
+        //#[ignore]
+        //#[test]
+        //fn succeeds_if_delegation_existed() {
+        //    let mut deps = test_helpers::init_contract();
+        //    let mixnode_owner = "bob";
+        //    let env = mock_env();
+        //    let identity = test_helpers::add_mixnode(
+        //        mixnode_owner,
+        //        tests::fixtures::good_mixnode_pledge(),
+        //        deps.as_mut(),
+        //    );
+        //    let delegation_owner = Addr::unchecked("sender");
+        //    try_delegate_to_mixnode(
+        //        deps.as_mut(),
+        //        mock_env(),
+        //        mock_info(delegation_owner.as_str(), &coins(100, MIX_DENOM.base)),
+        //        identity.clone(),
+        //    )
+        //    .unwrap();

-            _try_reconcile_all_delegation_events(&mut deps.storage, &deps.api).unwrap();
+        //    _try_reconcile_all_delegation_events(&mut deps.storage, &deps.api).unwrap();

-            let _delegation = query_mixnode_delegation(
-                &deps.storage,
-                &deps.api,
-                identity.clone(),
-                delegation_owner.clone().into_string(),
-                None,
-            )
-            .unwrap();
+        //    let _delegation = query_mixnode_delegation(
+        //        &deps.storage,
+        //        &deps.api,
+        //        identity.clone(),
+        //        delegation_owner.clone().into_string(),
+        //        None,
+        //    )
+        //    .unwrap();

-            let expected_response = Response::new()
-                .add_message(BankMsg::Send {
-                    to_address: delegation_owner.clone().into(),
-                    amount: coins(100, MIX_DENOM.base),
-                })
-                .add_event(new_undelegation_event(
-                    &delegation_owner,
-                    &None,
-                    &identity,
-                    Uint128::new(100),
-                ));
+        //    let expected_response = Response::new()
+        //        .add_message(BankMsg::Send {
+        //            to_address: delegation_owner.clone().into(),
+        //            amount: coins(100, MIX_DENOM.base),
+        //        })
+        //        .add_event(new_undelegation_event(
+        //            &delegation_owner,
+        //            &None,
+        //            &identity,
+        //            Uint128::new(100),
+        //        ));

-            assert_eq!(
-                Ok(expected_response),
-                try_remove_delegation_from_mixnode(
-                    deps.as_mut(),
-                    env,
-                    mock_info(delegation_owner.as_str(), &[]),
-                    identity.clone(),
-                )
-            );
-            assert!(storage::delegations()
-                .may_load(
-                    &deps.storage,
-                    (identity.clone(), delegation_owner.as_bytes().to_vec(), 0),
-                )
-                .unwrap()
-                .is_none());
+        //    assert_eq!(
+        //        Ok(expected_response),
+        //        try_remove_delegation_from_mixnode(
+        //            deps.as_mut(),
+        //            env,
+        //            mock_info(delegation_owner.as_str(), &[]),
+        //            identity.clone(),
+        //        )
+        //    );
+        //    assert!(storage::delegations()
+        //        .may_load(
+        //            &deps.storage,
+        //            (identity.clone(), delegation_owner.as_bytes().to_vec(), 0),
+        //        )
+        //        .unwrap()
+        //        .is_none());

-            // and total delegation is cleared
-            assert_eq!(
-                Uint128::zero(),
-                mixnodes_storage::TOTAL_DELEGATION
-                    .load(&deps.storage, &identity)
-                    .unwrap()
-            )
-        }
+        //    // and total delegation is cleared
+        //    assert_eq!(
+        //        Uint128::zero(),
+        //        mixnodes_storage::TOTAL_DELEGATION
+        //            .load(&deps.storage, &identity)
+        //            .unwrap()
+        //    )
+        //}

        // TODO: Update to work with reconciliation
-        #[ignore]
-        #[test]
-        fn succeeds_if_delegation_existed_even_if_node_unbonded() {
-            let mut deps = test_helpers::init_contract();
-            let mixnode_owner = "bob";
-            let env = mock_env();
-            let identity = test_helpers::add_mixnode(
-                mixnode_owner,
-                tests::fixtures::good_mixnode_pledge(),
-                deps.as_mut(),
-            );
-            let delegation_owner = Addr::unchecked("sender");
-            try_delegate_to_mixnode(
-                deps.as_mut(),
-                mock_env(),
-                mock_info(delegation_owner.as_str(), &coins(100, MIX_DENOM.base)),
-                identity.clone(),
-            )
-            .unwrap();
+        //#[ignore]
+        //#[test]
+        //fn succeeds_if_delegation_existed_even_if_node_unbonded() {
+        //    let mut deps = test_helpers::init_contract();
+        //    let mixnode_owner = "bob";
+        //    let env = mock_env();
+        //    let identity = test_helpers::add_mixnode(
+        //        mixnode_owner,
+        //        tests::fixtures::good_mixnode_pledge(),
+        //        deps.as_mut(),
+        //    );
+        //    let delegation_owner = Addr::unchecked("sender");
+        //    try_delegate_to_mixnode(
+        //        deps.as_mut(),
+        //        mock_env(),
+        //        mock_info(delegation_owner.as_str(), &coins(100, MIX_DENOM.base)),
+        //        identity.clone(),
+        //    )
+        //    .unwrap();

-            _try_reconcile_all_delegation_events(&mut deps.storage, &deps.api).unwrap();
+        //    _try_reconcile_all_delegation_events(&mut deps.storage, &deps.api).unwrap();

-            let delegation = query_mixnode_delegation(
-                &deps.storage,
-                &deps.api,
-                identity.clone(),
-                delegation_owner.clone().into_string(),
-                None,
-            )
-            .unwrap();
+        //    let delegation = query_mixnode_delegation(
+        //        &deps.storage,
+        //        &deps.api,
+        //        identity.clone(),
+        //        delegation_owner.clone().into_string(),
+        //        None,
+        //    )
+        //    .unwrap();

-            let expected_response = Response::new()
-                .add_message(BankMsg::Send {
-                    to_address: delegation_owner.clone().into(),
-                    amount: coins(100, MIX_DENOM.base),
-                })
-                .add_event(new_undelegation_event(
-                    &delegation_owner,
-                    &None,
-                    &identity,
-                    Uint128::new(100),
-                ));
+        //    let expected_response = Response::new()
+        //        .add_message(BankMsg::Send {
+        //            to_address: delegation_owner.clone().into(),
+        //            amount: coins(100, MIX_DENOM.base),
+        //        })
+        //        .add_event(new_undelegation_event(
+        //            &delegation_owner,
+        //            &None,
+        //            &identity,
+        //            Uint128::new(100),
+        //        ));

-            try_remove_mixnode(mock_env(), deps.as_mut(), mock_info(mixnode_owner, &[])).unwrap();
+        //    try_remove_mixnode(mock_env(), deps.as_mut(), mock_info(mixnode_owner, &[])).unwrap();

-            assert_eq!(
-                Ok(expected_response),
-                try_remove_delegation_from_mixnode(
-                    deps.as_mut(),
-                    env,
-                    mock_info(delegation_owner.as_str(), &[]),
-                    identity.clone(),
-                )
-            );
+        //    assert_eq!(
+        //        Ok(expected_response),
+        //        try_remove_delegation_from_mixnode(
+        //            deps.as_mut(),
+        //            env,
+        //            mock_info(delegation_owner.as_str(), &[]),
+        //            identity.clone(),
+        //        )
+        //    );

-            _try_reconcile_all_delegation_events(&mut deps.storage, &deps.api).unwrap();
+        //    _try_reconcile_all_delegation_events(&mut deps.storage, &deps.api).unwrap();

-            assert!(test_helpers::read_delegation(
-                &deps.storage,
-                identity,
-                delegation_owner.as_bytes(),
-                mock_env().block.height
-            )
-            .is_none());
-        }
+        //    assert!(test_helpers::read_delegation(
+        //        &deps.storage,
+        //        identity,
+        //        delegation_owner.as_bytes(),
+        //        mock_env().block.height
+        //    )
+        //    .is_none());
+        //}

        #[test]
        fn total_delegation_is_preserved_if_only_some_undelegate() {
@@ -6,7 +6,7 @@ use mixnet_contract_common::ContractStateParams;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub struct ContractState {
    pub owner: Addr, // only the owner account can update state
    pub rewarding_validator_address: Addr,
@@ -43,7 +43,7 @@ pub fn try_claim_operator_reward(
    env: &Env,
    info: &MessageInfo,
 ) -> Result<Response, ContractError> {
-    _try_claim_operator_reward(deps.storage, deps.api, env, &info.sender.to_string(), None)
+    _try_claim_operator_reward(deps.storage, deps.api, env, info.sender.as_ref(), None)
 }

 pub fn try_claim_operator_reward_on_behalf(
@@ -206,7 +206,7 @@ pub fn try_claim_delegator_reward(
        deps.storage,
        deps.api,
        env,
-        &info.sender.to_string(),
+        info.sender.as_ref(),
        mix_identity,
        None,
    )
@@ -29,7 +29,7 @@ pub enum ExecuteMsg {
    RemoveHook { addr: String },
 }

-#[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
+#[derive(Serialize, Deserialize, Clone, PartialEq, Eq, JsonSchema, Debug)]
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
    /// Return AdminResponse
@@ -7,7 +7,7 @@ pub use account::*;

 use vesting_contract_common::messages::VestingSpecification;

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub struct VestingPeriod {
    pub start_time: u64,
    pub period_seconds: u64,
@@ -1480,9 +1480,9 @@
      }
    },
    "node_modules/protobufjs": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.10.2.tgz",
-      "integrity": "sha512-27yj+04uF6ya9l+qfpH187aqEzfCF4+Uit0I9ZBQVqK09hk/SQzKa2MUqUpXaVa7LOFRg1TSSr3lVxGOk6c0SQ==",
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.10.3.tgz",
+      "integrity": "sha512-yvAslS0hNdBhlSKckI4R1l7wunVilX66uvrjzE4MimiAt7/qw1nLpMhZrn/ObuUTM/c3Xnfl01LYMdcSJe6dwg==",
      "hasInstallScript": true,
      "dependencies": {
        "@protobufjs/aspromise": "^1.1.2",
@@ -3162,9 +3162,9 @@
      "dev": true
    },
    "protobufjs": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.10.2.tgz",
-      "integrity": "sha512-27yj+04uF6ya9l+qfpH187aqEzfCF4+Uit0I9ZBQVqK09hk/SQzKa2MUqUpXaVa7LOFRg1TSSr3lVxGOk6c0SQ==",
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.10.3.tgz",
+      "integrity": "sha512-yvAslS0hNdBhlSKckI4R1l7wunVilX66uvrjzE4MimiAt7/qw1nLpMhZrn/ObuUTM/c3Xnfl01LYMdcSJe6dwg==",
      "requires": {
        "@protobufjs/aspromise": "^1.1.2",
        "@protobufjs/base64": "^1.1.2",
@@ -92,9 +92,9 @@ fn get_servers() -> Vec<rocket_okapi::okapi::openapi3::Server> {
    if std::env::var_os("CARGO").is_some() {
        return vec![];
    }
-    return vec![rocket_okapi::okapi::openapi3::Server {
+    vec![rocket_okapi::okapi::openapi3::Server {
        url: std::env::var("OPEN_API_BASE").unwrap_or_else(|_| "/api/v1/".to_owned()),
        description: Some("API".to_owned()),
        ..Default::default()
-    }];
+    }]
 }
@@ -12,7 +12,7 @@ pub(crate) async fn get_single_mixnode_delegations(
    client: &ThreadsafeValidatorClient,
    pubkey: &str,
 ) -> Vec<Delegation> {
-    let delegates = match client
+    match client
        .0
        .get_all_nymd_single_mixnode_delegations(pubkey.to_string())
        .await
@@ -22,8 +22,7 @@ pub(crate) async fn get_single_mixnode_delegations(
            error!("Could not get delegations for mix node {}: {:?}", pubkey, e);
            vec![]
        }
-    };
-    delegates
+    }
 }

 pub(crate) async fn get_single_mixnode_delegations_summed(
@@ -19,7 +19,7 @@ bs58 = "0.4.0"
 clap = { version = "3.0.10", features = ["cargo", "derive"] }
 colored = "2.0"
 dashmap = "4.0"
-dirs = "3.0"
+dirs = "4.0"
 dotenv = "0.15.0"
 futures = "0.3"
 humantime-serde = "1.0.1"
@@ -306,7 +306,7 @@ impl Config {
    }
 }

-#[derive(Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Debug, Deserialize, PartialEq, Eq, Serialize)]
 pub struct Gateway {
    /// Version of the gateway for which this configuration was created.
    #[serde(default = "missing_string_value")]
@@ -333,7 +333,6 @@ where
        if self.config.get_enabled_statistics() {
            let statistics_service_url = self.config.get_statistics_service_url();
            let stats_collector = GatewayStatisticsCollector::new(
-                self.identity_keypair.public_key().to_base58_string(),
                active_clients_store.clone(),
                statistics_service_url,
            );
@@ -14,19 +14,13 @@ use statistics_common::{
 use crate::node::client_handling::active_clients::ActiveClientsStore;

 pub(crate) struct GatewayStatisticsCollector {
-    gateway_id: String,
    active_clients_store: ActiveClientsStore,
    statistics_service_url: Url,
 }

 impl GatewayStatisticsCollector {
-    pub fn new(
-        gateway_id: String,
-        active_clients_store: ActiveClientsStore,
-        statistics_service_url: Url,
-    ) -> Self {
+    pub fn new(active_clients_store: ActiveClientsStore, statistics_service_url: Url) -> Self {
        GatewayStatisticsCollector {
-            gateway_id,
            active_clients_store,
            statistics_service_url,
        }
@@ -40,10 +34,8 @@ impl StatisticsCollector for GatewayStatisticsCollector {
        interval: Duration,
        timestamp: DateTime<Utc>,
    ) -> StatsMessage {
-        let stats_data = vec![StatsData::Gateway(StatsGatewayData::new(
-            self.gateway_id.clone(),
-            self.active_clients_store.size() as u32,
-        ))];
+        let inbox_count = self.active_clients_store.size() as u32;
+        let stats_data = vec![StatsData::Gateway(StatsGatewayData { inbox_count })];
        StatsMessage {
            stats_data,
            interval_seconds: interval.as_secs() as u32,
@@ -21,7 +21,7 @@ bs58 = "0.4.0"
 clap = { version = "3.0.10", features = ["cargo", "derive"] }
 colored = "2.0"
 cupid = "0.6.1"
-dirs = "3.0"
+dirs = "4.0"
 dotenv = "0.15.0"
 futures = "0.3.0"
 humantime-serde = "1.0"
@@ -51,7 +51,6 @@ validator-client = { path="../common/client-libs/validator-client" }
 version-checker = { path="../common/version-checker" }

 [dev-dependencies]
-serial_test = "0.5"
 tokio = { version="1.19.1", features = ["rt-multi-thread", "net", "signal", "test-util"] }

 nymsphinx-types = { path = "../common/nymsphinx/types" }
@@ -60,7 +60,7 @@ impl From<Init> for OverrideConfig {
    }
 }

-pub(crate) async fn execute(args: &Init) {
+pub(crate) fn execute(args: &Init) {
    let override_config_fields = OverrideConfig::from(args.clone());
    let id = &override_config_fields.id;
    println!("Initialising mixnode {}...", id);
@@ -52,7 +52,7 @@ struct OverrideConfig {
 pub(crate) async fn execute(args: Cli) {
    match &args.command {
        Commands::Describe(m) => describe::execute(m),
-        Commands::Init(m) => init::execute(m).await,
+        Commands::Init(m) => init::execute(m),
        Commands::Run(m) => run::execute(m).await,
        Commands::Sign(m) => sign::execute(m),
        Commands::Upgrade(m) => upgrade::execute(m),
@@ -136,7 +136,9 @@ pub(crate) fn validate_bech32_address_or_exit(address: &str) {
 pub(crate) fn version_check(cfg: &Config) -> bool {
    let binary_version = env!("CARGO_PKG_VERSION");
    let config_version = cfg.get_version();
-    if binary_version != config_version {
+    if binary_version == config_version {
+        true
+    } else {
        warn!("The mixnode binary has different version than what is specified in config file! {} and {}", binary_version, config_version);
        if version_checker::is_minor_version_compatible(binary_version, config_version) {
            info!("but they are still semver compatible. However, consider running the `upgrade` command");
@@ -145,7 +147,5 @@ pub(crate) fn version_check(cfg: &Config) -> bool {
            error!("and they are semver incompatible! - please run the `upgrade` command before attempting `run` again");
            false
        }
-    } else {
-        true
    }
 }
@@ -59,7 +59,7 @@ impl From<Run> for OverrideConfig {
    }
 }

-fn show_binding_warning(address: String) {
+fn show_binding_warning(address: &str) {
    println!("\n##### NOTE #####");
    println!(
        "\nYou are trying to bind to {} - you might not be accessible to other nodes\n\
@@ -97,7 +97,7 @@ pub(crate) async fn execute(args: &Run) {
    }

    if special_addresses().contains(&&*config.get_listening_address().to_string()) {
-        show_binding_warning(config.get_listening_address().to_string());
+        show_binding_warning(&config.get_listening_address().to_string());
    }

    let mut mixnode = MixNode::new(config);
@@ -10,6 +10,7 @@ pub(crate) struct Hardware {
    crypto_hardware: Option<CryptoHardware>,
 }

+#[allow(clippy::struct_excessive_bools)]
 #[derive(Serialize, Debug)]
 #[serde(crate = "rocket::serde")]
 pub(crate) struct CryptoHardware {
@@ -44,9 +45,9 @@ fn hardware_from_sysinfo(crypto_hardware: Option<CryptoHardware>) -> Option<Hard
        let cores = system.cpus();
        let num_cores = cores.len();
        Some(Hardware {
-            crypto_hardware,
            ram,
            num_cores,
+            crypto_hardware,
        })
    } else {
        None
@@ -286,17 +286,7 @@ impl MixNode {
    }

    async fn wait_for_interrupt(&self, mut shutdown: ShutdownNotifier) {
-        if let Err(e) = tokio::signal::ctrl_c().await {
-            error!(
-                "There was an error while capturing SIGINT - {:?}. \
-                We will terminate regardless",
-                e
-            );
-        }
-        println!(
-            "Received SIGINT - the mixnode will terminate now \
-            (threads are not yet nicely stopped, if you see stack traces that's alright)."
-        );
+        wait_for_signal().await;

        log::info!("Sending shutdown");
        shutdown.signal_shutdown().ok();
@@ -344,3 +334,31 @@ impl MixNode {
        self.wait_for_interrupt(shutdown).await
    }
 }
+
+#[cfg(unix)]
+async fn wait_for_signal() {
+    use tokio::signal::unix::{signal, SignalKind};
+    let mut sigterm = signal(SignalKind::terminate()).expect("Failed to setup SIGTERM channel");
+    let mut sigquit = signal(SignalKind::quit()).expect("Failed to setup SIGQUIT channel");
+
+    tokio::select! {
+        _ = tokio::signal::ctrl_c() => {
+            log::info!("Received SIGINT");
+        },
+        _ = sigterm.recv() => {
+            log::info!("Received SIGTERM");
+        }
+        _ = sigquit.recv() => {
+            log::info!("Received SIGQUIT");
+        }
+    }
+}
+
+#[cfg(not(unix))]
+async fn wait_for_signal() {
+    tokio::select! {
+        _ = tokio::signal::ctrl_c() => {
+            log::info!("Received SIGINT");
+        },
+    }
+}
@@ -5,7 +5,7 @@ use std::{fs, io};

 pub(crate) const DESCRIPTION_FILE: &str = "description.toml";

-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
 pub struct NodeDescription {
    pub(crate) name: String,
    pub(crate) description: String,
@@ -51,14 +51,14 @@ impl SharedNodeStats {
        guard.update_time = snapshot_time;

        guard.packets_received_since_startup += new_received;
-        for (mix, count) in new_sent.iter() {
+        for (mix, count) in &new_sent {
            *guard
                .packets_sent_since_startup
                .entry(mix.clone())
                .or_insert(0) += *count;
        }

-        for (mix, count) in new_dropped.iter() {
+        for (mix, count) in &new_dropped {
            *guard
                .packets_explicitly_dropped_since_last_update
                .entry(mix.clone())
@@ -590,7 +590,7 @@ version = "1.0.1"
 dependencies = [
 "config",
 "crypto",
- "dirs 3.0.2",
+ "dirs",
 "futures",
 "gateway-client",
 "gateway-requests",
@@ -1295,15 +1295,6 @@ dependencies = [
 "subtle 2.4.1",
 ]

-[[package]]
-name = "dirs"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309"
-dependencies = [
- "dirs-sys",
-]
-
 [[package]]
 name = "dirs"
 version = "4.0.0"
@@ -3386,7 +3377,7 @@ dependencies = [
 "bip39",
 "client-core",
 "config",
- "dirs 4.0.0",
+ "dirs",
 "eyre",
 "fix-path-env",
 "futures",
@@ -3394,6 +3385,7 @@ dependencies = [
 "nym-socks5-client",
 "pretty_env_logger",
 "rand 0.7.3",
+ "reqwest",
 "serde",
 "serde_json",
 "tauri",
@@ -3418,7 +3410,7 @@ dependencies = [
 "config",
 "credential-storage",
 "crypto",
- "dirs 3.0.2",
+ "dirs",
 "dotenv",
 "futures",
 "gateway-client",
@@ -30,11 +30,12 @@ serde_json = "1.0"
 tauri = { version = "=1.0.0-rc.8", features = ["ayatana-tray", "shell-open", "system-tray"] }
 tendermint-rpc = "0.23.0"
 thiserror = "1.0"
-tokio = { version = "1.19.1", features = ["sync"] }
+tokio = { version = "1.19.1", features = ["sync", "time"] }
 url = "2.2"
 log = "0.4"
 pretty_env_logger = "0.4.0"
 fix-path-env = { git = "https://github.com/tauri-apps/fix-path-env-rs", branch = "release"}
+reqwest = { version = "0.11", features = ["json"] }

 client-core = { path = "../../clients/client-core" }
 config = { path = "../../common/config" }
@@ -2,31 +2,52 @@ use std::path::PathBuf;

 use client_core::config::GatewayEndpoint;
 use log::info;
+use std::sync::Arc;
+use tokio::sync::RwLock;

 use client_core::config::Config as BaseConfig;
 use config::NymConfig;
 use nym_socks5::client::config::Config as Socks5Config;

-pub static SOCKS5_CONFIG_ID: &str = "nym-connect";
+use crate::{error::BackendError, state::State};

-// This is an open-proxy network-requester for testing
-// TODO: make this configurable from the UI
-// TODO: once we can set this is the UI, consider just removing it, and put in guards to halt if
-//       user hasn't chosen the provider
-pub static PROVIDER_ADDRESS: &str = "8CrdmK4mYgZ5caMxGU4AvNeT1dXL8VSbgMYAjSFvnfut.2GLdZ1Jn9vkTBMf858evGNGDsPoeivUPw7zFNceLiLX3@BNjYZPxzcJwczXHHgBxCAyVJKxN6LPteDRrKapxWmexv";
+pub static SOCKS5_CONFIG_ID: &str = "nym-connect";

 const DEFAULT_ETH_ENDPOINT: &str = "https://rinkeby.infura.io/v3/00000000000000000000000000000000";
 const DEFAULT_ETH_PRIVATE_KEY: &str =
    "0000000000000000000000000000000000000000000000000000000000000001";

-#[tauri::command]
-pub fn get_config_file_location() -> String {
-    let id: &str = SOCKS5_CONFIG_ID;
-    Config::config_file_location(id)
-        .to_string_lossy()
-        .to_string()
+pub fn append_config_id(gateway_id: &str) -> String {
+    use std::fmt::Write as _;
+    let mut id = SOCKS5_CONFIG_ID.to_string();
+    write!(id, "-{}", gateway_id).expect("Failed to set config id");
+    id
 }

+#[tauri::command]
+pub async fn get_config_id(
+    state: tauri::State<'_, Arc<RwLock<State>>>,
+) -> Result<String, BackendError> {
+    let guard = state.read().await;
+    // TODO: return error instead
+    let gateway_id = guard
+        .get_gateway()
+        .as_ref()
+        .expect("The config id can not be determined before setting the gateway");
+    Ok(append_config_id(gateway_id))
+}
+
+#[tauri::command]
+pub async fn get_config_file_location(
+    state: tauri::State<'_, Arc<RwLock<State>>>,
+) -> Result<String, BackendError> {
+    let id = get_config_id(state).await?;
+    Ok(Config::config_file_location(&id)
+        .to_string_lossy()
+        .to_string())
+}
+
+#[derive(Debug)]
 pub struct Config {
    socks5: Socks5Config,
 }
@@ -55,12 +76,22 @@ impl Config {
        self.socks5.get_base_mut()
    }

-    pub async fn init(service_provider: Option<&String>, chosen_gateway_id: Option<&String>) {
-        let service_provider = service_provider.map_or(PROVIDER_ADDRESS, String::as_str);
-        let chosen_gateway_id = chosen_gateway_id.map(String::as_str);
+    pub async fn init(service_provider: &str, chosen_gateway_id: &str) -> Result<(), BackendError> {
        info!("Initialising...");
-        init_socks5(service_provider, chosen_gateway_id).await;
+
+        let service_provider = service_provider.to_owned();
+        let chosen_gateway_id = chosen_gateway_id.to_owned();
+
+        // The client initialization was originally not written for this use case, so there are
+        // lots of ways it can panic. Until we have proper error handling in the init code for the
+        // clients we'll catch any panics here.
+        std::panic::catch_unwind(move || {
+            futures::executor::block_on(init_socks5(service_provider, chosen_gateway_id));
+        })
+        .map_err(|_| BackendError::InitializationPanic)?;
+
        info!("Configuration saved 🚀");
+        Ok(())
    }

    pub fn config_file_location(id: &str) -> PathBuf {
@@ -68,16 +99,17 @@ impl Config {
    }
 }

-pub async fn init_socks5(provider_address: &str, chosen_gateway_id: Option<&str>) {
+pub async fn init_socks5(provider_address: String, chosen_gateway_id: String) {
    log::info!("Initialising client...");

-    let id: &str = SOCKS5_CONFIG_ID;
+    // Append the gateway id to the name id that we store the config under
+    let id = append_config_id(&chosen_gateway_id);

    log::debug!(
        "Attempting to use config file location: {}",
-        Config::config_file_location(id).to_string_lossy(),
+        Config::config_file_location(&id).to_string_lossy(),
    );
-    let already_init = Config::config_file_location(id).exists();
+    let already_init = Config::config_file_location(&id).exists();
    if already_init {
        log::info!(
            "SOCKS5 client \"{}\" was already initialised before! \
@@ -92,7 +124,7 @@ pub async fn init_socks5(provider_address: &str, chosen_gateway_id: Option<&str>
    let register_gateway = !already_init || user_wants_force_register;

    log::trace!("Creating config for id: {}", id);
-    let mut config = Config::new(id, provider_address);
+    let mut config = Config::new(id.as_str(), &provider_address);

    // As far as I'm aware, these two are not used, they are only set because the socks5 init code
    // requires them for initialising the bandwidth controller.
@@ -103,7 +135,13 @@ pub async fn init_socks5(provider_address: &str, chosen_gateway_id: Option<&str>
        .get_base_mut()
        .with_eth_private_key(DEFAULT_ETH_PRIVATE_KEY);

-    let gateway = setup_gateway(id, register_gateway, chosen_gateway_id, config.get_socks5()).await;
+    let gateway = setup_gateway(
+        &id,
+        register_gateway,
+        Some(&chosen_gateway_id),
+        config.get_socks5(),
+    )
+    .await;
    config.get_base_mut().with_gateway_endpoint(gateway);

    let config_save_location = config.get_socks5().get_config_file_save_location();
@@ -14,6 +14,13 @@ pub enum BackendError {
    NoServiceProviderSet,
    #[error("No gateway provider set")]
    NoGatewaySet,
+    #[error("{source}")]
+    ReqwestError {
+        #[from]
+        source: reqwest::Error,
+    },
+    #[error("Initialization failed with a panic")]
+    InitializationPanic,
 }

 impl Serialize for BackendError {
@@ -19,6 +19,7 @@ mod menu;
 mod models;
 mod operations;
 mod state;
+mod tasks;
 mod window;

 fn main() {
@@ -35,6 +36,7 @@ fn main() {
        .manage(Arc::new(RwLock::new(State::new())))
        .invoke_handler(tauri::generate_handler![
            crate::config::get_config_file_location,
+            crate::config::get_config_id,
            crate::operations::connection::connect::get_gateway,
            crate::operations::connection::connect::get_service_provider,
            crate::operations::connection::connect::set_gateway,
@@ -42,6 +44,7 @@ fn main() {
            crate::operations::connection::connect::start_connecting,
            crate::operations::connection::disconnect::start_disconnecting,
            crate::operations::window::hide_window,
+            crate::operations::directory::get_services,
        ])
        .menu(Menu::new().add_default_app_submenu_if_macos())
        .system_tray(create_tray_menu())
@@ -61,5 +64,10 @@ fn setup_logging() {

    log_builder
        .filter_module("handlebars", log::LevelFilter::Warn)
+        .filter_module("mio", log::LevelFilter::Warn)
+        .filter_module("sled", log::LevelFilter::Warn)
+        .filter_module("tokio_tungstenite", log::LevelFilter::Warn)
+        .filter_module("tungstenite", log::LevelFilter::Warn)
+        .filter_module("want", log::LevelFilter::Warn)
        .init();
 }
@@ -1,20 +1,20 @@
 use serde::{Deserialize, Serialize};

 #[cfg_attr(test, derive(ts_rs::TS))]
-#[derive(Serialize, Deserialize, Clone, PartialEq, Debug)]
+#[derive(Serialize, Deserialize, Clone, PartialEq, Eq, Debug)]
 pub struct ConnectResult {
    pub address: String,
 }

 #[cfg_attr(test, derive(ts_rs::TS))]
-#[derive(Serialize, Deserialize, Clone, PartialEq, Debug)]
+#[derive(Serialize, Deserialize, Clone, PartialEq, Eq, Debug)]
 pub struct DisconnectResult {
    pub success: bool,
 }

 #[cfg_attr(test, derive(ts_rs::TS))]
 #[cfg_attr(test, ts(rename_all = "lowercase"))]
-#[derive(Serialize, Deserialize, Clone, PartialEq, Debug)]
+#[derive(Serialize, Deserialize, Clone, PartialEq, Eq, Debug)]
 #[serde(rename_all = "camelCase")]
 pub enum ConnectionStatusKind {
    Disconnected,
@@ -30,3 +30,23 @@ pub const APP_EVENT_CONNECTION_STATUS_CHANGED: &str = "app:connection-status-cha
 pub struct AppEventConnectionStatusChangedPayload {
    pub status: ConnectionStatusKind,
 }
+
+#[cfg_attr(test, derive(ts_rs::TS))]
+#[derive(Clone, serde::Serialize, serde::Deserialize)]
+pub struct DirectoryService {
+    pub id: String,
+    pub description: String,
+    pub items: Vec<DirectoryServiceProvider>,
+}
+
+#[cfg_attr(test, derive(ts_rs::TS))]
+#[derive(Clone, serde::Serialize, serde::Deserialize)]
+pub struct DirectoryServiceProvider {
+    pub id: String,
+    pub description: String,
+    /// Address of the network requester in the form "<gateway_id>.<service_provider_id>"
+    /// e.g. DpB3cHAchJiNBQi5FrZx2csXb1mrHkpYh9Wzf8Rjsuko.ANNWrvHqMYuertHGHUrZdBntQhpzfbWekB39qez9U2Vx@2BuMSfMW3zpeAjKXyKLhmY4QW1DXurrtSPEJ6CjX3SEh
+    pub address: String,
+    /// Address of the gateway, e.g. 2BuMSfMW3zpeAjKXyKLhmY4QW1DXurrtSPEJ6CjX3SEh
+    pub gateway: String,
+}
@@ -1,6 +1,4 @@
-use crate::error::BackendError;
-use crate::models::ConnectResult;
-use crate::State;
+use crate::{error::BackendError, models::ConnectResult, tasks::start_disconnect_listener, State};
 use std::sync::Arc;
 use tokio::sync::RwLock;

@@ -9,9 +7,18 @@ pub async fn start_connecting(
    state: tauri::State<'_, Arc<RwLock<State>>>,
    window: tauri::Window<tauri::Wry>,
 ) -> Result<ConnectResult, BackendError> {
-    let mut guard = state.write().await;
+    let status_receiver = {
+        let mut guard = state.write().await;

-    guard.start_connecting(&window).await;
+        log::trace!("Start connecting with:");
+        log::trace!("  service_provider: {:?}", guard.get_service_provider());
+        log::trace!("  gateway: {:?}", guard.get_gateway());
+        guard.start_connecting(&window).await?
+    };
+
+    // Setup task for checking status
+    let state = state.inner().clone();
+    start_disconnect_listener(state, window, status_receiver);

    Ok(ConnectResult {
        // WIP(JON): fixme
@@ -35,6 +42,7 @@ pub async fn set_service_provider(
    service_provider: String,
    state: tauri::State<'_, Arc<RwLock<State>>>,
 ) -> Result<(), BackendError> {
+    log::trace!("Setting service_provider: {service_provider}");
    let mut guard = state.write().await;
    guard.set_service_provider(service_provider);
    Ok(())
@@ -56,6 +64,7 @@ pub async fn set_gateway(
    gateway: String,
    state: tauri::State<'_, Arc<RwLock<State>>>,
 ) -> Result<(), BackendError> {
+    log::trace!("Setting gateway: {gateway}");
    let mut guard = state.write().await;
    guard.set_gateway(gateway);
    Ok(())
@@ -0,0 +1,14 @@
+use crate::error::BackendError;
+use crate::models::DirectoryService;
+
+static SERVICE_PROVIDER_WELLKNOWN_URL: &str =
+    "https://nymtech.net/.wellknown/connect/service-providers.json";
+
+#[tauri::command]
+pub async fn get_services() -> Result<Vec<DirectoryService>, BackendError> {
+    let res = reqwest::get(SERVICE_PROVIDER_WELLKNOWN_URL)
+        .await?
+        .json::<Vec<DirectoryService>>()
+        .await?;
+    Ok(res)
+}
@@ -1,2 +1,3 @@
 pub mod connection;
+pub mod directory;
 pub mod window;
@@ -1,19 +1,19 @@
-use client_core::config::GatewayEndpoint;
-use futures::channel::mpsc;
-use futures::SinkExt;
-use log::info;
+use std::time::Duration;
+
+use futures::SinkExt;
+use tauri::Manager;

-use config::NymConfig;
-#[cfg(not(feature = "coconut"))]
-use nym_socks5::client::NymClient as Socks5NymClient;
 use nym_socks5::client::{Socks5ControlMessage, Socks5ControlMessageSender};

-use crate::config::SOCKS5_CONFIG_ID;
-use crate::models::{
-    AppEventConnectionStatusChangedPayload, ConnectionStatusKind,
-    APP_EVENT_CONNECTION_STATUS_CHANGED,
+use crate::{
+    config::append_config_id,
+    error::BackendError,
+    models::{
+        AppEventConnectionStatusChangedPayload, ConnectionStatusKind,
+        APP_EVENT_CONNECTION_STATUS_CHANGED,
+    },
+    tasks::{start_nym_socks5_client, StatusReceiver},
 };
-use tauri::Manager;

 pub struct State {
    status: ConnectionStatusKind,
@@ -63,29 +63,56 @@ impl State {
        self.gateway = Some(gateway);
    }

-    pub async fn init_config(&self) {
-        crate::config::Config::init(self.service_provider.as_ref(), self.gateway.as_ref()).await;
+    pub async fn init_config(&self) -> Result<(), BackendError> {
+        let service_provider = self
+            .service_provider
+            .as_ref()
+            .expect("Attempting to init without service provider");
+        let gateway = self
+            .gateway
+            .as_ref()
+            .expect("Attempting to init without gateway");
+        crate::config::Config::init(service_provider, gateway).await
    }

-    pub async fn start_connecting(&mut self, window: &tauri::Window<tauri::Wry>) {
-        info!("Connecting");
+    pub async fn start_connecting(
+        &mut self,
+        window: &tauri::Window<tauri::Wry>,
+    ) -> Result<StatusReceiver, BackendError> {
+        log::info!("Connecting");
        self.set_state(ConnectionStatusKind::Connecting, window);
        self.status = ConnectionStatusKind::Connecting;

        // Setup configuration by writing to file
-        self.init_config().await;
+        if let Err(err) = self.init_config().await {
+            log::warn!("Failed to initialize: {}", err);

-        // Kick of the main task and get the channel for controlling it
-        let (sender, used_gateway) = start_nym_socks5_client();
+            // Wait a little to give the user some rudimentary feedback that the click actually
+            // registered.
+            tokio::time::sleep(Duration::from_secs(1)).await;
+            self.set_state(ConnectionStatusKind::Disconnected, window);
+            self.status = ConnectionStatusKind::Disconnected;
+            return Err(err);
+        }
+
+        // Kick off the main task and get the channel for controlling it
+        let id = append_config_id(
+            self.gateway
+                .as_ref()
+                .expect("Attempting to start without gateway"),
+        );
+        let (sender, used_gateway, status_receiver) = start_nym_socks5_client(&id);
        self.gateway = Some(used_gateway.gateway_id);
        self.socks5_client_sender = Some(sender);

        self.status = ConnectionStatusKind::Connected;
        self.set_state(ConnectionStatusKind::Connected, window);
+
+        Ok(status_receiver)
    }

    pub async fn start_disconnecting(&mut self, window: &tauri::Window<tauri::Wry>) {
-        info!("Disconnecting");
+        log::info!("Disconnecting");
        self.set_state(ConnectionStatusKind::Disconnecting, window);
        self.status = ConnectionStatusKind::Disconnecting;

@@ -93,32 +120,11 @@ impl State {
        if let Some(ref mut sender) = self.socks5_client_sender {
            sender.send(Socks5ControlMessage::Stop).await.unwrap();
        }
+    }

+    pub async fn mark_disconnected(&mut self, window: &tauri::Window<tauri::Wry>) {
+        log::info!("Disconnected");
        self.status = ConnectionStatusKind::Disconnected;
        self.set_state(ConnectionStatusKind::Disconnected, window);
    }
 }
-
-fn start_nym_socks5_client() -> (Socks5ControlMessageSender, GatewayEndpoint) {
-    let id: &str = SOCKS5_CONFIG_ID;
-
-    info!("Loading config from file");
-    let config = nym_socks5::client::config::Config::load_from_file(Some(id)).unwrap();
-    let used_gateway = config.get_base().get_gateway_endpoint().clone();
-
-    let mut socks5_client = Socks5NymClient::new(config);
-    info!("Starting socks5 client");
-
-    let (sender, receiver) = mpsc::unbounded();
-
-    // Spawn a separate runtime for the socks5 client so we can forcefully terminate.
-    // Once we can gracefully shutdown the socks5 client we can get rid of this.
-    std::thread::spawn(|| {
-        let rt = tokio::runtime::Runtime::new().unwrap();
-        rt.block_on(async move {
-            socks5_client.run_and_listen(receiver).await;
-        });
-    });
-
-    (sender, used_gateway)
-}
@@ -0,0 +1,73 @@
+use client_core::config::GatewayEndpoint;
+use futures::channel::mpsc;
+use log::info;
+use std::sync::Arc;
+use tokio::sync::RwLock;
+
+use config::NymConfig;
+#[cfg(not(feature = "coconut"))]
+use nym_socks5::client::NymClient as Socks5NymClient;
+use nym_socks5::client::Socks5ControlMessageSender;
+
+use crate::state::State;
+
+pub type StatusReceiver = futures::channel::oneshot::Receiver<Socks5StatusMessage>;
+
+#[derive(Debug)]
+pub enum Socks5StatusMessage {
+    /// The SOCKS5 task successfully stopped
+    Stopped,
+}
+
+pub fn start_nym_socks5_client(
+    id: &str,
+) -> (Socks5ControlMessageSender, GatewayEndpoint, StatusReceiver) {
+    info!("Loading config from file: {id}");
+    // TODO: handle this gracefully!
+    let config = nym_socks5::client::config::Config::load_from_file(Some(id)).unwrap();
+    let used_gateway = config.get_base().get_gateway_endpoint().clone();
+
+    let mut socks5_client = Socks5NymClient::new(config);
+    info!("Starting socks5 client");
+
+    // Channel to send control messages to the socks5 client
+    let (socks5_ctrl_tx, socks5_ctrl_rx) = mpsc::unbounded();
+
+    // Channel to signal back to the main task when the socks5 client finishes, and why
+    let (socks5_status_tx, socks5_status_rx) = futures::channel::oneshot::channel();
+
+    // Spawn a separate runtime for the socks5 client so we can forcefully terminate.
+    // Once we can gracefully shutdown the socks5 client we can get rid of this.
+    std::thread::spawn(|| {
+        let rt = tokio::runtime::Runtime::new().unwrap();
+        rt.block_on(async move {
+            socks5_client.run_and_listen(socks5_ctrl_rx).await;
+        });
+
+        log::info!("SOCKS5 task finished");
+        socks5_status_tx.send(Socks5StatusMessage::Stopped).unwrap();
+    });
+
+    (socks5_ctrl_tx, used_gateway, socks5_status_rx)
+}
+
+pub fn start_disconnect_listener(
+    state: Arc<RwLock<State>>,
+    window: tauri::Window<tauri::Wry>,
+    status_receiver: StatusReceiver,
+) {
+    log::trace!("Starting disconnect listener");
+    tokio::spawn(async move {
+        match status_receiver.await {
+            Ok(Socks5StatusMessage::Stopped) => {
+                log::info!("SOCKS5 task reported it has finished");
+            }
+            Err(_) => {
+                log::info!("SOCKS5 task appears to have stopped abruptly");
+            }
+        }
+
+        let mut state_w = state.write().await;
+        state_w.mark_disconnected(&window).await;
+    });
+}
@@ -7,6 +7,7 @@ import { ConnectedLayout } from './layouts/ConnectedLayout';
 export const App: React.FC = () => {
  const context = useClientContext();
  const [busy, setBusy] = React.useState<boolean>();
+
  const handleConnectClick = React.useCallback(async () => {
    const oldStatus = context.connectionStatus;
    if (oldStatus === ConnectionStatusKind.connected || oldStatus === ConnectionStatusKind.disconnected) {
@@ -29,7 +30,15 @@ export const App: React.FC = () => {
    context.connectionStatus === ConnectionStatusKind.disconnected ||
    context.connectionStatus === ConnectionStatusKind.connecting
  ) {
-    return <DefaultLayout status={context.connectionStatus} busy={busy} onConnectClick={handleConnectClick} />;
+    return (
+      <DefaultLayout
+        status={context.connectionStatus}
+        busy={busy}
+        onConnectClick={handleConnectClick}
+        services={context.services}
+        onServiceProviderChange={context.setServiceProvider}
+      />
+    );
  }

  return (
@@ -40,6 +49,7 @@ export const App: React.FC = () => {
      ipAddress="127.0.0.1"
      port={1080}
      connectedSince={context.connectedSince}
+      serviceProvider={context.serviceProvider}
      stats={[
        {
          label: 'in:',
@@ -1,6 +1,5 @@
 import React from 'react';
 import { Box } from '@mui/material';
-import { invoke } from '@tauri-apps/api/tauri';

 export const AppWindowFrame: React.FC = ({ children }) => (
  <Box
@@ -14,11 +13,10 @@ export const AppWindowFrame: React.FC = ({ children }) => (
    }}
  >
    <Box display="flex" justifyContent="space-between" alignItems="center">
-      <svg width="22" height="6" viewBox="0 0 22 6" fill="none" xmlns="http://www.w3.org/2000/svg">
-        <path
-          d="M6.86777 6H5.35495L1.22609 1.32517V6H0V0H1.54986L5.67872 4.67354V0H6.86777V6ZM20.4496 0L18.5658 2.13277L16.6821 0H15.1322V6H16.3578V1.32517L18.2959 3.52046C18.4457 3.68998 18.6865 3.68998 18.8363 3.52046L20.7745 1.32517V6H22V0H20.4496ZM10.4063 3.13181V6H11.6318V3.13181L14.4527 0H12.9028L11.018 2.13277L9.13421 0H7.58435L10.4063 3.13181Z"
-          fill="#F2F2F2"
-        />
+      <svg width="22" height="6" viewBox="0 0 210 56" fill="#F2F2F2" xmlns="http://www.w3.org/2000/svg">
+        <path d="M45.8829 0.142822H45.7169V0.28114V48.637L25.3289 0.225818L25.3012 0.142822H25.1905H13.6272H0.652966H0.514648V0.28114V55.7189V55.8572H0.652966H13.6272H13.7655V55.7189V7.28002L34.2365 55.7742L34.2642 55.8572H34.3748H45.8829H58.8294H58.9677V55.7189V0.28114V0.142822H58.8294H45.8829Z" />
+        <path d="M209.347 0.142822H184.616H184.477L184.45 0.253483L171.78 48.8583L159.082 0.253483L159.054 0.142822H158.944H134.157H133.991V0.28114V55.7189V55.8572H134.157H147.104H147.242V55.7189V7.66731L159.774 55.7466L159.801 55.8572H159.94H183.564H183.675L183.703 55.7466L196.234 7.66731V55.7189V55.8572H196.373H209.347H209.485V55.7189V0.28114V0.142822H209.347Z" />
+        <path d="M112.663 0.142822H112.58L112.552 0.198153L96.8116 27.5574L80.988 0.198153L80.9604 0.142822H80.8774H65.9114H65.6348L65.7731 0.364136L90.1447 42.5787V55.7189V55.8572H90.283H103.257H103.396V55.7189V42.5787L127.767 0.364136L127.905 0.142822H127.629H112.663Z" />
      </svg>
    </Box>
    {children}
@@ -3,17 +3,21 @@ import { ConnectionStatusKind } from '../types';

 export const ConnectionButton: React.FC<{
  status: ConnectionStatusKind;
+  disabled?: boolean;
  busy?: boolean;
  isError?: boolean;
  onClick?: (status: ConnectionStatusKind) => void;
-}> = ({ status, isError, onClick, busy }) => {
+}> = ({ status, disabled, isError, onClick, busy }) => {
  const [hover, setHover] = React.useState<boolean>(false);

  const handleClick = React.useCallback(() => {
+    if (disabled === true) {
+      return;
+    }
    if (onClick) {
      onClick(status);
    }
-  }, [status]);
+  }, [status, disabled]);

  const statusText = getStatusText(status, hover);
  const statusTextColor = isError ? '#40475C' : '#FFF';
@@ -21,16 +25,17 @@ export const ConnectionButton: React.FC<{

  return (
    <svg
+      opacity={disabled ? 0.75 : 1}
      width="208"
      height="208"
      viewBox="0 0 208 208"
      fill="none"
      xmlns="http://www.w3.org/2000/svg"
-      onMouseEnter={() => setHover(true)}
-      onMouseLeave={() => setHover(false)}
+      onMouseEnter={() => !disabled && setHover(true)}
+      onMouseLeave={() => !disabled && setHover(false)}
    >
      <g transform="translate(-46 -46)">
-        <g onClick={handleClick} style={{ cursor: 'pointer' }}>
+        <g onClick={handleClick} style={{ cursor: disabled ? 'not-allowed' : 'pointer' }}>
          <g filter="url(#filter0_f_2_303)">
            <circle cx="150" cy="150" r="70" fill="#3B445F" />
          </g>
@@ -4,6 +4,7 @@ import CheckCircleOutlineIcon from '@mui/icons-material/CheckCircleOutline';
 import CircleOutlinedIcon from '@mui/icons-material/CircleOutlined';
 import { DateTime } from 'luxon';
 import { ConnectionStatusKind } from '../types';
+import { ServiceProvider } from '../types/directory';

 const FONT_SIZE = '16px';
 const FONT_WEIGHT = '600';
@@ -57,7 +58,8 @@ const ConnectionStatusContent: React.FC<{
 export const ConnectionStatus: React.FC<{
  status: ConnectionStatusKind;
  connectedSince?: DateTime;
-}> = ({ status, connectedSince }) => {
+  serviceProvider?: ServiceProvider;
+}> = ({ status, connectedSince, serviceProvider }) => {
  const color =
    status === ConnectionStatusKind.connected || status === ConnectionStatusKind.disconnecting ? '#21D072' : '#888';
  const [duration, setDuration] = React.useState<string>();
@@ -72,13 +74,16 @@ export const ConnectionStatus: React.FC<{
    };
  }, [status, connectedSince]);
  return (
-    <Box display="flex" justifyContent="space-between">
-      <Box color={color} fontSize={FONT_SIZE} display="flex" alignItems="center">
-        <ConnectionStatusContent status={status} />
+    <>
+      <Box display="flex" justifyContent="space-between">
+        <Box color={color} fontSize={FONT_SIZE} display="flex" alignItems="center">
+          <ConnectionStatusContent status={status} />
+        </Box>
+        <Typography color={color} fontWeight={FONT_WEIGHT} fontStyle={FONT_STYLE}>
+          {status === ConnectionStatusKind.connected && duration}
+        </Typography>
      </Box>
-      <Typography color={color} fontWeight={FONT_WEIGHT} fontStyle={FONT_STYLE}>
-        {status === ConnectionStatusKind.connected && duration}
-      </Typography>
-    </Box>
+      <Box>{serviceProvider && <Typography fontSize={12}>{serviceProvider.description}</Typography>}</Box>
+    </>
  );
 };
@@ -0,0 +1,110 @@
+import React from 'react';
+import IconButton from '@mui/material/IconButton';
+import Menu from '@mui/material/Menu';
+import MenuItem from '@mui/material/MenuItem';
+import ArrowDropDownCircleIcon from '@mui/icons-material/ArrowDropDownCircle';
+import { Box, CircularProgress, Stack, Tooltip, Typography } from '@mui/material';
+import { ServiceProvider, Services } from '../types/directory';
+
+export const ServiceProviderSelector: React.FC<{
+  onChange?: (serviceProvider: ServiceProvider) => void;
+  services?: Services;
+}> = ({ services, onChange }) => {
+  const [serviceProvider, setServiceProvider] = React.useState<ServiceProvider | undefined>();
+  const textEl = React.useRef<null | HTMLElement>(null);
+  const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
+  const open = Boolean(anchorEl);
+  const handleClick = () => {
+    setAnchorEl(textEl.current);
+  };
+  const handleClose = (newServiceProvider?: ServiceProvider) => {
+    if (newServiceProvider) {
+      setServiceProvider(newServiceProvider);
+      onChange?.(newServiceProvider);
+    }
+    setAnchorEl(null);
+  };
+
+  if (!services) {
+    return (
+      <Box display="flex" alignItems="center" justifyContent="space-between" sx={{ mt: 3 }}>
+        <Typography fontSize={14} fontWeight={700} color={(theme) => theme.palette.common.white}>
+          <CircularProgress size={14} sx={{ mr: 1 }} color="inherit" />
+          Loading services...
+        </Typography>
+        <IconButton id="service-provider-button" disabled>
+          <ArrowDropDownCircleIcon />
+        </IconButton>
+      </Box>
+    );
+  }
+
+  return (
+    <>
+      <Box display="flex" alignItems="center" justifyContent="space-between" sx={{ mt: 3 }}>
+        <Typography
+          ref={textEl}
+          fontSize={14}
+          fontWeight={700}
+          color={(theme) => (serviceProvider ? undefined : theme.palette.primary.main)}
+        >
+          {serviceProvider ? serviceProvider.description : 'Select a service'}
+        </Typography>
+        <IconButton
+          id="service-provider-button"
+          aria-controls={open ? 'basic-menu' : undefined}
+          aria-haspopup="true"
+          aria-expanded={open ? 'true' : undefined}
+          onClick={handleClick}
+        >
+          <ArrowDropDownCircleIcon />
+        </IconButton>
+      </Box>
+      <Menu
+        id="service-provider-menu"
+        anchorEl={anchorEl}
+        open={open}
+        onClose={() => handleClose()}
+        MenuListProps={{
+          'aria-labelledby': 'service-provider-button',
+        }}
+      >
+        {services.map((service) => (
+          <>
+            <MenuItem disabled dense sx={{ fontSize: 'small', fontWeight: 'bold', mb: -1 }}>
+              {service.description}
+            </MenuItem>
+            {service.items.map((sp) => (
+              <MenuItem dense sx={{ fontSize: 'small', ml: 2, height: 'auto' }} onClick={() => handleClose(sp)}>
+                <Tooltip
+                  title={
+                    <Stack direction="column">
+                      <Typography fontSize="inherit">
+                        <code>{sp.id}</code>
+                      </Typography>
+                      <Typography fontSize="inherit" fontWeight={700}>
+                        {sp.description}
+                      </Typography>
+                      <Typography fontSize="inherit">
+                        Gateway <code>{sp.gateway.slice(0, 10)}...</code>
+                      </Typography>
+                      <Typography fontSize="inherit">
+                        Provider <code>{sp.address.slice(0, 10)}...</code>
+                      </Typography>
+                    </Stack>
+                  }
+                  arrow
+                  placement="top"
+                >
+                  <Typography fontSize="inherit" noWrap>
+                    {sp.description}
+                  </Typography>
+                </Tooltip>
+              </MenuItem>
+            ))}
+          </>
+        ))}
+      </Menu>
+    </>
+  );
+};
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
pierre	0f795feaef	feat(wallet): add generic dialog component	2022-07-04 19:45:36 +02:00
pierre	8f18af232d	feat(wallet): add generic dialog component	2022-07-04 19:35:56 +02:00
pierre	be6172d622	feat(wallet): add generic dialog component	2022-07-04 19:33:02 +02:00
pierre	2e7d773128	feat(wallet): add generic dialog component	2022-07-04 19:25:03 +02:00
Jon Häggblad	06b823f4c1	connect: catch panics during init	2022-07-04 17:19:41 +02:00
Jon Häggblad	1c0ce9a420	Merge pull request #1429 from nymtech/jon/feat/nym-connect-disconnect-signalling nym-connect: disconnect signalling	2022-07-04 16:46:37 +02:00
Jon Häggblad	dede8899cf	cargo: exclude nym-connect from top-level workspace	2022-07-04 15:51:09 +02:00
Jon Häggblad	70f6059ceb	connect: handle disconnect signalling	2022-07-04 15:51:09 +02:00
Jon Häggblad	fefd2dd267	Merge pull request #1427 from nymtech/feature/nym-connect-directory nym-connect: add ability to select service provider and gateway	2022-07-04 15:50:17 +02:00
Jon Häggblad	0fbe77d934	connect: clippy	2022-07-04 15:23:14 +02:00
Tommy Verrall	8a267cfe3d	Merge pull request #1426 from nymtech/tommy/add-placeholder-qa Add placeholders to service	2022-07-04 14:10:06 +01:00
Jon Häggblad	5ebb2a3efe	changelog: add note	2022-07-04 15:06:23 +02:00
Jon Häggblad	de605dc3b9	connect: append gateway to id	2022-07-04 15:00:31 +02:00
Mark Sinclair	6a01edf5fe	Nym Connect: fetch list of services from wellknown location and let the user choose	2022-07-04 15:00:31 +02:00
tommy	806b37bd83	Add placeholders to service Update the all.rs to allow all envs Placing placeholder addresses only	2022-07-04 13:40:22 +02:00
Jędrzej Stuczyński	ffff596d45	Removed redundant lock file on explorer api (#1424 )	2022-07-04 09:47:38 +01:00
dependabot[bot]	ad826da782	build(deps): bump got from 11.8.2 to 11.8.5 in /nym-wallet/webdriver (#1394 ) Bumps [got](https://github.com/sindresorhus/got) from 11.8.2 to 11.8.5. - [Release notes](https://github.com/sindresorhus/got/releases) - [Commits](https://github.com/sindresorhus/got/compare/v11.8.2...v11.8.5) --- updated-dependencies: - dependency-name: got dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-07-04 09:45:31 +01:00
dependabot[bot]	3414eeea7a	build(deps): bump protobufjs from 6.10.2 to 6.10.3 in /clients/validator (#1407 ) Bumps [protobufjs](https://github.com/protobufjs/protobuf.js) from 6.10.2 to 6.10.3. - [Release notes](https://github.com/protobufjs/protobuf.js/releases) - [Changelog](https://github.com/protobufjs/protobuf.js/blob/master/CHANGELOG.md) - [Commits](https://github.com/protobufjs/protobuf.js/commits) --- updated-dependencies: - dependency-name: protobufjs dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-07-04 09:45:10 +01:00
dependabot[bot]	3a32d34fb4	build(deps): bump protobufjs (#1408 ) Bumps [protobufjs](https://github.com/protobufjs/protobuf.js) from 6.10.2 to 6.10.3. - [Release notes](https://github.com/protobufjs/protobuf.js/releases) - [Changelog](https://github.com/protobufjs/protobuf.js/blob/master/CHANGELOG.md) - [Commits](https://github.com/protobufjs/protobuf.js/commits) --- updated-dependencies: - dependency-name: protobufjs dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-07-04 09:45:04 +01:00
dependabot[bot]	248052aec7	build(deps): bump protobufjs from 6.10.2 to 6.10.3 in /testnet-faucet (#1409 ) Bumps [protobufjs](https://github.com/protobufjs/protobuf.js) from 6.10.2 to 6.10.3. - [Release notes](https://github.com/protobufjs/protobuf.js/releases) - [Changelog](https://github.com/protobufjs/protobuf.js/blob/master/CHANGELOG.md) - [Commits](https://github.com/protobufjs/protobuf.js/commits) --- updated-dependencies: - dependency-name: protobufjs dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-07-04 09:44:58 +01:00
dependabot[bot]	90c00fc343	build(deps): bump protobufjs from 6.10.2 to 6.10.3 (#1410 ) Bumps [protobufjs](https://github.com/protobufjs/protobuf.js) from 6.10.2 to 6.10.3. - [Release notes](https://github.com/protobufjs/protobuf.js/releases) - [Changelog](https://github.com/protobufjs/protobuf.js/blob/master/CHANGELOG.md) - [Commits](https://github.com/protobufjs/protobuf.js/commits) --- updated-dependencies: - dependency-name: protobufjs dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-07-04 09:44:51 +01:00
Tommy Verrall	7bdfbfdcc5	Merge pull request #1384 from Tonycrypto44/Tonycrypto44-patch-1 Update README.md	2022-07-04 09:15:06 +01:00
Jon Häggblad	44e22b74a5	all: fix more clippy::derive-partial-eq-without-eq (#1423 )	2022-07-03 23:37:25 +02:00
Jon Häggblad	7920c27648	nym-connect: Cargo.lock (#1422 )	2022-07-03 19:34:13 +02:00
Jon Häggblad	be733fab5a	contracts: comment out failing tests (#1418 ) Comment out 3 failing tests. These have been failing for some time (forever?), and were beind `ignore` flags. However recently we've started using `ignore` for slow tests per the suggestion in the Rust book, so we can't have failing ignored tests anymore.	2022-06-29 20:50:11 +02:00
Jon Häggblad	1fc3c2b792	all: fix clippy on beta toolchain (#1420 ) * all: fix clippy::derive-partial-eq-without-eq * all: fix clippy::let-and-return * all: fix clippy::unnecessary-to-owned * all: fix clippy::needless-return	2022-06-29 20:49:29 +02:00
Jon Häggblad	f09b984b20	mixnode: handle SIGTERM (#1417 ) * all: cargo upgrade dirs --workspace * mixnode: remove unused serial dependency * mixnode: handle SIGTERM and SIGQUIT on unix * mixnode: some clippy warnings * changelog: add note	2022-06-29 16:47:03 +02:00
Tonycrypto44	f02f914ae2	Update README.md	2022-06-19 19:10:27 -04:00