domain fronting on the run part

ugly first try at domain fronting
2024-07-18 14:37:12 +02:00 · 2024-07-16 15:11:48 +02:00
354 changed files with 6417 additions and 7684 deletions
@@ -41,8 +41,8 @@ jobs:
 # This is a workaround replacement which builds on the last working commit b332a6b55668f60988e36961f3f62a794ba82ddb and then on current branch
      - name: Save current branch to ~/current_branch
        run: git rev-parse --abbrev-ref HEAD > ~/current_branch
-      - name: Git pull, reset & switch to b332a6b55668f60988e36961f3f62a794ba82ddb
-        run: git pull && git reset --hard && git checkout b332a6b55668f60988e36961f3f62a794ba82ddb
+      - name: Git pull & switch to b332a6b55668f60988e36961f3f62a794ba82ddb
+        run: git pull && git checkout b332a6b55668f60988e36961f3f62a794ba82ddb
      - name: Build all projects in documentation/ & move to ~/dist/docs/ from b332a6b55668f60988e36961f3f62a794ba82ddb
        run: cd documentation && ./build_all_to_dist.sh

@@ -46,8 +46,8 @@ jobs:
 # This is a workaround replacement which builds on the last working commit b332a6b55668f60988e36961f3f62a794ba82ddb and then on current branch
      - name: Save current branch to ~/current_branch
        run: git rev-parse --abbrev-ref HEAD > ~/current_branch
-      - name: Git pull, reset & switch to b332a6b55668f60988e36961f3f62a794ba82ddb
-        run: git pull && git reset --hard && git checkout b332a6b55668f60988e36961f3f62a794ba82ddb
+      - name: Git pull & switch to b332a6b55668f60988e36961f3f62a794ba82ddb
+        run: git pull && git checkout b332a6b55668f60988e36961f3f62a794ba82ddb
      - name: Build all projects in documentation/ & move to ~/dist/docs/ from b332a6b55668f60988e36961f3f62a794ba82ddb
        run: cd documentation && ./build_all_to_dist.sh

@@ -2100,7 +2100,7 @@ dependencies = [
 "dotenvy",
 "humantime-serde",
 "isocountry",
- "itertools 0.12.1",
+ "itertools 0.10.5",
 "log",
 "maxminddb",
 "nym-bin-common",
@@ -2221,7 +2221,7 @@ dependencies = [
 "atomic 0.6.0",
 "pear",
 "serde",
- "toml 0.8.14",
+ "toml 0.8.12",
 "uncased",
 "version_check",
 ]
@@ -3272,6 +3272,15 @@ dependencies = [
 "either",
 ]

+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -3950,54 +3959,6 @@ dependencies = [
 "tokio",
 ]

-[[package]]
-name = "nym-authenticator"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "bincode",
- "bs58 0.5.1",
- "bytes",
- "clap 4.5.4",
- "fastrand 2.1.0",
- "futures",
- "ipnetwork 0.16.0",
- "log",
- "nym-authenticator-requests",
- "nym-bin-common",
- "nym-client-core",
- "nym-config",
- "nym-crypto",
- "nym-id",
- "nym-network-defaults",
- "nym-sdk",
- "nym-service-providers-common",
- "nym-sphinx",
- "nym-task",
- "nym-types",
- "nym-wireguard",
- "nym-wireguard-types",
- "rand 0.8.5",
- "serde",
- "serde_json",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "url",
-]
-
-[[package]]
-name = "nym-authenticator-requests"
-version = "0.1.0"
-dependencies = [
- "bincode",
- "nym-sphinx",
- "nym-wireguard-types",
- "rand 0.8.5",
- "serde",
-]
-
 [[package]]
 name = "nym-bandwidth-controller"
 version = "0.1.0"
@@ -4321,7 +4282,7 @@ dependencies = [
 "ff",
 "getrandom 0.2.15",
 "group",
- "itertools 0.12.1",
+ "itertools 0.10.5",
 "nym-dkg",
 "nym-pemstore",
 "rand 0.8.5",
@@ -4562,7 +4523,6 @@ dependencies = [
 "ipnetwork 0.16.0",
 "log",
 "nym-api-requests",
- "nym-authenticator",
 "nym-bin-common",
 "nym-config",
 "nym-credentials",
@@ -4577,6 +4537,7 @@ dependencies = [
 "nym-node-http-api",
 "nym-pemstore",
 "nym-sphinx",
+ "nym-statistics-common",
 "nym-task",
 "nym-types",
 "nym-validator-client",
@@ -4672,7 +4633,6 @@ version = "0.1.0"
 dependencies = [
 "async-trait",
 "http 1.1.0",
- "nym-bin-common",
 "reqwest 0.12.4",
 "serde",
 "serde_json",
@@ -4979,6 +4939,7 @@ dependencies = [
 "nym-socks5-proxy-helpers",
 "nym-socks5-requests",
 "nym-sphinx",
+ "nym-statistics-common",
 "nym-task",
 "nym-types",
 "pretty_env_logger",
@@ -4999,6 +4960,23 @@ dependencies = [
 "zeroize",
 ]

+[[package]]
+name = "nym-network-statistics"
+version = "1.1.34"
+dependencies = [
+ "dirs 4.0.0",
+ "log",
+ "nym-bin-common",
+ "nym-statistics-common",
+ "nym-task",
+ "pretty_env_logger",
+ "rocket",
+ "serde",
+ "sqlx",
+ "thiserror",
+ "tokio",
+]
+
 [[package]]
 name = "nym-node"
 version = "1.1.4"
@@ -5013,7 +4991,6 @@ dependencies = [
 "cupid",
 "humantime-serde",
 "ipnetwork 0.16.0",
- "nym-authenticator",
 "nym-bin-common",
 "nym-client-core-config-types",
 "nym-config",
@@ -5037,7 +5014,7 @@ dependencies = [
 "sysinfo 0.30.12",
 "thiserror",
 "tokio",
- "toml 0.8.14",
+ "toml 0.8.12",
 "tracing",
 "url",
 "zeroize",
@@ -5183,7 +5160,7 @@ dependencies = [
 "chacha20poly1305",
 "criterion",
 "curve25519-dalek 4.1.2",
- "fastrand 2.1.0",
+ "fastrand 1.9.0",
 "getrandom 0.2.15",
 "log",
 "rand 0.8.5",
@@ -5283,7 +5260,6 @@ dependencies = [
 "nym-socks5-client-core",
 "nym-sphinx",
 "nym-topology",
- "nym-validator-client",
 "rand 0.8.5",
 "serde",
 "serde_json",
@@ -5529,6 +5505,20 @@ dependencies = [
 "thiserror",
 ]

+[[package]]
+name = "nym-statistics-common"
+version = "1.0.1"
+dependencies = [
+ "async-trait",
+ "log",
+ "reqwest 0.12.4",
+ "serde",
+ "serde_json",
+ "sqlx",
+ "thiserror",
+ "tokio",
+]
+
 [[package]]
 name = "nym-store-cipher"
 version = "0.1.0"
@@ -5603,7 +5593,7 @@ dependencies = [
 "cosmwasm-std",
 "eyre",
 "hmac",
- "itertools 0.12.1",
+ "itertools 0.11.0",
 "log",
 "nym-config",
 "nym-crypto",
@@ -5642,7 +5632,7 @@ dependencies = [
 "eyre",
 "flate2",
 "futures",
- "itertools 0.12.1",
+ "itertools 0.10.5",
 "log",
 "nym-api-requests",
 "nym-coconut",
@@ -7604,9 +7594,9 @@ dependencies = [

 [[package]]
 name = "serde_spanned"
-version = "0.6.6"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
 dependencies = [
 "serde",
 ]
@@ -8626,21 +8616,21 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "0.8.14"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
 dependencies = [
 "serde",
 "serde_spanned",
 "toml_datetime",
- "toml_edit 0.22.14",
+ "toml_edit 0.22.12",
 ]

 [[package]]
 name = "toml_datetime"
-version = "0.6.6"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
 dependencies = [
 "serde",
 ]
@@ -8660,9 +8650,9 @@ dependencies = [

 [[package]]
 name = "toml_edit"
-version = "0.22.14"
+version = "0.22.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
+checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
 dependencies = [
 "indexmap 2.2.6",
 "serde",
@@ -20,7 +20,6 @@ members = [
    "clients/native",
    "clients/native/websocket-requests",
    "clients/socks5",
-    "common/authenticator-requests",
    "common/async-file-watcher",
    "common/bandwidth-controller",
    "common/bin-common",
@@ -77,6 +76,7 @@ members = [
    "common/socks5-client-core",
    "common/socks5/proxy-helpers",
    "common/socks5/requests",
+    "common/statistics",
    "common/store-cipher",
    "common/task",
    "common/topology",
@@ -96,10 +96,10 @@ members = [
    "mixnode",
    "sdk/lib/socks5-listener",
    "sdk/rust/nym-sdk",
-    "service-providers/authenticator",
    "service-providers/common",
    "service-providers/ip-packet-router",
    "service-providers/network-requester",
+    "service-providers/network-statistics",
    "nym-api",
    "nym-browser-extension/storage",
    "nym-api/nym-api-requests",
@@ -127,6 +127,7 @@ default-members = [
    "clients/socks5",
    "gateway",
    "service-providers/network-requester",
+    "service-providers/network-statistics",
    "mixnode",
    "nym-api",
    "tools/nymvisor",
@@ -191,15 +192,12 @@ cupid = "0.6.1"
 curve25519-dalek = "4.1"
 dashmap = "5.5.3"
 defguard_wireguard_rs = "0.4.2"
-digest = "0.10.7"
-dirs = "4.0"
 doc-comment = "0.3"
 dotenvy = "0.15.6"
 ecdsa = "0.16"
 ed25519-dalek = "2.1"
 etherparse = "0.13.0"
 eyre = "0.6.9"
-fastrand = "2.1.0"
 flate2 = "1.0.28"
 futures = "0.3.28"
 generic-array = "0.14.7"
@@ -211,15 +209,14 @@ hex = "0.4.3"
 hex-literal = "0.3.3"
 hkdf = "0.12.3"
 hmac = "0.12.1"
-http = "1"
 httpcodec = "0.2.3"
 humantime = "2.1.0"
 humantime-serde = "1.1.1"
+http = "1"
 hyper = "1.3.1"
 indexed_db_futures = "0.3.0"
 inquire = "0.6.2"
 ip_network = "0.4.1"
-ipnetwork = "0.16"
 isocountry = "0.3.2"
 k256 = "0.13"
 lazy_static = "1.4.0"
@@ -242,7 +239,6 @@ publicsuffix = "2.2.3"
 quote = "1"
 rand = "0.8.5"
 rand-07 = "0.7.3"
-rand_chacha = "0.3"
 rand_chacha_02 = "0.2"
 rand_core = "0.6.3"
 rand_distr = "0.4"
@@ -256,7 +252,6 @@ rocket_cors = "0.6.0"
 rocket_okapi = "0.8.0"
 safer-ffi = "0.1.4"
 schemars = "0.8.1"
-semver = "1.0.23"
 serde = "1.0.152"
 serde_bytes = "0.11.6"
 serde_derive = "1.0"
@@ -264,14 +259,12 @@ serde_json = "1.0.91"
 serde_repr = "0.1"
 serde_with = "3.4.0"
 serde_yaml = "0.9.25"
-sha2 = "0.10.8"
 si-scale = "0.2.2"
 sphinx-packet = "0.1.1"
 sqlx = "0.6.3"
 strum = "0.25"
 subtle-encoding = "0.5"
 syn = "1"
-sysinfo = "0.30.12"
 tap = "1.0.1"
 tar = "0.4.40"
 tempfile = "3.5.0"
@@ -282,7 +275,6 @@ tokio-stream = "0.1.14"
 tokio-test = "0.4.2"
 tokio-tungstenite = { version = "0.20.1" }
 tokio-util = "0.7.10"
-toml = "0.8.14"
 tower = "0.4.13"
 tower-http = "0.5.2"
 tracing = "0.1.37"
@@ -297,7 +289,6 @@ utoipa-swagger-ui = "6.0.0"
 vergen = { version = "=8.3.1", default-features = false }
 walkdir = "2"
 wasm-bindgen-test = "0.3.36"
-x25519-dalek = "2.0.0"
 zeroize = "1.6.0"

 prometheus = { version = "0.13.0" }
@@ -345,7 +336,6 @@ wasm-bindgen = "0.2.92"
 wasm-bindgen-futures = "0.4.39"
 wasmtimer = "0.2.0"
 web-sys = "0.3.69"
-itertools = "0.12.0"


 # Profile settings for individual crates
@@ -7,66 +7,86 @@ SPDX-License-Identifier: Apache-2.0

 The platform is composed of multiple Rust crates. Top-level executable binary crates include:

-* `nym-node` - a tool for running a node within the Nym network. Nym Nodes containing functionality such as `mixnode`, `entry-gateway` and `exit-gateway` are fundamental components of Nym Mixnet architecture. Nym Nodes are ran by decentralised node operators. Read more about `nym-node` in [Operators Guide documentation](https://nymtech.net/operators/nodes/nym-node.html). Network functionality of `nym-node` (labeled with `--mode` flag) can be:
-	- `mixnode` - shuffles [Sphinx](https://github.com/nymtech/sphinx) packets together to provide privacy against network-level attackers.
-	- `gateway` - acts sort of like a mailbox for mixnet messages, which removes the need for direct delivery to potentially offline or firewalled devices. Gateways can be further categorized as `entry-gateway` and `exit-gateway`. The latter has an extra embedded IP packet router and Network requester to route data to the internet.
-* `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-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.
-<!-- coming soon
-* `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").
-->
-
-```ascii
-                      ┌─►mix──┐  mix     mix
-                      │       │
-            Entry     │       │                   Exit
-client ───► Gateway ──┘  mix  │  mix  ┌─►mix ───► Gateway ───► internet
-                              │       │
-                              │       │
-                         mix  └─►mix──┘  mix
-
-```
+* 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, 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.

 [![Build Status](https://img.shields.io/github/actions/workflow/status/nymtech/nym/build.yml?branch=develop&style=for-the-badge&logo=github-actions)](https://github.com/nymtech/nym/actions?query=branch%3Adevelop)


 ### Building

-* Platform build instructions are available on Nym [Operators Guide documentation](https://nymtech.net/operators/binaries/building-nym.html).
-* Wallet build instructions are available on Nym [Technical docs](https://nymtech.net/docs/wallet/desktop-wallet.html).
+Platform build instructions are available on [our docs site](https://nymtech.net/docs/binaries/pre-built-binaries.html).
+Wallet build instructions are also available on [our docs site](https://nymtech.net/docs/wallet/desktop-wallet.html).

 ### Developing

-There's a [`sandbox.env`](https://github.com/nymtech/nym/envs/sandbox.env) file provided which you can rename to `.env` if you want convenient testing environment. Read more about sandbox environment in our [Operators Guide page](https://nymtech.net/operators/sandbox.html).
+There's a `.env.sample-dev` file provided which you can rename to `.env` if you want convenient logging, backtrace, or other environment variables pre-set. The `.env` file is ignored so you don't need to worry about checking it in.

-References for developers:
-
-* [Developers Portal](https://nymtech.net/developers)
-* [Typescript SDKs](https://sdk.nymtech.net/)
-* [Technical Documentation - Nym network overview](https://nymtech.net/docs/)
-* [Release Cycle - git flow](https://nymtech.net/operators/release-cycle.html)
+For Typescript components, please see [ts-packages](./ts-packages).

 ### Developer chat

+> We used to use Keybase for developer chats, but we have since migrated to Matrix and Discord. We no longer check the old **nymtech.friends** Keybase team.
+
 You can chat to us in two places:
 * The #dev channel on [Matrix](https://matrix.to/#/#dev:nymtech.chat)
-* The various developer channels on [Discord](https://nymtech.net/go/discord)
+* The various developer channels on [Discord](https://discord.gg/nym)

-### Tokenomics & Rewards
+### Rewards

-Nym network economic incentives, operator and validator rewards, and scalability of the network are determined according to the principles laid out in the section 6 of [Nym Whitepaper](https://nymtech.net/nym-whitepaper.pdf).
-Initial reward pool is set to 250 million Nym, making the circulating supply 750 million Nym.
+Node, node operator and delegator rewards are determined according to the principles laid out in the section 6 of [Nym Whitepaper](https://nymtech.net/nym-whitepaper.pdf). Below is a TLDR of the variables and formulas involved in calculating the epoch rewards. Initial reward pool is set to 250 million Nym, making the circulating supply 750 million Nym.
+
+|Symbol|Definition|
+|---|---|
+|<img src="https://render.githubusercontent.com/render/math?math=R#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}R#gh-dark-mode-only">|global share of rewards available, starts at 2% of the reward pool.
+|<img src="https://render.githubusercontent.com/render/math?math=R_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}R_{i}#gh-dark-mode-only">|node reward for mixnode `i`.
+|<img src="https://render.githubusercontent.com/render/math?math=\sigma_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\sigma_{i}#gh-dark-mode-only">|ratio of total node stake (node bond + all delegations) to the token circulating supply.
+|<img src="https://render.githubusercontent.com/render/math?math=\lambda_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\lambda_{i}#gh-dark-mode-only">|ratio of stake operator has pledged to their node to the token circulating supply.
+|<img src="https://render.githubusercontent.com/render/math?math=\omega_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\omega_{i}#gh-dark-mode-only">|fraction of total effort undertaken by node `i`, set to `1/k`.
+|<img src="https://render.githubusercontent.com/render/math?math=k#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}k#gh-dark-mode-only">|number of nodes stakeholders are incentivised to create, set by the validators, a matter of governance. Currently determined by the `reward set` size, and set to 720 in testnet Sandbox.
+|<img src="https://render.githubusercontent.com/render/math?math=\alpha#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\alpha#gh-dark-mode-only">|A Sybil attack resistance parameter - the higher this parameter is set, the stronger the reduction in competitiveness for a Sybil attacker.
+|<img src="https://render.githubusercontent.com/render/math?math=PM_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}PM_{i}#gh-dark-mode-only">|declared profit margin of operator `i`, defaults to 10%.
+|<img src="https://render.githubusercontent.com/render/math?math=PF_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}PF_{i}#gh-dark-mode-only">|uptime of node `i`, scaled to 0 - 1, for the rewarding epoch
+|<img src="https://render.githubusercontent.com/render/math?math=PP_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}PP_{i}#gh-dark-mode-only">|cost of operating node `i` for the duration of the rewarding epoch, set to 40 NYMs.
+
+Node reward for node `i` is determined as:
+
+<img src="https://render.githubusercontent.com/render/math?math=R_{i}=PF_{i} \cdot R \cdot (\sigma^'_{i} \cdot \omega_{i} \cdot k %2b \alpha \cdot \lambda^'_{i} \cdot \sigma^'_{i} \cdot k)/(1 %2b \alpha)#gh-light-mode-only">
+<img src="https://render.githubusercontent.com/render/math?math=\color{white}R_{i}=PF_{i} \cdot R \cdot (\sigma^'_{i} \cdot \omega_{i} \cdot k %2b \alpha \cdot \lambda^'_{i} \cdot \sigma^'_{i} \cdot k)/(1 %2b \alpha)#gh-dark-mode-only">
+where:
+
+<img src="https://render.githubusercontent.com/render/math?math=\sigma^'_{i} = min\{\sigma_{i}, 1/k\}#gh-light-mode-only">
+<img src="https://render.githubusercontent.com/render/math?math=\color{white}\sigma^'_{i} = min\{\sigma_{i}, 1/k\}#gh-dark-mode-only">
+
+and
+
+<img src="https://render.githubusercontent.com/render/math?math=\lambda^'_{i} = min\{\lambda_{i}, 1/k\}#gh-light-mode-only">
+<img src="https://render.githubusercontent.com/render/math?math=\color{white}\lambda^'_{i} = min\{\lambda_{i}, 1/k\}#gh-dark-mode-only">
+
+Operator of node `i` is credited with the following amount:
+
+<img src="https://render.githubusercontent.com/render/math?math=min\{PP_{i},R_{i})\} %2b max\{0, (PM_{i} %2b (1 - PM_{i}) \cdot \lambda_{i}/\delta_{i}) \cdot (R_{i} - PP_{i})\}#gh-light-mode-only">
+<img src="https://render.githubusercontent.com/render/math?math=\color{white}min\{PP_{i},R_{i})\} %2b max\{0, (PM_{i} %2b (1 - PM_{i}) \cdot \lambda_{i}/\delta_{i}) \cdot (R_{i} - PP_{i})\}#gh-dark-mode-only">
+
+Delegate with stake `s` receives:
+
+<img src="https://render.githubusercontent.com/render/math?math=max\{0, (1-PM_{i}) \cdot (s^'/\sigma_{i}) \cdot (R_{i} - PP_{i})\}#gh-light-mode-only">
+<img src="https://render.githubusercontent.com/render/math?math=\color{white}max\{0, (1-PM_{i}) \cdot (s^'/\sigma_{i}) \cdot (R_{i} - PP_{i})\}#gh-dark-mode-only">
+
+where `s'` is stake `s` scaled over total token circulating supply.

 ### Licensing and copyright information

 This is a monorepo and components that make up Nym as a system are licensed individually, so for accurate information, please check individual files.

 As a general approach, licensing is as follows this pattern:
-
 - applications and binaries are GPLv3
 - libraries and components are Apache 2.0 or MIT
 - documentation is Apache 2.0 or CC0-1.0

-Nym Node Operators and Validators Temrs and Conditions can be found [here](https://nymtech.net/terms-and-conditions/operators/v1.0.0).
+Again, for accurate information, please check individual files.
@@ -23,7 +23,7 @@ url = { workspace = true }

 bs58 = { workspace = true }
 clap = { workspace = true, features = ["cargo", "derive"] }
-dirs = { workspace = true }
+dirs = "4.0"
 log = { workspace = true } # self explanatory
 rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] } # for config serialization/deserialization
@@ -37,7 +37,7 @@ zeroize = { workspace = true }

 ## internal
 nym-bandwidth-controller = { path = "../../common/bandwidth-controller" }
-nym-bin-common = { path = "../../common/bin-common", features = ["output_format", "clap"] }
+nym-bin-common = { path = "../../common/bin-common", features = ["output_format"] }
 nym-client-core = { path = "../../common/client-core", features = ["fs-surb-storage", "fs-gateways-storage", "cli"] }
 nym-config = { path = "../../common/config" }
 nym-credential-storage = { path = "../../common/credential-storage" }
@@ -106,10 +106,8 @@ impl SocketClient {
        };

        let storage = self.initialise_storage().await?;
-        let user_agent = nym_bin_common::bin_info!().into();

-        let mut base_client = BaseClientBuilder::new(&self.config.base, storage, dkg_query_client)
-            .with_user_agent(user_agent);
+        let mut base_client = BaseClientBuilder::new(&self.config.base, storage, dkg_query_client);

        if let Some(custom_mixnet) = &self.custom_mixnet {
            base_client = base_client.with_stored_topology(custom_mixnet)?;
@@ -22,9 +22,8 @@ impl AsRef<CommonClientAddGatewayArgs> for Args {
 }

 pub(crate) async fn execute(args: Args) -> Result<(), ClientError> {
-    let user_agent = nym_bin_common::bin_info!().into();
    let output = args.output;
-    let res = add_gateway::<CliNativeClient, _>(args, Some(user_agent)).await?;
+    let res = add_gateway::<CliNativeClient, _>(args).await?;

    println!("{}", output.format(&res));
    Ok(())
@@ -73,6 +73,7 @@ impl From<Init> for OverrideConfig {
    fn from(init_config: Init) -> Self {
        OverrideConfig {
            nym_apis: init_config.common_args.nym_apis,
+            fronting_domains: init_config.common_args.fronting_domains,
            disable_socket: init_config.disable_socket,
            port: init_config.port,
            host: init_config.host,
@@ -114,9 +115,8 @@ impl Display for InitResults {
 pub(crate) async fn execute(args: Init) -> Result<(), ClientError> {
    eprintln!("Initialising client...");

-    let user_agent = nym_bin_common::bin_info!().into();
    let output = args.output;
-    let res = initialise_client::<CliNativeClient>(args, Some(user_agent)).await?;
+    let res = initialise_client::<CliNativeClient>(args).await?;

    let init_results = InitResults::new(res);
    println!("{}", output.format(&init_results));
@@ -97,6 +97,7 @@ pub(crate) enum Commands {
 // Configuration that can be overridden.
 pub(crate) struct OverrideConfig {
    nym_apis: Option<Vec<url::Url>>,
+    fronting_domains: Option<Vec<url::Url>>,
    disable_socket: Option<bool>,
    port: Option<u16>,
    host: Option<IpAddr>,
@@ -133,6 +134,10 @@ pub(crate) fn override_config(config: Config, args: OverrideConfig) -> Config {
        .with_base(BaseClientConfig::with_disabled_cover_traffic, args.no_cover)
        .with_optional(Config::with_port, args.port)
        .with_optional(Config::with_host, args.host)
+        .with_optional_ext(
+            BaseClientConfig::with_fronting_domains,
+            args.fronting_domains,
+        )
        .with_optional_custom_env_ext(
            BaseClientConfig::with_custom_nym_apis,
            args.nym_apis,
@@ -36,6 +36,7 @@ impl From<Run> for OverrideConfig {
    fn from(run_config: Run) -> Self {
        OverrideConfig {
            nym_apis: run_config.common_args.nym_apis,
+            fronting_domains: run_config.common_args.fronting_domains,
            disable_socket: run_config.disable_socket,
            port: run_config.port,
            host: run_config.host,
@@ -25,18 +25,17 @@ zeroize = { workspace = true }
 nym-bin-common = { path = "../../common/bin-common", features = ["output_format"] }
 nym-client-core = { path = "../../common/client-core", features = ["fs-surb-storage", "fs-gateways-storage", "cli"] }
 nym-config = { path = "../../common/config" }
-nym-credential-storage = { path = "../../common/credential-storage" }
 nym-credentials = { path = "../../common/credentials" }
 nym-crypto = { path = "../../common/crypto" }
 nym-gateway-requests = { path = "../../gateway/gateway-requests" }
-nym-id = { path = "../../common/nym-id" }
+nym-credential-storage = { path = "../../common/credential-storage" }
 nym-network-defaults = { path = "../../common/network-defaults" }
+nym-sphinx = { path = "../../common/nymsphinx" }
 nym-ordered-buffer = { path = "../../common/socks5/ordered-buffer" }
 nym-pemstore = { path = "../../common/pemstore" }
-nym-socks5-client-core = { path = "../../common/socks5-client-core" }
-nym-sphinx = { path = "../../common/nymsphinx" }
 nym-topology = { path = "../../common/topology" }
-nym-validator-client = { path = "../../common/client-libs/validator-client", features = ["http-client"] }
+nym-socks5-client-core = { path = "../../common/socks5-client-core" }
+nym-id = { path = "../../common/nym-id" }

 [features]
 default = []
@@ -22,9 +22,8 @@ impl AsRef<CommonClientAddGatewayArgs> for Args {
 }

 pub(crate) async fn execute(args: Args) -> Result<(), Socks5ClientError> {
-    let user_agent = nym_bin_common::bin_info!().into();
    let output = args.output;
-    let res = add_gateway::<CliSocks5Client, _>(args, Some(user_agent)).await?;
+    let res = add_gateway::<CliSocks5Client, _>(args).await?;

    println!("{}", output.format(&res));
    Ok(())
@@ -129,9 +129,8 @@ impl Display for InitResults {
 pub(crate) async fn execute(args: Init) -> Result<(), Socks5ClientError> {
    eprintln!("Initialising client...");

-    let user_agent = nym_bin_common::bin_info!().into();
    let output = args.output;
-    let res = initialise_client::<CliSocks5Client>(args, Some(user_agent)).await?;
+    let res = initialise_client::<CliSocks5Client>(args).await?;

    let init_results = InitResults::new(res);
    println!("{}", output.format(&init_results));
@@ -116,13 +116,7 @@ pub(crate) async fn execute(args: Run) -> Result<(), Box<dyn std::error::Error +
    let storage =
        OnDiskPersistent::from_paths(config.storage_paths.common_paths, &config.core.base.debug)
            .await?;
-    let user_agent = nym_bin_common::bin_info!().into();
-    NymClient::new(
-        config.core,
-        storage,
-        user_agent,
-        args.common_args.custom_mixnet,
-    )
-    .run_forever()
-    .await
+    NymClient::new(config.core, storage, args.common_args.custom_mixnet)
+        .run_forever()
+        .await
 }
@@ -1,17 +0,0 @@
-[package]
-name = "nym-authenticator-requests"
-version = "0.1.0"
-authors.workspace = true
-repository.workspace = true
-homepage.workspace = true
-documentation.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[dependencies]
-bincode = { workspace = true }
-rand = { workspace = true }
-serde = { workspace = true, features = ["derive"] }
-
-nym-sphinx = { path = "../nymsphinx" }
-nym-wireguard-types = { path = "../wireguard-types" }
@@ -1,13 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-pub mod v1;
-
-pub const CURRENT_VERSION: u8 = 1;
-
-fn make_bincode_serializer() -> impl bincode::Options {
-    use bincode::Options;
-    bincode::DefaultOptions::new()
-        .with_big_endian()
-        .with_varint_encoding()
-}
@@ -1,7 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-pub mod request;
-pub mod response;
-
-const VERSION: u8 = 1;
@@ -1,70 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use nym_sphinx::addressing::Recipient;
-use nym_wireguard_types::{GatewayClient, InitMessage};
-use serde::{Deserialize, Serialize};
-
-use crate::make_bincode_serializer;
-
-use super::VERSION;
-
-fn generate_random() -> u64 {
-    use rand::RngCore;
-    let mut rng = rand::rngs::OsRng;
-    rng.next_u64()
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct AuthenticatorRequest {
-    pub version: u8,
-    pub data: AuthenticatorRequestData,
-    pub reply_to: Recipient,
-    pub request_id: u64,
-}
-
-impl AuthenticatorRequest {
-    pub fn from_reconstructed_message(
-        message: &nym_sphinx::receiver::ReconstructedMessage,
-    ) -> Result<Self, bincode::Error> {
-        use bincode::Options;
-        make_bincode_serializer().deserialize(&message.message)
-    }
-
-    pub fn new_initial_request(init_message: InitMessage, reply_to: Recipient) -> (Self, u64) {
-        let request_id = generate_random();
-        (
-            Self {
-                version: VERSION,
-                data: AuthenticatorRequestData::Initial(init_message),
-                reply_to,
-                request_id,
-            },
-            request_id,
-        )
-    }
-
-    pub fn new_final_request(gateway_client: GatewayClient, reply_to: Recipient) -> (Self, u64) {
-        let request_id = generate_random();
-        (
-            Self {
-                version: VERSION,
-                data: AuthenticatorRequestData::Final(gateway_client),
-                reply_to,
-                request_id,
-            },
-            request_id,
-        )
-    }
-
-    pub fn to_bytes(&self) -> Result<Vec<u8>, bincode::Error> {
-        use bincode::Options;
-        make_bincode_serializer().serialize(self)
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub enum AuthenticatorRequestData {
-    Initial(InitMessage),
-    Final(GatewayClient),
-}
@@ -1,88 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use nym_sphinx::addressing::Recipient;
-use nym_wireguard_types::registration::RegistrationData;
-use serde::{Deserialize, Serialize};
-
-use crate::make_bincode_serializer;
-
-use super::VERSION;
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct AuthenticatorResponse {
-    pub version: u8,
-    pub data: AuthenticatorResponseData,
-    pub reply_to: Recipient,
-}
-
-impl AuthenticatorResponse {
-    pub fn new_pending_registration_success(
-        registration_data: RegistrationData,
-        request_id: u64,
-        reply_to: Recipient,
-    ) -> Self {
-        Self {
-            version: VERSION,
-            data: AuthenticatorResponseData::PendingRegistration(PendingRegistrationResponse {
-                reply: registration_data,
-                reply_to,
-                request_id,
-            }),
-            reply_to,
-        }
-    }
-
-    pub fn new_registered(reply_to: Recipient, request_id: u64) -> Self {
-        Self {
-            version: VERSION,
-            data: AuthenticatorResponseData::Registered(RegisteredResponse {
-                reply_to,
-                request_id,
-            }),
-            reply_to,
-        }
-    }
-
-    pub fn recipient(&self) -> Recipient {
-        self.reply_to
-    }
-
-    pub fn to_bytes(&self) -> Result<Vec<u8>, bincode::Error> {
-        use bincode::Options;
-        make_bincode_serializer().serialize(self)
-    }
-
-    pub fn from_reconstructed_message(
-        message: &nym_sphinx::receiver::ReconstructedMessage,
-    ) -> Result<Self, bincode::Error> {
-        use bincode::Options;
-        make_bincode_serializer().deserialize(&message.message)
-    }
-
-    pub fn id(&self) -> Option<u64> {
-        match &self.data {
-            AuthenticatorResponseData::PendingRegistration(response) => Some(response.request_id),
-            AuthenticatorResponseData::Registered(response) => Some(response.request_id),
-        }
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub enum AuthenticatorResponseData {
-    PendingRegistration(PendingRegistrationResponse),
-    Registered(RegisteredResponse),
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct PendingRegistrationResponse {
-    pub request_id: u64,
-    pub reply_to: Recipient,
-    pub reply: RegistrationData,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct RegisteredResponse {
-    pub request_id: u64,
-    pub reply_to: Recipient,
-}
@@ -1,13 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-// See other comments for other TaskStatus message enumds about abusing the Error trait when we
-// should have a new trait for TaskStatus messages
-#[derive(Debug, thiserror::Error)]
-pub enum BandwidthStatusMessage {
-    #[error("remaining bandwidth: {0}")]
-    RemainingBandwidth(i64),
-
-    #[error("no bandwidth left")]
-    NoBandwidth,
-}
@@ -14,11 +14,8 @@ use nym_validator_client::coconut::all_coconut_api_clients;
 use nym_validator_client::nym_api::EpochId;
 use nym_validator_client::nyxd::contract_traits::DkgQueryClient;

-pub use event::BandwidthStatusMessage;
-
 pub mod acquire;
 pub mod error;
-mod event;
 mod utils;

 #[derive(Debug)]
@@ -9,9 +9,9 @@ repository = { workspace = true }

 [dependencies]
 const-str = { workspace = true }
-clap = { workspace = true, features = ["derive"], optional = true }
-clap_complete = { workspace = true, optional = true }
-clap_complete_fig = { workspace = true, optional = true }
+clap = { workspace = true, features = ["derive"] }
+clap_complete = { workspace = true }
+clap_complete_fig = { workspace = true }
 log = { workspace = true }
 pretty_env_logger = { workspace = true }
 semver = "0.11"
@@ -34,7 +34,7 @@ vergen = { workspace = true, features = ["build", "git", "gitcl", "rustc", "carg
 [features]
 default = []
 openapi = ["utoipa"]
-output_format = ["serde_json", "dep:clap"]
+output_format = ["serde_json"]
 bin_info_schema = ["schemars"]
 basic_tracing = ["tracing-subscriber"]
 tracing = [
@@ -44,4 +44,3 @@ tracing = [
    "tracing-opentelemetry",
    "opentelemetry",
 ]
-clap = [ "dep:clap", "dep:clap_complete", "dep:clap_complete_fig" ]
@@ -44,10 +44,6 @@ pub struct BinaryBuildInformation {
    /// Provides the cargo debug mode that was used for the build.
    // NOTE: keep the old name cargo_profile instead of cargo_debug for backwards compatibility
    pub cargo_profile: &'static str,
-
-    // VERGEN_CARGO_TARGET_TRIPLE
-    /// Provides the cargo target triple that was used for the build.
-    pub cargo_triple: &'static str,
 }

 impl BinaryBuildInformation {
@@ -70,7 +66,6 @@ impl BinaryBuildInformation {
            rustc_version: env!("VERGEN_RUSTC_SEMVER"),
            rustc_channel: env!("VERGEN_RUSTC_CHANNEL"),
            cargo_profile,
-            cargo_triple: env!("VERGEN_CARGO_TARGET_TRIPLE"),
        }
    }

@@ -100,7 +95,6 @@ impl BinaryBuildInformation {
            rustc_version: env!("VERGEN_RUSTC_SEMVER"),
            rustc_channel: env!("VERGEN_RUSTC_CHANNEL"),
            cargo_profile,
-            cargo_triple: env!("VERGEN_CARGO_TARGET_TRIPLE"),
        }
    }

@@ -115,7 +109,6 @@ impl BinaryBuildInformation {
            rustc_version: self.rustc_version.to_owned(),
            rustc_channel: self.rustc_channel.to_owned(),
            cargo_profile: self.cargo_profile.to_owned(),
-            cargo_triple: self.cargo_triple.to_owned(),
        }
    }

@@ -163,15 +156,6 @@ pub struct BinaryBuildInformationOwned {
    /// Provides the cargo debug mode that was used for the build.
    // NOTE: keep the old name cargo_profile instead of cargo_debug for backwards compatibility
    pub cargo_profile: String,
-
-    // VERGEN_CARGO_TARGET_TRIPLE
-    /// Provides the cargo target triple that was used for the build.
-    #[serde(default = "unknown")]
-    pub cargo_triple: String,
-}
-
-fn unknown() -> String {
-    "unknown".to_string()
 }

 impl Display for BinaryBuildInformationOwned {
@@ -2,11 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0

 pub mod build_information;
+pub mod completions;
 pub mod logging;
 pub mod version_checker;

-#[cfg(feature = "clap")]
-pub mod completions;
-
 #[cfg(feature = "output_format")]
 pub mod output_format;
@@ -10,7 +10,7 @@ license.workspace = true

 [dependencies]
 async-trait = { workspace = true }
-base64 = { workspace = true }
+base64 = "0.21.2"
 bs58 = { workspace = true }
 cfg-if = { workspace = true }
 clap = { workspace = true, optional = true }
@@ -20,7 +20,7 @@ log = { workspace = true }
 rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-sha2 = { workspace = true }
+sha2 = "0.10.6"
 si-scale = { workspace = true }
 tap = { workspace = true }
 thiserror = { workspace = true }
@@ -117,6 +117,11 @@ impl Config {
        self
    }

+    pub fn with_fronting_domains(mut self, fronting_domains: Vec<Url>) -> Self {
+        self.client.fronting_domains = Some(fronting_domains);
+        self
+    }
+
    pub fn set_custom_nym_apis(&mut self, nym_api_urls: Vec<Url>) {
        self.client.nym_api_urls = nym_api_urls;
    }
@@ -289,6 +294,10 @@ impl Config {
    pub fn get_nym_api_endpoints(&self) -> Vec<Url> {
        self.client.nym_api_urls.clone()
    }
+
+    pub fn get_fronting_domains(&self) -> Option<Vec<Url>> {
+        self.client.fronting_domains.clone()
+    }
 }

 #[derive(Debug, Clone, Deserialize, PartialEq, Eq, Serialize)]
@@ -314,6 +323,9 @@ pub struct Client {
    /// Addresses to APIs running on validator from which the client gets the view of the network.
    #[serde(alias = "validator_api_urls")]
    pub nym_api_urls: Vec<Url>,
+
+    /// Domain to use for domain fronting censorship circumvention
+    pub fronting_domains: Option<Vec<Url>>,
 }

 impl Client {
@@ -340,6 +352,7 @@ impl Client {
            disabled_credentials_mode: true,
            nyxd_urls,
            nym_api_urls,
+            fronting_domains: None,
        }
    }

@@ -349,6 +362,7 @@ impl Client {
        disabled_credentials_mode: bool,
        nyxd_urls: Vec<Url>,
        nym_api_urls: Vec<Url>,
+        fronting_domains: Option<Vec<Url>>,
    ) -> Self {
        Client {
            version: version.into(),
@@ -356,6 +370,7 @@ impl Client {
            disabled_credentials_mode,
            nyxd_urls,
            nym_api_urls,
+            fronting_domains,
        }
    }
 }
@@ -95,6 +95,7 @@ impl From<ConfigV5> for Config {
                id: value.client.id,
                disabled_credentials_mode: value.client.disabled_credentials_mode,
                nyxd_urls: value.client.nyxd_urls,
+                fronting_domains: None, //SW need proper migrations if it gets applied
                nym_api_urls: value.client.nym_api_urls,
            },
            debug: DebugConfig {
@@ -16,7 +16,6 @@ use log::info;
 use nym_client_core_gateways_storage::GatewayDetails;
 use nym_crypto::asymmetric::identity;
 use nym_topology::NymTopology;
-use nym_validator_client::UserAgent;
 use std::path::PathBuf;

 #[cfg_attr(feature = "cli", derive(clap::Args))]
@@ -61,10 +60,7 @@ pub struct CommonClientAddGatewayArgs {
    pub custom_mixnet: Option<PathBuf>,
 }

-pub async fn add_gateway<C, A>(
-    args: A,
-    user_agent: Option<UserAgent>,
-) -> Result<GatewayInfo, C::Error>
+pub async fn add_gateway<C, A>(args: A) -> Result<GatewayInfo, C::Error>
 where
    A: AsRef<CommonClientAddGatewayArgs>,
    C: CliClient,
@@ -115,8 +111,7 @@ where
        hardcoded_topology.get_gateways()
    } else {
        let mut rng = rand::thread_rng();
-        crate::init::helpers::current_gateways(&mut rng, &core.client.nym_api_urls, user_agent)
-            .await?
+        crate::init::helpers::current_gateways(&mut rng, &core.client.nym_api_urls, None).await?
    };

    // since we're registering with a brand new gateway,
@@ -16,7 +16,6 @@ use log::info;
 use nym_client_core_gateways_storage::GatewayDetails;
 use nym_crypto::asymmetric::identity;
 use nym_topology::NymTopology;
-use nym_validator_client::UserAgent;
 use rand::rngs::OsRng;
 use std::path::PathBuf;

@@ -71,6 +70,13 @@ pub struct CommonClientInitArgs {
    )]
    pub nym_apis: Option<Vec<url::Url>>,

+    ///Comma separated list of urls to use for domain fronting
+    #[cfg_attr(
+        feature = "cli",
+        clap(long, value_delimiter = ',', requires = "nym_apis", hide = true)
+    )]
+    pub fronting_domains: Option<Vec<url::Url>>,
+
    /// Path to .json file containing custom network specification.
    #[cfg_attr(feature = "cli", clap(long, group = "network", hide = true))]
    pub custom_mixnet: Option<PathBuf>,
@@ -97,7 +103,6 @@ pub struct InitResultsWithConfig<T> {

 pub async fn initialise_client<C>(
    init_args: C::InitArgs,
-    user_agent: Option<UserAgent>,
 ) -> Result<InitResultsWithConfig<C::Config>, C::Error>
 where
    C: InitialisableClient,
@@ -146,6 +151,16 @@ where
            .collect::<Vec<&str>>()
            .join(",")
    );
+    if let Some(fronting_domains) = &core.client.fronting_domains {
+        log::info!(
+            "fronted by : {}",
+            fronting_domains
+                .iter()
+                .map(|url| url.host_str().unwrap_or_default())
+                .collect::<Vec<&str>>()
+                .join(",")
+        );
+    }

    let key_store = OnDiskKeys::new(paths.keys.clone());
    let details_store = setup_fs_gateways_storage(&paths.gateway_registrations).await?;
@@ -165,8 +180,12 @@ where
        hardcoded_topology.get_gateways()
    } else {
        let mut rng = rand::thread_rng();
-        crate::init::helpers::current_gateways(&mut rng, &core.client.nym_api_urls, user_agent)
-            .await?
+        crate::init::helpers::current_gateways(
+            &mut rng,
+            &core.client.nym_api_urls,
+            core.client.fronting_domains.as_ref(),
+        )
+        .await?
    };

    let gateway_setup = GatewaySetup::New {
@@ -35,6 +35,13 @@ pub struct CommonClientRunArgs {
    )]
    pub nym_apis: Option<Vec<url::Url>>,

+    ///Comma separated list of urls to use for domain fronting
+    #[cfg_attr(
+        feature = "cli",
+        clap(long, value_delimiter = ',', requires = "nym_apis", hide = true)
+    )]
+    pub fronting_domains: Option<Vec<url::Url>>,
+
    /// Path to .json file containing custom network specification.
    #[cfg_attr(feature = "cli", clap(long, group = "network", hide = true))]
    pub custom_mixnet: Option<PathBuf>,
@@ -3,6 +3,7 @@

 use super::packet_statistics_control::PacketStatisticsReporter;
 use super::received_buffer::ReceivedBufferMessage;
+use super::topology_control::fronted_api_provider::FrontedApiTopologyProvider;
 use super::topology_control::geo_aware_provider::GeoAwareTopologyProvider;
 use crate::client::base_client::storage::helpers::store_client_keys;
 use crate::client::base_client::storage::MixnetClientStorage;
@@ -53,7 +54,7 @@ use nym_task::connections::{ConnectionCommandReceiver, ConnectionCommandSender,
 use nym_task::{TaskClient, TaskHandle};
 use nym_topology::provider_trait::TopologyProvider;
 use nym_topology::HardcodedTopologyProvider;
-use nym_validator_client::{nyxd::contract_traits::DkgQueryClient, UserAgent};
+use nym_validator_client::nyxd::contract_traits::DkgQueryClient;
 use rand::rngs::OsRng;
 use std::fmt::Debug;
 use std::os::raw::c_int as RawFd;
@@ -184,7 +185,6 @@ pub struct BaseClientBuilder<'a, C, S: MixnetClientStorage> {
    custom_topology_provider: Option<Box<dyn TopologyProvider + Send + Sync>>,
    custom_gateway_transceiver: Option<Box<dyn GatewayTransceiver + Send>>,
    shutdown: Option<TaskClient>,
-    user_agent: Option<UserAgent>,

    setup_method: GatewaySetup,
 }
@@ -208,7 +208,6 @@ where
            custom_topology_provider: None,
            custom_gateway_transceiver: None,
            shutdown: None,
-            user_agent: None,
            setup_method: GatewaySetup::MustLoad { gateway_id: None },
        }
    }
@@ -252,12 +251,6 @@ where
        self
    }

-    #[must_use]
-    pub fn with_user_agent(mut self, user_agent: UserAgent) -> Self {
-        self.user_agent = Some(user_agent);
-        self
-    }
-
    pub fn with_stored_topology<P: AsRef<Path>>(
        mut self,
        file: P,
@@ -475,19 +468,29 @@ where
        custom_provider: Option<Box<dyn TopologyProvider + Send + Sync>>,
        config_topology: config::Topology,
        nym_api_urls: Vec<Url>,
-        user_agent: Option<UserAgent>,
+        fronting_domains: Option<Vec<Url>>,
    ) -> Box<dyn TopologyProvider + Send + Sync> {
        // if no custom provider was ... provided ..., create one using nym-api
        custom_provider.unwrap_or_else(|| match config_topology.topology_structure {
-            config::TopologyStructure::NymApi => Box::new(NymApiTopologyProvider::new(
-                nym_api_provider::Config {
-                    min_mixnode_performance: config_topology.minimum_mixnode_performance,
-                    min_gateway_performance: config_topology.minimum_gateway_performance,
-                },
-                nym_api_urls,
-                env!("CARGO_PKG_VERSION").to_string(),
-                user_agent,
-            )),
+            config::TopologyStructure::NymApi => match fronting_domains {
+                Some(domains) => Box::new(FrontedApiTopologyProvider::new(
+                    nym_api_provider::Config {
+                        min_mixnode_performance: config_topology.minimum_mixnode_performance,
+                        min_gateway_performance: config_topology.minimum_gateway_performance,
+                    },
+                    nym_api_urls,
+                    domains,
+                    env!("CARGO_PKG_VERSION").to_string(),
+                )),
+                None => Box::new(NymApiTopologyProvider::new(
+                    nym_api_provider::Config {
+                        min_mixnode_performance: config_topology.minimum_mixnode_performance,
+                        min_gateway_performance: config_topology.minimum_gateway_performance,
+                    },
+                    nym_api_urls,
+                    env!("CARGO_PKG_VERSION").to_string(),
+                )),
+            },
            config::TopologyStructure::GeoAware(group_by) => {
                Box::new(GeoAwareTopologyProvider::new(
                    nym_api_urls,
@@ -699,7 +702,7 @@ where
            self.custom_topology_provider.take(),
            self.config.debug.topology,
            self.config.get_nym_api_endpoints(),
-            self.user_agent.clone(),
+            self.config.get_fronting_domains(),
        );

        // needs to be started as the first thing to block if required waiting for the gateway
@@ -0,0 +1,147 @@
+// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use async_trait::async_trait;
+use log::{debug, error, warn};
+use nym_topology::provider_trait::TopologyProvider;
+use nym_topology::{NymTopology, NymTopologyError};
+use rand::prelude::SliceRandom;
+use rand::thread_rng;
+use url::Url;
+
+use super::nym_api_provider::Config;
+
+pub(crate) struct FrontedApiTopologyProvider {
+    config: Config,
+
+    validator_client: nym_validator_client::client::NymApiClient,
+    nym_api_urls: Vec<Url>,
+    fronting_domains: Vec<Url>,
+    shuffling: Vec<usize>,
+
+    client_version: String,
+    currently_used_api: usize,
+}
+
+impl FrontedApiTopologyProvider {
+    pub(crate) fn new(
+        config: Config,
+        nym_api_urls: Vec<Url>,
+        fronting_domains: Vec<Url>,
+        client_version: String,
+    ) -> Self {
+        //SW for the PoC, we assume same lenght between fronting domains and api_urls
+        let mut shuffling = (0..nym_api_urls.len()).collect::<Vec<_>>();
+        shuffling.shuffle(&mut thread_rng());
+
+        FrontedApiTopologyProvider {
+            config,
+            validator_client: nym_validator_client::client::NymApiClient::new_fronted(
+                nym_api_urls[shuffling[0]].clone(),
+                fronting_domains[shuffling[0]].clone(),
+            ),
+            nym_api_urls,
+            fronting_domains,
+            shuffling,
+            client_version,
+            currently_used_api: 0,
+        }
+    }
+
+    fn use_next_nym_api(&mut self) {
+        if self.nym_api_urls.len() == 1 {
+            warn!("There's only a single nym API available - it won't be possible to use a different one");
+            return;
+        }
+
+        self.currently_used_api = (self.currently_used_api + 1) % self.nym_api_urls.len();
+        self.validator_client.change_nym_api_with_fronting(
+            self.nym_api_urls[self.shuffling[self.currently_used_api]].clone(),
+            self.fronting_domains[self.shuffling[self.currently_used_api]].clone(),
+        );
+    }
+
+    /// Verifies whether nodes a reasonably distributed among all mix layers.
+    ///
+    /// In ideal world we would have 33% nodes on layer 1, 33% on layer 2 and 33% on layer 3.
+    /// However, this is a rather unrealistic expectation, instead we check whether there exists
+    /// a layer with more than 66% of nodes or with fewer than 15% and if so, we trigger a failure.
+    ///
+    /// # Arguments
+    ///
+    /// * `topology`: active topology constructed from validator api data
+    fn check_layer_distribution(
+        &self,
+        active_topology: &NymTopology,
+    ) -> Result<(), NymTopologyError> {
+        let lower_threshold = 0.15;
+        let upper_threshold = 0.66;
+        active_topology.ensure_even_layer_distribution(lower_threshold, upper_threshold)
+    }
+
+    async fn get_current_compatible_topology(&mut self) -> Option<NymTopology> {
+        let mixnodes = match self
+            .validator_client
+            .get_basic_mixnodes(Some(self.client_version.clone()))
+            .await
+        {
+            Err(err) => {
+                error!("failed to get network mixnodes - {err}");
+                return None;
+            }
+            Ok(mixes) => mixes,
+        };
+
+        let gateways = match self
+            .validator_client
+            .get_basic_gateways(Some(self.client_version.clone()))
+            .await
+        {
+            Err(err) => {
+                error!("failed to get network gateways - {err}");
+                return None;
+            }
+            Ok(gateways) => gateways,
+        };
+
+        debug!(
+            "there are {} mixnodes and {} gateways in total (before performance filtering)",
+            mixnodes.len(),
+            gateways.len()
+        );
+
+        let topology = NymTopology::from_unordered(
+            mixnodes.iter().filter(|m| {
+                m.performance.round_to_integer() >= self.config.min_mixnode_performance
+            }),
+            gateways.iter().filter(|g| {
+                g.performance.round_to_integer() >= self.config.min_gateway_performance
+            }),
+        );
+
+        if let Err(err) = self.check_layer_distribution(&topology) {
+            warn!("The current filtered active topology has extremely skewed layer distribution. It cannot be used: {err}");
+            self.use_next_nym_api();
+            None
+        } else {
+            Some(topology)
+        }
+    }
+}
+
+// hehe, wasm
+#[cfg(not(target_arch = "wasm32"))]
+#[async_trait]
+impl TopologyProvider for FrontedApiTopologyProvider {
+    async fn get_new_topology(&mut self) -> Option<NymTopology> {
+        self.get_current_compatible_topology().await
+    }
+}
+
+#[cfg(target_arch = "wasm32")]
+#[async_trait(?Send)]
+impl TopologyProvider for FrontedApiTopologyProvider {
+    async fn get_new_topology(&mut self) -> Option<NymTopology> {
+        self.get_current_compatible_topology().await
+    }
+}
@@ -17,6 +17,7 @@ use tokio::time::sleep;
 use wasmtimer::tokio::sleep;

 mod accessor;
+pub(crate) mod fronted_api_provider;
 pub mod geo_aware_provider;
 pub(crate) mod nym_api_provider;

@@ -5,7 +5,6 @@ use async_trait::async_trait;
 use log::{debug, error, warn};
 use nym_topology::provider_trait::TopologyProvider;
 use nym_topology::{NymTopology, NymTopologyError};
-use nym_validator_client::UserAgent;
 use rand::prelude::SliceRandom;
 use rand::thread_rng;
 use url::Url;
@@ -40,26 +39,14 @@ pub(crate) struct NymApiTopologyProvider {
 }

 impl NymApiTopologyProvider {
-    pub(crate) fn new(
-        config: Config,
-        mut nym_api_urls: Vec<Url>,
-        client_version: String,
-        user_agent: Option<UserAgent>,
-    ) -> Self {
+    pub(crate) fn new(config: Config, mut nym_api_urls: Vec<Url>, client_version: String) -> Self {
        nym_api_urls.shuffle(&mut thread_rng());

-        let validator_client = if let Some(user_agent) = user_agent {
-            nym_validator_client::client::NymApiClient::new_with_user_agent(
-                nym_api_urls[0].clone(),
-                user_agent,
-            )
-        } else {
-            nym_validator_client::client::NymApiClient::new(nym_api_urls[0].clone())
-        };
-
        NymApiTopologyProvider {
            config,
-            validator_client,
+            validator_client: nym_validator_client::client::NymApiClient::new(
+                nym_api_urls[0].clone(),
+            ),
            nym_api_urls,
            client_version,
            currently_used_api: 0,
@@ -9,7 +9,7 @@ use nym_crypto::asymmetric::identity;
 use nym_gateway_client::GatewayClient;
 use nym_topology::{filter::VersionFilterable, gateway, mix};
 use nym_validator_client::client::IdentityKeyRef;
-use nym_validator_client::UserAgent;
+use rand::seq::IteratorRandom;
 use rand::{seq::SliceRandom, Rng};
 use std::{sync::Arc, time::Duration};
 use tungstenite::Message;
@@ -60,18 +60,29 @@ impl<'a> GatewayWithLatency<'a> {
 pub async fn current_gateways<R: Rng>(
    rng: &mut R,
    nym_apis: &[Url],
-    user_agent: Option<UserAgent>,
+    fronting_domains: Option<&Vec<Url>>,
 ) -> Result<Vec<gateway::Node>, ClientCoreError> {
-    let nym_api = nym_apis
-        .choose(rng)
-        .ok_or(ClientCoreError::ListOfNymApisIsEmpty)?;
-    let client = if let Some(user_agent) = user_agent {
-        nym_validator_client::client::NymApiClient::new_with_user_agent(nym_api.clone(), user_agent)
-    } else {
-        nym_validator_client::client::NymApiClient::new(nym_api.clone())
-    };
+    let client = match fronting_domains {
+        Some(domains) => {
+            let (api_url, fronting_url) = nym_apis
+                .iter()
+                .zip(domains)
+                .choose(rng)
+                .ok_or(ClientCoreError::ListOfNymApisIsEmpty)?;

-    log::debug!("Fetching list of gateways from: {nym_api}");
+            nym_validator_client::client::NymApiClient::new_fronted(
+                api_url.clone(),
+                fronting_url.clone(),
+            )
+        }
+        None => {
+            let nym_api = nym_apis
+                .choose(rng)
+                .ok_or(ClientCoreError::ListOfNymApisIsEmpty)?;
+            nym_validator_client::client::NymApiClient::new(nym_api.clone())
+        }
+    };
+    log::debug!("Fetching list of gateways from: {}", client.api_url());

    let gateways = client.get_cached_described_gateways().await?;
    log::debug!("Found {} gateways", gateways.len());
@@ -11,7 +11,7 @@ use crate::traits::GatewayPacketRouter;
 use crate::{cleanup_socket_message, try_decrypt_binary_message};
 use futures::{SinkExt, StreamExt};
 use log::*;
-use nym_bandwidth_controller::{BandwidthController, BandwidthStatusMessage};
+use nym_bandwidth_controller::BandwidthController;
 use nym_credential_storage::ephemeral_storage::EphemeralStorage as EphemeralCredentialStorage;
 use nym_credential_storage::storage::Storage as CredentialStorage;
 use nym_credentials::CredentialSpendingData;
@@ -105,8 +105,8 @@ pub struct GatewayClient<C, St = EphemeralCredentialStorage> {
    // currently unused (but populated)
    negotiated_protocol: Option<u8>,

-    /// Listen to shutdown messages and send notifications back to the task manager
-    task_client: TaskClient,
+    /// Listen to shutdown messages.
+    shutdown: TaskClient,
 }

 impl<C, St> GatewayClient<C, St> {
@@ -117,7 +117,7 @@ impl<C, St> GatewayClient<C, St> {
        shared_key: Option<Arc<SharedKeys>>,
        packet_router: PacketRouter,
        bandwidth_controller: Option<BandwidthController<C, St>>,
-        task_client: TaskClient,
+        shutdown: TaskClient,
    ) -> Self {
        GatewayClient {
            authenticated: false,
@@ -135,7 +135,7 @@ impl<C, St> GatewayClient<C, St> {
            reconnection_attempts: DEFAULT_RECONNECTION_ATTEMPTS,
            reconnection_backoff: DEFAULT_RECONNECTION_BACKOFF,
            negotiated_protocol: None,
-            task_client,
+            shutdown,
        }
    }

@@ -299,7 +299,7 @@ impl<C, St> GatewayClient<C, St> {

        loop {
            tokio::select! {
-                _ = self.task_client.recv() => {
+                _ = self.shutdown.recv() => {
                    log::trace!("GatewayClient control response: Received shutdown");
                    log::debug!("GatewayClient control response: Exiting");
                    break Err(GatewayClientError::ConnectionClosedGatewayShutdown);
@@ -540,9 +540,6 @@ impl<C, St> GatewayClient<C, St> {
                self.bandwidth_remaining = bandwidth_remaining;
                self.negotiated_protocol = protocol_version;
                log::debug!("authenticated: {status}, bandwidth remaining: {bandwidth_remaining}");
-                self.task_client.send_status_msg(Box::new(
-                    BandwidthStatusMessage::RemainingBandwidth(bandwidth_remaining),
-                ));
                Ok(())
            }
            ServerResponse::Error { message } => Err(GatewayClientError::GatewayError(message)),
@@ -808,7 +805,7 @@ impl<C, St> GatewayClient<C, St> {
                                .as_ref()
                                .expect("no shared key present even though we're authenticated!"),
                        ),
-                        self.task_client.clone(),
+                        self.shutdown.clone(),
                    )
                }
                _ => unreachable!(),
@@ -882,8 +879,8 @@ impl GatewayClient<InitOnly, EphemeralCredentialStorage> {
        // perfectly fine here, because it's not meant to be used
        let (ack_tx, _) = mpsc::unbounded();
        let (mix_tx, _) = mpsc::unbounded();
-        let task_client = TaskClient::dummy();
-        let packet_router = PacketRouter::new(ack_tx, mix_tx, task_client.clone());
+        let shutdown = TaskClient::dummy();
+        let packet_router = PacketRouter::new(ack_tx, mix_tx, shutdown.clone());

        GatewayClient {
            authenticated: false,
@@ -901,7 +898,7 @@ impl GatewayClient<InitOnly, EphemeralCredentialStorage> {
            reconnection_attempts: DEFAULT_RECONNECTION_ATTEMPTS,
            reconnection_backoff: DEFAULT_RECONNECTION_BACKOFF,
            negotiated_protocol: None,
-            task_client,
+            shutdown,
        }
    }

@@ -909,7 +906,7 @@ impl GatewayClient<InitOnly, EphemeralCredentialStorage> {
        self,
        packet_router: PacketRouter,
        bandwidth_controller: Option<BandwidthController<C, St>>,
-        task_client: TaskClient,
+        shutdown: TaskClient,
    ) -> GatewayClient<C, St> {
        // invariants that can't be broken
        // (unless somebody decided to expose some field that wasn't meant to be exposed)
@@ -933,7 +930,7 @@ impl GatewayClient<InitOnly, EphemeralCredentialStorage> {
            reconnection_attempts: self.reconnection_attempts,
            reconnection_backoff: self.reconnection_backoff,
            negotiated_protocol: self.negotiated_protocol,
-            task_client,
+            shutdown,
        }
    }
 }
@@ -54,7 +54,7 @@ cw-controllers = { workspace = true }
 prost = { workspace = true, default-features = false }
 flate2 = { workspace = true }
 sha2 = { version = "0.9.5" }
-itertools = { workspace = true }
+itertools = { version = "0.10" }
 zeroize = { workspace = true, features = ["zeroize_derive"] }
 cosmwasm-std = { workspace = true }

@@ -19,7 +19,6 @@ use nym_api_requests::models::{
    RewardEstimationResponse, StakeSaturationResponse,
 };
 use nym_api_requests::nym_nodes::SkimmedNode;
-use nym_http_api_client::UserAgent;
 use nym_network_defaults::NymNetworkDetails;
 use url::Url;

@@ -259,12 +258,8 @@ impl NymApiClient {
        NymApiClient { nym_api }
    }

-    pub fn new_with_user_agent(api_url: Url, user_agent: UserAgent) -> Self {
-        let nym_api = nym_api::Client::builder::<_, ValidatorClientError>(api_url)
-            .expect("invalid api url")
-            .with_user_agent(user_agent)
-            .build::<ValidatorClientError>()
-            .expect("failed to build nym api client");
+    pub fn new_fronted(api_url: Url, fronting_url: Url) -> Self {
+        let nym_api = nym_api::Client::new_fronted(api_url, fronting_url, None);

        NymApiClient { nym_api }
    }
@@ -277,6 +272,15 @@ impl NymApiClient {
        self.nym_api.change_base_url(new_endpoint);
    }

+    pub fn change_nym_api_with_fronting(
+        &mut self,
+        new_api_endpoint: Url,
+        new_fronting_domain: Url,
+    ) {
+        self.nym_api
+            .change_fronted_url(new_api_endpoint, new_fronting_domain);
+    }
+
    pub async fn get_basic_mixnodes(
        &self,
        semver_compatibility: Option<String>,
@@ -17,7 +17,6 @@ pub use crate::signing::direct_wallet::DirectSecp256k1HdWallet;
 pub use client::NymApiClient;
 pub use client::{Client, CoconutApiClient, Config};
 pub use nym_api_requests::*;
-pub use nym_http_api_client::UserAgent;

 #[cfg(feature = "http-client")]
 pub use cosmrs::rpc::HttpClient as HttpRpcClient;
@@ -3,7 +3,7 @@

 use crate::nyxd::cosmwasm_client::client_traits::CosmWasmClient;
 use crate::nyxd::cosmwasm_client::helpers::{compress_wasm_code, CheckResponse};
-use crate::nyxd::cosmwasm_client::logs::parse_raw_logs;
+use crate::nyxd::cosmwasm_client::logs::{self, parse_raw_logs};
 use crate::nyxd::cosmwasm_client::types::*;
 use crate::nyxd::error::NyxdError;
 use crate::nyxd::fee::{Fee, DEFAULT_SIMULATED_GAS_MULTIPLIER};
@@ -19,7 +19,6 @@ use cosmrs::feegrant::{
 };
 use cosmrs::proto::cosmos::tx::signing::v1beta1::SignMode;
 use cosmrs::staking::{MsgDelegate, MsgUndelegate};
-use cosmrs::tendermint::abci::{Event, EventAttribute};
 use cosmrs::tx::{self, Msg};
 use cosmrs::{cosmwasm, AccountId, Any, Tx};
 use log::debug;
@@ -52,20 +51,6 @@ fn single_unspecified_signer_auth(
    }
    .auth_info(empty_fee())
 }
-// Searches in events for an event of the given event type which contains an
-// attribute for with the given key.
-fn find_attribute<'a>(
-    events: &'a [Event],
-    event_type: &str,
-    attr_key: &str,
-) -> Option<&'a EventAttribute> {
-    events
-        .iter()
-        .find(|attr| attr.kind == event_type)?
-        .attributes
-        .iter()
-        .find(|attr| attr.key == attr_key)
-}

 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
 #[cfg_attr(not(target_arch = "wasm32"), async_trait)]
@@ -133,7 +118,6 @@ where
            .check_response()?;

        let logs = parse_raw_logs(tx_res.tx_result.log)?;
-        let events = tx_res.tx_result.events;
        let gas_info = GasInfo {
            gas_wanted: tx_res.tx_result.gas_wanted.try_into().unwrap_or_default(),
            gas_used: tx_res.tx_result.gas_used.try_into().unwrap_or_default(),
@@ -143,7 +127,7 @@ where
        // the reason I think unwrap here is fine is that if the transaction succeeded and those
        // fields do not exist or code_id is not a number, there's no way we can recover, we're probably connected
        // to wrong validator or something
-        let code_id = find_attribute(&events, "store_code", "code_id")
+        let code_id = logs::find_attribute(&logs, "store_code", "code_id")
            .unwrap()
            .value
            .parse()
@@ -156,7 +140,6 @@ where
            compressed_checksum,
            code_id,
            logs,
-            events,
            transaction_hash: tx_res.hash,
            gas_info,
        })
@@ -199,7 +182,6 @@ where
            .check_response()?;

        let logs = parse_raw_logs(tx_res.tx_result.log)?;
-        let events = tx_res.tx_result.events;
        let gas_info = GasInfo {
            gas_wanted: tx_res.tx_result.gas_wanted.try_into().unwrap_or_default(),
            gas_used: tx_res.tx_result.gas_used.try_into().unwrap_or_default(),
@@ -208,7 +190,7 @@ where
        // the reason I think unwrap here is fine is that if the transaction succeeded and those
        // fields do not exist or address is malformed, there's no way we can recover, we're probably connected
        // to wrong validator or something
-        let contract_address = find_attribute(&events, "instantiate", "_contract_address")
+        let contract_address = logs::find_attribute(&logs, "instantiate", "_contract_address")
            .unwrap()
            .value
            .parse()
@@ -217,7 +199,6 @@ where
        Ok(InstantiateResult {
            contract_address,
            logs,
-            events,
            transaction_hash: tx_res.hash,
            gas_info,
        })
@@ -250,7 +231,6 @@ where
        };
        Ok(ChangeAdminResult {
            logs: parse_raw_logs(tx_res.tx_result.log)?,
-            events: tx_res.tx_result.events,
            transaction_hash: tx_res.hash,
            gas_info,
        })
@@ -281,7 +261,6 @@ where
        };
        Ok(ChangeAdminResult {
            logs: parse_raw_logs(tx_res.tx_result.log)?,
-            events: tx_res.tx_result.events,
            transaction_hash: tx_res.hash,
            gas_info,
        })
@@ -319,7 +298,6 @@ where
        };
        Ok(MigrateResult {
            logs: parse_raw_logs(tx_res.tx_result.log)?,
-            events: tx_res.tx_result.events,
            transaction_hash: tx_res.hash,
            gas_info,
        })
@@ -357,7 +335,6 @@ where
        };
        Ok(ExecuteResult {
            logs: parse_raw_logs(tx_res.tx_result.log)?,
-            events: tx_res.tx_result.events,
            data: tx_res.tx_result.data.into(),
            transaction_hash: tx_res.hash,
            gas_info,
@@ -401,7 +378,6 @@ where
        };
        Ok(ExecuteResult {
            logs: parse_raw_logs(tx_res.tx_result.log)?,
-            events: tx_res.tx_result.events,
            data: tx_res.tx_result.data.into(),
            transaction_hash: tx_res.hash,
            gas_info,
@@ -35,7 +35,6 @@ pub fn find_attribute<'a>(

 // these two functions were separated so that the internal logic could actually be tested
 fn parse_raw_str_logs(raw: &str) -> Result<Vec<Log>, NyxdError> {
-    // From Cosmos SDK > 0.50 onwards, log field is not populated
    if raw.is_empty() {
        return Ok(Vec::new());
    }
@@ -232,8 +232,6 @@ pub struct UploadResult {

    pub logs: Vec<Log>,

-    pub events: Vec<abci::Event>,
-
    /// Transaction hash (might be used as transaction ID)
    pub transaction_hash: Hash,

@@ -271,8 +269,6 @@ pub struct InstantiateResult {

    pub logs: Vec<Log>,

-    pub events: Vec<abci::Event>,
-
    /// Transaction hash (might be used as transaction ID)
    pub transaction_hash: Hash,

@@ -283,8 +279,6 @@ pub struct InstantiateResult {
 pub struct ChangeAdminResult {
    pub logs: Vec<Log>,

-    pub events: Vec<abci::Event>,
-
    /// Transaction hash (might be used as transaction ID)
    pub transaction_hash: Hash,

@@ -295,8 +289,6 @@ pub struct ChangeAdminResult {
 pub struct MigrateResult {
    pub logs: Vec<Log>,

-    pub events: Vec<abci::Event>,
-
    /// Transaction hash (might be used as transaction ID)
    pub transaction_hash: Hash,

@@ -309,8 +301,6 @@ pub struct ExecuteResult {

    pub data: Vec<u8>,

-    pub events: Vec<abci::Event>,
-
    /// Transaction hash (might be used as transaction ID)
    pub transaction_hash: Hash,

@@ -1,26 +1,15 @@
-// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

 use clap::Parser;
-use cosmwasm_std::Decimal;
 use log::{debug, info};
-use nym_mixnet_contract_common::{
-    InitialRewardingParams, InstantiateMsg, OperatingCostRange, Percent, ProfitMarginRange,
-};
-use nym_network_defaults::mainnet::MIX_DENOM;
-use nym_network_defaults::TOTAL_SUPPLY;
-use nym_validator_client::nyxd::{AccountId, Coin};
+
+use cosmwasm_std::Decimal;
+use nym_mixnet_contract_common::{InitialRewardingParams, InstantiateMsg, Percent};
+use nym_validator_client::nyxd::AccountId;
 use std::str::FromStr;
 use std::time::Duration;

-pub fn default_maximum_operating_cost() -> Coin {
-    Coin::new(TOTAL_SUPPLY, MIX_DENOM.base)
-}
-
-pub fn default_minimum_operating_cost() -> Coin {
-    Coin::new(0, MIX_DENOM.base)
-}
-
 #[derive(Debug, Parser)]
 pub struct Args {
    #[clap(long)]
@@ -61,18 +50,6 @@ pub struct Args {

    #[clap(long, default_value_t = 240)]
    pub active_set_size: u32,
-
-    #[clap(long, default_value_t = Percent::zero())]
-    pub minimum_profit_margin_percent: Percent,
-
-    #[clap(long, default_value_t = Percent::hundred())]
-    pub maximum_profit_margin_percent: Percent,
-
-    #[clap(long, default_value_t = default_minimum_operating_cost())]
-    pub minimum_interval_operating_cost: Coin,
-
-    #[clap(long, default_value_t = default_maximum_operating_cost())]
-    pub maximum_interval_operating_cost: Coin,
 }

 pub async fn generate(args: Args) {
@@ -120,10 +97,6 @@ pub async fn generate(args: Args) {
            .expect("Rewarding (mix) denom has to be set")
    });

-    if args.minimum_interval_operating_cost.denom != args.maximum_interval_operating_cost.denom {
-        panic!("different denoms for operating cost bounds")
-    }
-
    let instantiate_msg = InstantiateMsg {
        rewarding_validator_address: rewarding_validator_address.to_string(),
        vesting_contract_address: vesting_contract_address.to_string(),
@@ -131,14 +104,6 @@ pub async fn generate(args: Args) {
        epochs_in_interval: args.epochs_in_interval,
        epoch_duration: Duration::from_secs(args.epoch_duration),
        initial_rewarding_params,
-        profit_margin: ProfitMarginRange {
-            minimum: args.minimum_profit_margin_percent,
-            maximum: args.maximum_profit_margin_percent,
-        },
-        interval_operating_cost: OperatingCostRange {
-            minimum: args.minimum_interval_operating_cost.amount.into(),
-            maximum: args.maximum_interval_operating_cost.amount.into(),
-        },
    };

    debug!("instantiate_msg: {:?}", instantiate_msg);
@@ -29,7 +29,7 @@ time = { workspace = true, features = ["parsing", "formatting"] }
 ts-rs = { workspace = true, optional = true }

 [dev-dependencies]
-rand_chacha = { workspace = true }
+rand_chacha = "0.3"
 time = { workspace = true, features = ["serde", "macros"] }

 [features]
@@ -1,9 +1,8 @@
 // Copyright 2022-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use crate::{EpochEventId, EpochState, IdentityKey, MixId, OperatingCostRange, ProfitMarginRange};
+use crate::{EpochEventId, EpochState, IdentityKey, MixId};
 use contracts_common::signing::verifier::ApiVerifierError;
-use contracts_common::Percent;
 use cosmwasm_std::{Addr, Coin, Decimal, Uint128};
 use thiserror::Error;

@@ -240,19 +239,6 @@ pub enum MixnetContractError {
        #[from]
        source: ApiVerifierError,
    },
-
-    #[error("the provided profit margin ({provided}) is outside the allowed range: {range}")]
-    ProfitMarginOutsideRange {
-        provided: Percent,
-        range: ProfitMarginRange,
-    },
-
-    #[error("the provided interval operating cost ({provided}{denom}) is outside the allowed range: {range}")]
-    OperatingCostOutsideRange {
-        denom: String,
-        provided: Uint128,
-        range: OperatingCostRange,
-    },
 }

 impl MixnetContractError {
@@ -10,10 +10,7 @@ use crate::helpers::IntoBaseDecimal;
 use crate::reward_params::{NodeRewardParams, RewardingParams};
 use crate::rewarding::helpers::truncate_reward;
 use crate::rewarding::RewardDistribution;
-use crate::{
-    Delegation, EpochEventId, EpochId, IdentityKey, MixId, OperatingCostRange, Percent,
-    ProfitMarginRange, SphinxKey,
-};
+use crate::{Delegation, EpochEventId, EpochId, IdentityKey, MixId, Percent, SphinxKey};
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{Addr, Coin, Decimal, StdResult, Uint128};
 use schemars::JsonSchema;
@@ -155,16 +152,6 @@ impl MixNodeRewarding {
        })
    }

-    pub fn normalise_profit_margin(&mut self, allowed_range: ProfitMarginRange) {
-        self.cost_params.profit_margin_percent =
-            allowed_range.normalise(self.cost_params.profit_margin_percent)
-    }
-
-    pub fn normalise_operating_cost(&mut self, allowed_range: OperatingCostRange) {
-        self.cost_params.interval_operating_cost.amount =
-            allowed_range.normalise(self.cost_params.interval_operating_cost.amount)
-    }
-
    /// Determines whether this node is still bonded. This is performed via a simple check,
    /// if there are no tokens left associated with the operator, it means they have unbonded
    /// and those params only exist for the purposes of calculating rewards for delegators that
@@ -1,4 +1,4 @@
-// Copyright 2021-2024 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

 use crate::delegation::{self, OwnerProxySubKey};
@@ -12,7 +12,6 @@ use crate::reward_params::{
    IntervalRewardParams, IntervalRewardingParamsUpdate, Performance, RewardingParams,
 };
 use crate::types::{ContractStateParams, LayerAssignment, MixId};
-use crate::{OperatingCostRange, ProfitMarginRange};
 use contracts_common::{signing::MessageSignature, IdentityKey, Percent};
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{Coin, Decimal};
@@ -58,12 +57,6 @@ pub struct InstantiateMsg {
    pub epochs_in_interval: u32,
    pub epoch_duration: Duration,
    pub initial_rewarding_params: InitialRewardingParams,
-
-    #[serde(default)]
-    pub profit_margin: ProfitMarginRange,
-
-    #[serde(default)]
-    pub interval_operating_cost: OperatingCostRange,
 }

 #[cw_serde]
@@ -3,11 +3,9 @@

 use crate::error::MixnetContractError;
 use crate::Layer;
-use contracts_common::Percent;
 use cosmwasm_schema::cw_serde;
+use cosmwasm_std::Addr;
 use cosmwasm_std::Coin;
-use cosmwasm_std::{Addr, Uint128};
-use std::fmt::{Display, Formatter};
 use std::ops::Index;

 // type aliases for better reasoning about available data
@@ -17,65 +15,6 @@ pub type SphinxKeyRef<'a> = &'a str;
 pub type MixId = u32;
 pub type BlockHeight = u64;

-#[cw_serde]
-pub struct RangedValue<T> {
-    pub minimum: T,
-    pub maximum: T,
-}
-
-impl<T> Copy for RangedValue<T> where T: Copy {}
-
-pub type ProfitMarginRange = RangedValue<Percent>;
-pub type OperatingCostRange = RangedValue<Uint128>;
-
-impl<T> Display for RangedValue<T>
-where
-    T: Display,
-{
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{} - {}", self.minimum, self.maximum)
-    }
-}
-
-impl Default for ProfitMarginRange {
-    fn default() -> Self {
-        ProfitMarginRange {
-            minimum: Percent::zero(),
-            maximum: Percent::hundred(),
-        }
-    }
-}
-
-impl Default for OperatingCostRange {
-    fn default() -> Self {
-        OperatingCostRange {
-            minimum: Uint128::zero(),
-
-            // 1 billion (native tokens, i.e. 1 billion * 1'000'000 base tokens) - the total supply
-            maximum: Uint128::new(1_000_000_000_000_000),
-        }
-    }
-}
-
-impl<T> RangedValue<T>
-where
-    T: Copy + PartialOrd + PartialEq,
-{
-    pub fn normalise(&self, value: T) -> T {
-        if value < self.minimum {
-            self.minimum
-        } else if value > self.maximum {
-            self.maximum
-        } else {
-            value
-        }
-    }
-
-    pub fn within_range(&self, value: T) -> bool {
-        value >= self.minimum && value <= self.maximum
-    }
-}
-
 /// Specifies layer assignment for the given mixnode.
 #[cw_serde]
 pub struct LayerAssignment {
@@ -215,14 +154,4 @@ pub struct ContractStateParams {

    /// Minimum amount a gateway must pledge to get into the system.
    pub minimum_gateway_pledge: Coin,
-
-    /// Defines the allowed profit margin range of operators.
-    /// default: 0% - 100%
-    #[serde(default)]
-    pub profit_margin: ProfitMarginRange,
-
-    /// Defines the allowed interval operating cost range of operators.
-    /// default: 0 - 1'000'000'000'000'000 (1 Billion native tokens - the total supply)
-    #[serde(default)]
-    pub interval_operating_cost: OperatingCostRange,
 }
@@ -12,16 +12,16 @@ aes = { workspace = true, optional = true }
 bs58 = { workspace = true }
 blake3 = { workspace = true, features = ["traits-preview"], optional = true }
 ctr = { workspace = true, optional = true }
-digest = { workspace = true, optional = true }
+digest = { version = "0.10.3", optional = true }
 generic-array = { workspace = true, optional = true }
 hkdf = { workspace = true, optional = true }
 hmac = { workspace = true, optional = true }
 cipher = { workspace = true, optional = true }
-x25519-dalek = { workspace = true, features = ["static_secrets"], optional = true }
-ed25519-dalek = { workspace = true, features = ["rand_core"], optional = true }
+x25519-dalek = { version = "2.0", optional = true, features = ["static_secrets"]}
+ed25519-dalek = { version = "2.1", features = ["rand_core"], optional = true }
 rand = { workspace = true, optional = true }
 serde_bytes = { version = "0.11.6", optional = true }
-serde_crate = { version = "1.0", optional = true, default-features = false, features = ["derive"], package = "serde" }
+serde_crate = { version = "1.0", optional = true, default_features = false, features = ["derive"], package = "serde" }
 subtle-encoding = { workspace = true, features = ["bech32-preview"] }
 thiserror = { workspace = true }
 zeroize = { workspace = true, optional = true, features = ["zeroize_derive"] }
@@ -31,7 +31,7 @@ nym-sphinx-types = { path = "../nymsphinx/types", version = "0.2.0", default-fea
 nym-pemstore = { path = "../../common/pemstore", version = "0.3.0" }

 [dev-dependencies]
-rand_chacha = { workspace = true }
+rand_chacha = "0.3"

 [features]
 default = ["sphinx"]
@@ -19,7 +19,7 @@ bs58 = { workspace = true }

 lazy_static = { workspace = true }
 rand = { version = "0.8.5", default-features = false}
-rand_chacha = { workspace = true }
+rand_chacha = "0.3"
 rand_core = { workspace = true }
 sha2 = "0.9"
 serde = { workspace = true }
@@ -20,8 +20,6 @@ serde_json = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }

-nym-bin-common = { path = "../bin-common" }
-
 # for request timeout until https://github.com/seanmonstar/reqwest/issues/1135 is fixed
 [target."cfg(target_arch = \"wasm32\")".dependencies.wasmtimer]
 workspace = true
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use async_trait::async_trait;
+use http::header;
 use reqwest::header::HeaderValue;
 use reqwest::{RequestBuilder, Response, StatusCode};
 use serde::de::DeserializeOwned;
@@ -14,10 +15,6 @@ use url::Url;

 pub use reqwest::IntoUrl;

-pub use user_agent::UserAgent;
-
-mod user_agent;
-
 pub const DEFAULT_TIMEOUT: Duration = Duration::from_secs(10);

 pub type PathSegments<'a> = &'a [&'a str];
@@ -100,6 +97,13 @@ impl ClientBuilder {
        self
    }

+    pub fn with_host_header(mut self, host: &str) -> Self {
+        let mut headers = header::HeaderMap::new();
+        headers.insert(header::HOST, HeaderValue::from_str(host).unwrap()); //SW Handle this unwrap later
+        self.reqwest_client_builder = self.reqwest_client_builder.default_headers(headers);
+        self
+    }
+
    pub fn with_user_agent<V>(mut self, value: V) -> Self
    where
        V: TryInto<HeaderValue>,
@@ -159,6 +163,23 @@ impl Client {
        )
    }

+    pub fn new_fronted(base_url: Url, fronting_url: Url, timeout: Option<Duration>) -> Self {
+        let host = base_url.host_str().unwrap();
+        let mut fronted_url = base_url.clone();
+        fronted_url.set_host(fronting_url.host_str()).unwrap();
+        let builder = ClientBuilder::new::<_, String>(fronted_url)
+            .expect(
+                "we provided valid url and we were unwrapping previous construction errors anyway",
+            )
+            .with_host_header(host);
+
+        //SW polish that later if needed
+        match timeout {
+            Some(timeout) => builder.with_timeout(timeout).build::<String>().unwrap(),
+            None => builder.build::<String>().unwrap(),
+        }
+    }
+
    pub fn new_url<U, E>(url: U, timeout: Option<Duration>) -> Result<Self, HttpClientError<E>>
    where
        U: IntoUrl,
@@ -183,6 +204,21 @@ impl Client {
        self.base_url = new_url
    }

+    pub fn change_fronted_url(&mut self, new_api_url: Url, new_fronting_url: Url) {
+        let host = new_api_url.host_str().unwrap();
+        let mut new_fronted_url = new_api_url.clone();
+        new_fronted_url
+            .set_host(new_fronting_url.host_str())
+            .unwrap();
+        let mut headers = header::HeaderMap::new();
+        headers.insert(header::HOST, HeaderValue::from_str(host).unwrap()); //SW Handle this unwrap later
+        self.reqwest_client = reqwest::ClientBuilder::new()
+            .default_headers(headers)
+            .build()
+            .unwrap();
+        self.base_url = new_fronted_url
+    }
+
    pub fn current_url(&self) -> &Url {
        &self.base_url
    }
@@ -1,56 +0,0 @@
-// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use std::fmt;
-
-use http::HeaderValue;
-use nym_bin_common::build_information::{BinaryBuildInformation, BinaryBuildInformationOwned};
-
-#[derive(Clone, Debug)]
-pub struct UserAgent {
-    pub application: String,
-    pub version: String,
-    pub platform: String,
-    pub git_commit: String,
-}
-
-impl fmt::Display for UserAgent {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let abbreviated_commit = self.git_commit.chars().take(7).collect::<String>();
-        write!(
-            f,
-            "{}/{}/{}/{}",
-            self.application, self.version, self.platform, abbreviated_commit
-        )
-    }
-}
-
-impl TryFrom<UserAgent> for HeaderValue {
-    type Error = http::header::InvalidHeaderValue;
-
-    fn try_from(user_agent: UserAgent) -> Result<Self, Self::Error> {
-        HeaderValue::from_str(&user_agent.to_string())
-    }
-}
-
-impl From<BinaryBuildInformation> for UserAgent {
-    fn from(build_info: BinaryBuildInformation) -> Self {
-        UserAgent {
-            application: build_info.binary_name.to_string(),
-            version: build_info.build_version.to_string(),
-            platform: build_info.cargo_triple.to_string(),
-            git_commit: build_info.commit_sha.to_string(),
-        }
-    }
-}
-
-impl From<BinaryBuildInformationOwned> for UserAgent {
-    fn from(build_info: BinaryBuildInformationOwned) -> Self {
-        UserAgent {
-            application: build_info.binary_name,
-            version: build_info.build_version,
-            platform: build_info.cargo_triple,
-            git_commit: build_info.commit_sha,
-        }
-    }
-}
@@ -14,7 +14,7 @@ bytes = { workspace = true }
 nym-bin-common = { path = "../bin-common" }
 nym-crypto = { path = "../crypto" }
 nym-sphinx = { path = "../nymsphinx" }
-rand = { workspace = true }
+rand = "0.8.5"
 serde = { workspace = true, features = ["derive"] }
 thiserror = { workspace = true }
 time = { workspace = true }
@@ -27,6 +27,7 @@ pub const COCONUT_DKG_CONTRACT_ADDRESS: &str =

 pub const REWARDING_VALIDATOR_ADDRESS: &str = "n10yyd98e2tuwu0f7ypz9dy3hhjw7v772q6287gy";

+pub const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "https://mainnet-stats.nymte.ch:8090/";
 pub const NYXD_URL: &str = "https://rpc.nymtech.net";
 pub const NYM_API: &str = "https://validator.nymtech.net/api/";
 pub const NYXD_WS: &str = "wss://rpc.nymtech.net/websocket";
@@ -109,6 +110,10 @@ pub fn export_to_env() {
        var_names::REWARDING_VALIDATOR_ADDRESS,
        REWARDING_VALIDATOR_ADDRESS,
    );
+    set_var_to_default(
+        var_names::STATISTICS_SERVICE_DOMAIN_ADDRESS,
+        STATISTICS_SERVICE_DOMAIN_ADDRESS,
+    );
    set_var_to_default(var_names::NYXD, NYXD_URL);
    set_var_to_default(var_names::NYM_API, NYM_API);
    set_var_to_default(var_names::NYXD_WEBSOCKET, NYXD_WS);
@@ -150,6 +155,10 @@ pub fn export_to_env_if_not_set() {
        var_names::REWARDING_VALIDATOR_ADDRESS,
        REWARDING_VALIDATOR_ADDRESS,
    );
+    set_var_conditionally_to_default(
+        var_names::STATISTICS_SERVICE_DOMAIN_ADDRESS,
+        STATISTICS_SERVICE_DOMAIN_ADDRESS,
+    );
    set_var_conditionally_to_default(var_names::NYXD, NYXD_URL);
    set_var_conditionally_to_default(var_names::NYM_API, NYM_API);
    set_var_conditionally_to_default(var_names::NYXD_WEBSOCKET, NYXD_WS);
@@ -19,6 +19,7 @@ pub const GROUP_CONTRACT_ADDRESS: &str = "GROUP_CONTRACT_ADDRESS";
 pub const MULTISIG_CONTRACT_ADDRESS: &str = "MULTISIG_CONTRACT_ADDRESS";
 pub const COCONUT_DKG_CONTRACT_ADDRESS: &str = "COCONUT_DKG_CONTRACT_ADDRESS";
 pub const REWARDING_VALIDATOR_ADDRESS: &str = "REWARDING_VALIDATOR_ADDRESS";
+pub const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "STATISTICS_SERVICE_DOMAIN_ADDRESS";
 pub const NYXD: &str = "NYXD";
 pub const NYM_API: &str = "NYM_API";
 pub const NYXD_WEBSOCKET: &str = "NYXD_WS";
@@ -9,7 +9,7 @@ license.workspace = true

 [dependencies]
 bls12_381 = { workspace = true, default-features = false, features = ["pairings", "alloc", "experimental"] }
-itertools = { workspace = true }
+itertools = "0.10"
 digest = "0.9"
 rand = "0.8"
 thiserror = { workspace = true }
@@ -33,7 +33,7 @@ default-features = false
 [dev-dependencies]
 criterion = { workspace = true, features = ["html_reports"] }
 doc-comment = { workspace = true }
-rand_chacha = { workspace = true }
+rand_chacha = "0.3"

 [[bench]]
 name = "benchmarks"
@@ -9,7 +9,7 @@ repository = { workspace = true }

 [dependencies]
 rand = { workspace = true }
-serde_crate = { version = "1.0", optional = true, default-features = false, features = ["derive"], package = "serde" }
+serde_crate = { version = "1.0", optional = true, default_features = false, features = ["derive"], package = "serde" }
 generic-array = { workspace = true, optional = true, features = ["serde"] }
 thiserror = { workspace = true }
 zeroize = { workspace = true }
@@ -24,4 +24,4 @@ nym-topology = { path = "../../topology" }
 version = "0.2.83"

 [dev-dependencies]
-rand_chacha = { workspace = true }
+rand_chacha = "0.3"
@@ -17,7 +17,7 @@ cosmrs.workspace = true
 eyre = { workspace = true }
 futures.workspace = true
 humantime = { workspace = true }
-sha2 = { workspace = true }
+sha2 = "0.10.8"
 serde = { workspace = true, features = ["derive"] }
 sqlx = { workspace = true, features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate", "time"] }
 tendermint.workspace = true
@@ -8,7 +8,7 @@ license.workspace = true

 [dependencies]
 anyhow = { workspace = true }
-dirs = { workspace = true }
+dirs = "4.0"
 futures = { workspace = true }
 log = { workspace = true }
 pin-project = { workspace = true }
@@ -27,7 +27,6 @@ use nym_task::manager::TaskStatus;
 use nym_task::{TaskClient, TaskHandle};

 use anyhow::anyhow;
-use nym_validator_client::UserAgent;
 use std::error::Error;
 use std::path::PathBuf;

@@ -62,8 +61,6 @@ pub struct NymClient<S> {

    setup_method: GatewaySetup,

-    user_agent: UserAgent,
-
    /// Optional path to a .json file containing standalone network details.
    custom_mixnet: Option<PathBuf>,
 }
@@ -77,17 +74,11 @@ where
    <S::GatewaysDetailsStore as GatewaysDetailsStore>::StorageError: Sync + Send,
    <S::KeyStore as KeyStore>::StorageError: Send + Sync,
 {
-    pub fn new(
-        config: Config,
-        storage: S,
-        user_agent: UserAgent,
-        custom_mixnet: Option<PathBuf>,
-    ) -> Self {
+    pub fn new(config: Config, storage: S, custom_mixnet: Option<PathBuf>) -> Self {
        NymClient {
            config,
            storage,
            setup_method: GatewaySetup::MustLoad { gateway_id: None },
-            user_agent,
            custom_mixnet,
        }
    }
@@ -235,8 +226,7 @@ where

        let mut base_builder =
            BaseClientBuilder::new(&self.config.base, self.storage, dkg_query_client)
-                .with_gateway_setup(self.setup_method)
-                .with_user_agent(self.user_agent);
+                .with_gateway_setup(self.setup_method);

        if let Some(custom_mixnet) = &self.custom_mixnet {
            base_builder = base_builder.with_stored_topology(custom_mixnet)?;
@@ -0,0 +1,20 @@
+# Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+# SPDX-License-Identifier: Apache-2.0
+
+[package]
+name = "nym-statistics-common"
+version = "1.0.1"
+edition = "2021"
+license.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+async-trait = { workspace = true }
+log = { workspace = true }
+reqwest = { workspace = true, features = ["json"] }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+sqlx = { workspace = true, features = ["runtime-tokio-rustls", "chrono"]}
+thiserror = { workspace = true }
+tokio = { workspace = true, features = ["time"] }
@@ -0,0 +1,51 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::error::StatsError;
+use crate::StatsMessage;
+
+pub const DEFAULT_STATISTICS_SERVICE_ADDRESS: &str = "127.0.0.1";
+pub const DEFAULT_STATISTICS_SERVICE_PORT: u16 = 8091;
+
+pub const STATISTICS_SERVICE_VERSION: &str = "/v1";
+pub const STATISTICS_SERVICE_API_STATISTICS: &str = "statistic";
+
+pub async fn build_and_send_statistics_request(
+    msg: StatsMessage,
+    url: String,
+) -> Result<(), StatsError> {
+    reqwest::Client::new()
+        .post(format!(
+            "{url}{STATISTICS_SERVICE_VERSION}/{STATISTICS_SERVICE_API_STATISTICS}"
+        ))
+        .json(&msg)
+        .send()
+        .await?;
+
+    Ok(())
+}
+
+pub fn build_statistics_request_bytes(msg: StatsMessage) -> Result<Vec<u8>, StatsError> {
+    let json_msg = msg.to_json()?;
+
+    let req = reqwest::Request::new(
+        reqwest::Method::POST,
+        reqwest::Url::parse(&format!(
+            "http://{DEFAULT_STATISTICS_SERVICE_ADDRESS}:{DEFAULT_STATISTICS_SERVICE_PORT}{STATISTICS_SERVICE_VERSION}/{STATISTICS_SERVICE_API_STATISTICS}"
+        ))
+        .unwrap(),
+    );
+    let data = format!(
+        "{} {} {:?}\n\
+        Content-Type: application/json\n\
+        Content-Length: {}\n\n\
+        {}\n",
+        req.method().as_str(),
+        req.url().as_str(),
+        req.version(),
+        json_msg.len(),
+        json_msg
+    );
+
+    Ok(data.into_bytes())
+}
@@ -0,0 +1,57 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use async_trait::async_trait;
+use log::error;
+use sqlx::types::chrono::{DateTime, Utc};
+use std::time::Duration;
+use tokio::time;
+
+use crate::error::StatsError;
+use crate::StatsMessage;
+
+const STATISTICS_TIMER_INTERVAL: Duration = Duration::from_secs(60);
+
+#[async_trait]
+pub trait StatisticsCollector {
+    async fn create_stats_message(
+        &self,
+        interval: Duration,
+        timestamp: DateTime<Utc>,
+    ) -> StatsMessage;
+    async fn send_stats_message(&self, stats_message: StatsMessage) -> Result<(), StatsError>;
+    async fn reset_stats(&mut self);
+}
+
+pub struct StatisticsSender<T: StatisticsCollector> {
+    collector: T,
+    interval: Duration,
+    timestamp: DateTime<Utc>,
+}
+
+impl<T: StatisticsCollector> StatisticsSender<T> {
+    pub fn new(collector: T) -> Self {
+        StatisticsSender {
+            collector,
+            interval: STATISTICS_TIMER_INTERVAL,
+            timestamp: Utc::now(),
+        }
+    }
+
+    pub async fn run(&mut self) {
+        let mut interval = time::interval(self.interval);
+        loop {
+            interval.tick().await;
+
+            let stats_message = self
+                .collector
+                .create_stats_message(self.interval, self.timestamp)
+                .await;
+            if let Err(e) = self.collector.send_stats_message(stats_message).await {
+                error!("Statistics not sent: {}", e);
+            }
+            self.collector.reset_stats().await;
+            self.timestamp = Utc::now();
+        }
+    }
+}
@@ -0,0 +1,13 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub enum StatsError {
+    #[error("Serde JSON error: {0}")]
+    SerdeJsonError(#[from] serde_json::Error),
+
+    #[error("Reqwest error: {0}")]
+    ReqwestError(#[from] reqwest::Error),
+}
@@ -0,0 +1,65 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use serde::{Deserialize, Serialize};
+
+use error::StatsError;
+
+pub mod api;
+pub mod collector;
+pub mod error;
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct StatsMessage {
+    pub stats_data: Vec<StatsData>,
+    pub interval_seconds: u32,
+    pub timestamp: String,
+}
+
+impl StatsMessage {
+    pub fn to_json(&self) -> Result<String, StatsError> {
+        Ok(serde_json::to_string(self)?)
+    }
+
+    pub fn from_json(s: &str) -> Result<Self, StatsError> {
+        Ok(serde_json::from_str(s)?)
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub enum StatsData {
+    Service(StatsServiceData),
+    Gateway(StatsGatewayData),
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct StatsGatewayData {
+    pub gateway_id: String,
+    pub inbox_count: u32,
+}
+
+impl StatsGatewayData {
+    pub fn new(gateway_id: String, inbox_count: u32) -> Self {
+        StatsGatewayData {
+            gateway_id,
+            inbox_count,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct StatsServiceData {
+    pub requested_service: String,
+    pub request_bytes: u32,
+    pub response_bytes: u32,
+}
+
+impl StatsServiceData {
+    pub fn new(requested_service: String, request_bytes: u32, response_bytes: u32) -> Self {
+        StatsServiceData {
+            requested_service,
+            request_bytes,
+            response_bytes,
+        }
+    }
+}
@@ -8,21 +8,21 @@ rust-version = "1.58"
 license.workspace = true

 [dependencies]
-base64 = { workspace = true }
+base64 = "0.21.4"
 eyre = { workspace = true }
 hmac = { workspace = true }
-itertools = { workspace = true }
+itertools = "0.11"
 log = { workspace = true }
 reqwest = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-sha2 = { workspace = true }
+sha2 = "0.10.8"
 strum = { workspace = true, features = ["derive"] }
 thiserror = { workspace = true }
 ts-rs = { workspace = true }
 url = { workspace = true }
-x25519-dalek = { workspace = true, features = ["static_secrets"] }
+x25519-dalek = { version = "2.0.0", features = ["static_secrets"] }

 cosmwasm-std = { workspace = true }
 cosmrs = { workspace = true }
@@ -1,4 +1,3 @@
-use nym_mixnet_contract_common::ContractsCommonError;
 use nym_validator_client::error::TendermintRpcError;
 use nym_validator_client::nym_api::error::NymAPIError;
 use nym_validator_client::{nyxd::error::NyxdError, ValidatorClientError};
@@ -9,9 +8,6 @@ use thiserror::Error;
 // TODO: ask @MS why this even exists
 #[derive(Error, Debug)]
 pub enum TypesError {
-    #[error(transparent)]
-    ContractsCommon(#[from] ContractsCommonError),
-
    #[error("{source}")]
    NyxdError {
        #[from]
@@ -124,6 +124,7 @@ pub struct GatewayNetworkRequesterDetails {
    pub encryption_key: String,

    pub open_proxy: bool,
+    pub enabled_statistics: bool,

    // just a convenience wrapper around all the keys
    pub address: String,
@@ -141,7 +142,8 @@ impl fmt::Display for GatewayNetworkRequesterDetails {
        writeln!(f, "\tencryption key: {}", self.encryption_key)?;
        writeln!(f, "\taddress: {}", self.address)?;

-        writeln!(f, "\tuses open proxy: {}", self.open_proxy)
+        writeln!(f, "\tuses open proxy: {}", self.open_proxy)?;
+        writeln!(f, "\tsends statistics: {}", self.enabled_statistics)
    }
 }

@@ -25,13 +25,13 @@ nym-network-defaults = { path = "../network-defaults" }

 ## verify:
 hmac = { workspace = true, optional = true }
-sha2 = { workspace = true, optional = true }
+sha2 = { version = "0.10.8", optional = true }

 ## openapi:
 utoipa = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }

-x25519-dalek = { workspace = true, features = ["static_secrets"] }
+x25519-dalek = { version = "2.0.0", features = ["static_secrets"] }

 [dev-dependencies]
 rand = "0.8.5"
@@ -10,7 +10,8 @@ pub use config::Config;
 pub use error::Error;
 pub use public_key::PeerPublicKey;
 pub use registration::{
-    ClientMac, ClientMessage, GatewayClient, GatewayClientRegistry, InitMessage, Nonce,
+    ClientMac, ClientMessage, ClientRegistrationResponse, GatewayClient, GatewayClientRegistry,
+    InitMessage, Nonce,
 };

 #[cfg(feature = "verify")]
@@ -7,7 +7,6 @@ use base64::{engine::general_purpose, Engine};
 use dashmap::DashMap;
 use serde::{Deserialize, Serialize};
 use std::net::IpAddr;
-use std::time::SystemTime;
 use std::{fmt, ops::Deref, str::FromStr};

 #[cfg(feature = "verify")]
@@ -19,13 +18,13 @@ use sha2::Sha256;

 pub type GatewayClientRegistry = DashMap<PeerPublicKey, GatewayClient>;
 pub type PendingRegistrations = DashMap<PeerPublicKey, RegistrationData>;
-pub type PrivateIPs = DashMap<IpAddr, Taken>;
+pub type PrivateIPs = DashMap<IpAddr, Free>;

 #[cfg(feature = "verify")]
 pub type HmacSha256 = Hmac<Sha256>;

 pub type Nonce = u64;
-pub type Taken = Option<SystemTime>;
+pub type Free = bool;

 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(tag = "type", rename_all = "camelCase")]
@@ -54,6 +53,15 @@ impl InitMessage {
 }

 #[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(tag = "type", rename_all = "camelCase")]
+#[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))]
+pub enum ClientRegistrationResponse {
+    PendingRegistration(RegistrationData),
+    Registered,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+#[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))]
 pub struct RegistrationData {
    pub nonce: u64,
    pub gateway_data: GatewayClient,
@@ -11,13 +11,13 @@ license.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-base64 = { workspace = true }
+base64 = "0.21.3"
 dashmap = { workspace = true }
 defguard_wireguard_rs = { workspace = true }
 # The latest version on crates.io at the time of writing this (6.0.0) has a
 # version mismatch with x25519-dalek/curve25519-dalek that is resolved in the
 # latest commit. So pick that for now.
-x25519-dalek = { workspace = true }
+x25519-dalek = "2.0.0"
 ip_network = { workspace = true }
 log.workspace = true
 nym-crypto = { path = "../crypto", features = ["asymmetric"] }
@@ -24,7 +24,5 @@ pub fn default_mixnet_init_msg() -> nym_mixnet_contract_common::InstantiateMsg {
            rewarded_set_size: 240,
            active_set_size: 100,
        },
-        profit_margin: Default::default(),
-        interval_operating_cost: Default::default(),
    }
 }
@@ -26,28 +26,6 @@
      "initial_rewarding_params": {
        "$ref": "#/definitions/InitialRewardingParams"
      },
-      "interval_operating_cost": {
-        "default": {
-          "maximum": "1000000000000000",
-          "minimum": "0"
-        },
-        "allOf": [
-          {
-            "$ref": "#/definitions/RangedValue_for_Uint128"
-          }
-        ]
-      },
-      "profit_margin": {
-        "default": {
-          "maximum": "1",
-          "minimum": "0"
-        },
-        "allOf": [
-          {
-            "$ref": "#/definitions/RangedValue_for_Percent"
-          }
-        ]
-      },
      "rewarding_denom": {
        "type": "string"
      },
@@ -134,42 +112,6 @@
            "$ref": "#/definitions/Decimal"
          }
        ]
-      },
-      "RangedValue_for_Percent": {
-        "type": "object",
-        "required": [
-          "maximum",
-          "minimum"
-        ],
-        "properties": {
-          "maximum": {
-            "$ref": "#/definitions/Percent"
-          },
-          "minimum": {
-            "$ref": "#/definitions/Percent"
-          }
-        },
-        "additionalProperties": false
-      },
-      "RangedValue_for_Uint128": {
-        "type": "object",
-        "required": [
-          "maximum",
-          "minimum"
-        ],
-        "properties": {
-          "maximum": {
-            "$ref": "#/definitions/Uint128"
-          },
-          "minimum": {
-            "$ref": "#/definitions/Uint128"
-          }
-        },
-        "additionalProperties": false
-      },
-      "Uint128": {
-        "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
-        "type": "string"
      }
    }
  },
@@ -1230,18 +1172,6 @@
          "minimum_mixnode_pledge"
        ],
        "properties": {
-          "interval_operating_cost": {
-            "description": "Defines the allowed interval operating cost range of operators. default: 0 - 1'000'000'000'000'000 (1 Billion native tokens - the total supply)",
-            "default": {
-              "maximum": "1000000000000000",
-              "minimum": "0"
-            },
-            "allOf": [
-              {
-                "$ref": "#/definitions/RangedValue_for_Uint128"
-              }
-            ]
-          },
          "minimum_gateway_pledge": {
            "description": "Minimum amount a gateway must pledge to get into the system.",
            "allOf": [
@@ -1268,18 +1198,6 @@
                "$ref": "#/definitions/Coin"
              }
            ]
-          },
-          "profit_margin": {
-            "description": "Defines the allowed profit margin range of operators. default: 0% - 100%",
-            "default": {
-              "maximum": "1",
-              "minimum": "0"
-            },
-            "allOf": [
-              {
-                "$ref": "#/definitions/RangedValue_for_Percent"
-              }
-            ]
          }
        },
        "additionalProperties": false
@@ -1614,38 +1532,6 @@
          }
        ]
      },
-      "RangedValue_for_Percent": {
-        "type": "object",
-        "required": [
-          "maximum",
-          "minimum"
-        ],
-        "properties": {
-          "maximum": {
-            "$ref": "#/definitions/Percent"
-          },
-          "minimum": {
-            "$ref": "#/definitions/Percent"
-          }
-        },
-        "additionalProperties": false
-      },
-      "RangedValue_for_Uint128": {
-        "type": "object",
-        "required": [
-          "maximum",
-          "minimum"
-        ],
-        "properties": {
-          "maximum": {
-            "$ref": "#/definitions/Uint128"
-          },
-          "minimum": {
-            "$ref": "#/definitions/Uint128"
-          }
-        },
-        "additionalProperties": false
-      },
      "Uint128": {
        "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
        "type": "string"
@@ -8177,18 +8063,6 @@
            "minimum_mixnode_pledge"
          ],
          "properties": {
-            "interval_operating_cost": {
-              "description": "Defines the allowed interval operating cost range of operators. default: 0 - 1'000'000'000'000'000 (1 Billion native tokens - the total supply)",
-              "default": {
-                "maximum": "1000000000000000",
-                "minimum": "0"
-              },
-              "allOf": [
-                {
-                  "$ref": "#/definitions/RangedValue_for_Uint128"
-                }
-              ]
-            },
            "minimum_gateway_pledge": {
              "description": "Minimum amount a gateway must pledge to get into the system.",
              "allOf": [
@@ -8215,62 +8089,6 @@
                  "$ref": "#/definitions/Coin"
                }
              ]
-            },
-            "profit_margin": {
-              "description": "Defines the allowed profit margin range of operators. default: 0% - 100%",
-              "default": {
-                "maximum": "1",
-                "minimum": "0"
-              },
-              "allOf": [
-                {
-                  "$ref": "#/definitions/RangedValue_for_Percent"
-                }
-              ]
-            }
-          },
-          "additionalProperties": false
-        },
-        "Decimal": {
-          "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
-          "type": "string"
-        },
-        "Percent": {
-          "description": "Percent represents a value between 0 and 100% (i.e. between 0.0 and 1.0)",
-          "allOf": [
-            {
-              "$ref": "#/definitions/Decimal"
-            }
-          ]
-        },
-        "RangedValue_for_Percent": {
-          "type": "object",
-          "required": [
-            "maximum",
-            "minimum"
-          ],
-          "properties": {
-            "maximum": {
-              "$ref": "#/definitions/Percent"
-            },
-            "minimum": {
-              "$ref": "#/definitions/Percent"
-            }
-          },
-          "additionalProperties": false
-        },
-        "RangedValue_for_Uint128": {
-          "type": "object",
-          "required": [
-            "maximum",
-            "minimum"
-          ],
-          "properties": {
-            "maximum": {
-              "$ref": "#/definitions/Uint128"
-            },
-            "minimum": {
-              "$ref": "#/definitions/Uint128"
            }
          },
          "additionalProperties": false
@@ -8291,18 +8109,6 @@
        "minimum_mixnode_pledge"
      ],
      "properties": {
-        "interval_operating_cost": {
-          "description": "Defines the allowed interval operating cost range of operators. default: 0 - 1'000'000'000'000'000 (1 Billion native tokens - the total supply)",
-          "default": {
-            "maximum": "1000000000000000",
-            "minimum": "0"
-          },
-          "allOf": [
-            {
-              "$ref": "#/definitions/RangedValue_for_Uint128"
-            }
-          ]
-        },
        "minimum_gateway_pledge": {
          "description": "Minimum amount a gateway must pledge to get into the system.",
          "allOf": [
@@ -8329,18 +8135,6 @@
              "$ref": "#/definitions/Coin"
            }
          ]
-        },
-        "profit_margin": {
-          "description": "Defines the allowed profit margin range of operators. default: 0% - 100%",
-          "default": {
-            "maximum": "1",
-            "minimum": "0"
-          },
-          "allOf": [
-            {
-              "$ref": "#/definitions/RangedValue_for_Percent"
-            }
-          ]
        }
      },
      "additionalProperties": false,
@@ -8360,50 +8154,6 @@
            }
          }
        },
-        "Decimal": {
-          "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
-          "type": "string"
-        },
-        "Percent": {
-          "description": "Percent represents a value between 0 and 100% (i.e. between 0.0 and 1.0)",
-          "allOf": [
-            {
-              "$ref": "#/definitions/Decimal"
-            }
-          ]
-        },
-        "RangedValue_for_Percent": {
-          "type": "object",
-          "required": [
-            "maximum",
-            "minimum"
-          ],
-          "properties": {
-            "maximum": {
-              "$ref": "#/definitions/Percent"
-            },
-            "minimum": {
-              "$ref": "#/definitions/Percent"
-            }
-          },
-          "additionalProperties": false
-        },
-        "RangedValue_for_Uint128": {
-          "type": "object",
-          "required": [
-            "maximum",
-            "minimum"
-          ],
-          "properties": {
-            "maximum": {
-              "$ref": "#/definitions/Uint128"
-            },
-            "minimum": {
-              "$ref": "#/definitions/Uint128"
-            }
-          },
-          "additionalProperties": false
-        },
        "Uint128": {
          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
          "type": "string"
@@ -1055,18 +1055,6 @@
        "minimum_mixnode_pledge"
      ],
      "properties": {
-        "interval_operating_cost": {
-          "description": "Defines the allowed interval operating cost range of operators. default: 0 - 1'000'000'000'000'000 (1 Billion native tokens - the total supply)",
-          "default": {
-            "maximum": "1000000000000000",
-            "minimum": "0"
-          },
-          "allOf": [
-            {
-              "$ref": "#/definitions/RangedValue_for_Uint128"
-            }
-          ]
-        },
        "minimum_gateway_pledge": {
          "description": "Minimum amount a gateway must pledge to get into the system.",
          "allOf": [
@@ -1093,18 +1081,6 @@
              "$ref": "#/definitions/Coin"
            }
          ]
-        },
-        "profit_margin": {
-          "description": "Defines the allowed profit margin range of operators. default: 0% - 100%",
-          "default": {
-            "maximum": "1",
-            "minimum": "0"
-          },
-          "allOf": [
-            {
-              "$ref": "#/definitions/RangedValue_for_Percent"
-            }
-          ]
        }
      },
      "additionalProperties": false
@@ -1439,38 +1415,6 @@
        }
      ]
    },
-    "RangedValue_for_Percent": {
-      "type": "object",
-      "required": [
-        "maximum",
-        "minimum"
-      ],
-      "properties": {
-        "maximum": {
-          "$ref": "#/definitions/Percent"
-        },
-        "minimum": {
-          "$ref": "#/definitions/Percent"
-        }
-      },
-      "additionalProperties": false
-    },
-    "RangedValue_for_Uint128": {
-      "type": "object",
-      "required": [
-        "maximum",
-        "minimum"
-      ],
-      "properties": {
-        "maximum": {
-          "$ref": "#/definitions/Uint128"
-        },
-        "minimum": {
-          "$ref": "#/definitions/Uint128"
-        }
-      },
-      "additionalProperties": false
-    },
    "Uint128": {
      "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
      "type": "string"
@@ -22,28 +22,6 @@
    "initial_rewarding_params": {
      "$ref": "#/definitions/InitialRewardingParams"
    },
-    "interval_operating_cost": {
-      "default": {
-        "maximum": "1000000000000000",
-        "minimum": "0"
-      },
-      "allOf": [
-        {
-          "$ref": "#/definitions/RangedValue_for_Uint128"
-        }
-      ]
-    },
-    "profit_margin": {
-      "default": {
-        "maximum": "1",
-        "minimum": "0"
-      },
-      "allOf": [
-        {
-          "$ref": "#/definitions/RangedValue_for_Percent"
-        }
-      ]
-    },
    "rewarding_denom": {
      "type": "string"
    },
@@ -130,42 +108,6 @@
          "$ref": "#/definitions/Decimal"
        }
      ]
-    },
-    "RangedValue_for_Percent": {
-      "type": "object",
-      "required": [
-        "maximum",
-        "minimum"
-      ],
-      "properties": {
-        "maximum": {
-          "$ref": "#/definitions/Percent"
-        },
-        "minimum": {
-          "$ref": "#/definitions/Percent"
-        }
-      },
-      "additionalProperties": false
-    },
-    "RangedValue_for_Uint128": {
-      "type": "object",
-      "required": [
-        "maximum",
-        "minimum"
-      ],
-      "properties": {
-        "maximum": {
-          "$ref": "#/definitions/Uint128"
-        },
-        "minimum": {
-          "$ref": "#/definitions/Uint128"
-        }
-      },
-      "additionalProperties": false
-    },
-    "Uint128": {
-      "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
-      "type": "string"
    }
  }
 }
@@ -77,18 +77,6 @@
        "minimum_mixnode_pledge"
      ],
      "properties": {
-        "interval_operating_cost": {
-          "description": "Defines the allowed interval operating cost range of operators. default: 0 - 1'000'000'000'000'000 (1 Billion native tokens - the total supply)",
-          "default": {
-            "maximum": "1000000000000000",
-            "minimum": "0"
-          },
-          "allOf": [
-            {
-              "$ref": "#/definitions/RangedValue_for_Uint128"
-            }
-          ]
-        },
        "minimum_gateway_pledge": {
          "description": "Minimum amount a gateway must pledge to get into the system.",
          "allOf": [
@@ -115,62 +103,6 @@
              "$ref": "#/definitions/Coin"
            }
          ]
-        },
-        "profit_margin": {
-          "description": "Defines the allowed profit margin range of operators. default: 0% - 100%",
-          "default": {
-            "maximum": "1",
-            "minimum": "0"
-          },
-          "allOf": [
-            {
-              "$ref": "#/definitions/RangedValue_for_Percent"
-            }
-          ]
-        }
-      },
-      "additionalProperties": false
-    },
-    "Decimal": {
-      "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
-      "type": "string"
-    },
-    "Percent": {
-      "description": "Percent represents a value between 0 and 100% (i.e. between 0.0 and 1.0)",
-      "allOf": [
-        {
-          "$ref": "#/definitions/Decimal"
-        }
-      ]
-    },
-    "RangedValue_for_Percent": {
-      "type": "object",
-      "required": [
-        "maximum",
-        "minimum"
-      ],
-      "properties": {
-        "maximum": {
-          "$ref": "#/definitions/Percent"
-        },
-        "minimum": {
-          "$ref": "#/definitions/Percent"
-        }
-      },
-      "additionalProperties": false
-    },
-    "RangedValue_for_Uint128": {
-      "type": "object",
-      "required": [
-        "maximum",
-        "minimum"
-      ],
-      "properties": {
-        "maximum": {
-          "$ref": "#/definitions/Uint128"
-        },
-        "minimum": {
-          "$ref": "#/definitions/Uint128"
        }
      },
      "additionalProperties": false
@@ -8,18 +8,6 @@
    "minimum_mixnode_pledge"
  ],
  "properties": {
-    "interval_operating_cost": {
-      "description": "Defines the allowed interval operating cost range of operators. default: 0 - 1'000'000'000'000'000 (1 Billion native tokens - the total supply)",
-      "default": {
-        "maximum": "1000000000000000",
-        "minimum": "0"
-      },
-      "allOf": [
-        {
-          "$ref": "#/definitions/RangedValue_for_Uint128"
-        }
-      ]
-    },
    "minimum_gateway_pledge": {
      "description": "Minimum amount a gateway must pledge to get into the system.",
      "allOf": [
@@ -46,18 +34,6 @@
          "$ref": "#/definitions/Coin"
        }
      ]
-    },
-    "profit_margin": {
-      "description": "Defines the allowed profit margin range of operators. default: 0% - 100%",
-      "default": {
-        "maximum": "1",
-        "minimum": "0"
-      },
-      "allOf": [
-        {
-          "$ref": "#/definitions/RangedValue_for_Percent"
-        }
-      ]
    }
  },
  "additionalProperties": false,
@@ -77,50 +53,6 @@
        }
      }
    },
-    "Decimal": {
-      "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
-      "type": "string"
-    },
-    "Percent": {
-      "description": "Percent represents a value between 0 and 100% (i.e. between 0.0 and 1.0)",
-      "allOf": [
-        {
-          "$ref": "#/definitions/Decimal"
-        }
-      ]
-    },
-    "RangedValue_for_Percent": {
-      "type": "object",
-      "required": [
-        "maximum",
-        "minimum"
-      ],
-      "properties": {
-        "maximum": {
-          "$ref": "#/definitions/Percent"
-        },
-        "minimum": {
-          "$ref": "#/definitions/Percent"
-        }
-      },
-      "additionalProperties": false
-    },
-    "RangedValue_for_Uint128": {
-      "type": "object",
-      "required": [
-        "maximum",
-        "minimum"
-      ],
-      "properties": {
-        "maximum": {
-          "$ref": "#/definitions/Uint128"
-        },
-        "minimum": {
-          "$ref": "#/definitions/Uint128"
-        }
-      },
-      "additionalProperties": false
-    },
    "Uint128": {
      "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
      "type": "string"
@@ -11,8 +11,7 @@ use cosmwasm_std::{
 };
 use mixnet_contract_common::error::MixnetContractError;
 use mixnet_contract_common::{
-    ContractState, ContractStateParams, ExecuteMsg, InstantiateMsg, Interval, MigrateMsg,
-    OperatingCostRange, ProfitMarginRange, QueryMsg,
+    ContractState, ContractStateParams, ExecuteMsg, InstantiateMsg, Interval, MigrateMsg, QueryMsg,
 };
 use nym_contracts_common::set_build_information;

@@ -25,8 +24,6 @@ fn default_initial_state(
    rewarding_validator_address: Addr,
    rewarding_denom: String,
    vesting_contract_address: Addr,
-    profit_margin: ProfitMarginRange,
-    interval_operating_cost: OperatingCostRange,
 ) -> ContractState {
    ContractState {
        owner,
@@ -43,8 +40,6 @@ fn default_initial_state(
                denom: rewarding_denom,
                amount: INITIAL_GATEWAY_PLEDGE_AMOUNT,
            },
-            profit_margin,
-            interval_operating_cost,
        },
    }
 }
@@ -76,8 +71,6 @@ pub fn instantiate(
        rewarding_validator_address.clone(),
        msg.rewarding_denom,
        vesting_contract_address,
-        msg.profit_margin,
-        msg.interval_operating_cost,
    );
    let starting_interval =
        Interval::init_interval(msg.epochs_in_interval, msg.epoch_duration, &env);
@@ -638,7 +631,7 @@ pub fn migrate(
 mod tests {
    use super::*;
    use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
-    use cosmwasm_std::{Decimal, Uint128};
+    use cosmwasm_std::Decimal;
    use mixnet_contract_common::reward_params::{IntervalRewardParams, RewardingParams};
    use mixnet_contract_common::{InitialRewardingParams, Percent};
    use std::time::Duration;
@@ -664,14 +657,6 @@ mod tests {
                rewarded_set_size: 543,
                active_set_size: 123,
            },
-            profit_margin: ProfitMarginRange {
-                minimum: "0.05".parse().unwrap(),
-                maximum: "0.95".parse().unwrap(),
-            },
-            interval_operating_cost: OperatingCostRange {
-                minimum: "1000".parse().unwrap(),
-                maximum: "10000".parse().unwrap(),
-            },
        };

        let sender = mock_info("sender", &[]);
@@ -693,14 +678,6 @@ mod tests {
                    denom: "uatom".into(),
                    amount: INITIAL_GATEWAY_PLEDGE_AMOUNT,
                },
-                profit_margin: ProfitMarginRange {
-                    minimum: Percent::from_percentage_value(5).unwrap(),
-                    maximum: Percent::from_percentage_value(95).unwrap(),
-                },
-                interval_operating_cost: OperatingCostRange {
-                    minimum: Uint128::new(1000),
-                    maximum: Uint128::new(10000),
-                },
            },
        };

@@ -45,8 +45,6 @@ pub(crate) mod tests {
                minimum_mixnode_delegation: None,
                minimum_mixnode_pledge: coin(123u128, "unym"),
                minimum_gateway_pledge: coin(456u128, "unym"),
-                profit_margin: Default::default(),
-                interval_operating_cost: Default::default(),
            },
        };

@@ -6,7 +6,7 @@ use cosmwasm_std::{Addr, Storage};
 use cosmwasm_std::{Coin, StdResult};
 use cw_storage_plus::Item;
 use mixnet_contract_common::error::MixnetContractError;
-use mixnet_contract_common::{ContractState, OperatingCostRange, ProfitMarginRange};
+use mixnet_contract_common::ContractState;

 pub(crate) const CONTRACT_STATE: Item<'_, ContractState> = Item::new(CONTRACT_STATE_KEY);

@@ -28,22 +28,6 @@ pub(crate) fn minimum_gateway_pledge(storage: &dyn Storage) -> Result<Coin, Mixn
        .map(|state| state.params.minimum_gateway_pledge)?)
 }

-pub(crate) fn profit_margin_range(
-    storage: &dyn Storage,
-) -> Result<ProfitMarginRange, MixnetContractError> {
-    Ok(CONTRACT_STATE
-        .load(storage)
-        .map(|state| state.params.profit_margin)?)
-}
-
-pub(crate) fn interval_oprating_cost_range(
-    storage: &dyn Storage,
-) -> Result<OperatingCostRange, MixnetContractError> {
-    Ok(CONTRACT_STATE
-        .load(storage)
-        .map(|state| state.params.interval_operating_cost)?)
-}
-
 #[allow(unused)]
 pub(crate) fn minimum_delegation_stake(
    storage: &dyn Storage,
@@ -121,8 +121,6 @@ pub mod tests {
                denom,
                amount: INITIAL_GATEWAY_PLEDGE_AMOUNT + Uint128::new(1234),
            },
-            profit_margin: Default::default(),
-            interval_operating_cost: Default::default(),
        };

        let initial_params = storage::CONTRACT_STATE
@@ -25,8 +25,7 @@ use crate::mixnodes::signature_helpers::verify_mixnode_bonding_signature;
 use crate::signing::storage as signing_storage;
 use crate::support::helpers::{
    ensure_bonded, ensure_epoch_in_progress_state, ensure_is_authorized, ensure_no_existing_bond,
-    ensure_no_pending_pledge_changes, ensure_operating_cost_within_range,
-    ensure_profit_margin_within_range, ensure_proxy_match, ensure_sent_by_vesting_contract,
+    ensure_no_pending_pledge_changes, ensure_proxy_match, ensure_sent_by_vesting_contract,
    validate_pledge,
 };

@@ -122,12 +121,6 @@ fn _try_add_mixnode(
    owner_signature: MessageSignature,
    proxy: Option<Addr>,
 ) -> Result<Response, MixnetContractError> {
-    // ensure the profit margin is within the defined range
-    ensure_profit_margin_within_range(deps.storage, cost_params.profit_margin_percent)?;
-
-    // ensure the operating cost is within the defined range
-    ensure_operating_cost_within_range(deps.storage, &cost_params.interval_operating_cost)?;
-
    // check if the pledge contains any funds of the appropriate denomination
    let minimum_pledge = mixnet_params_storage::minimum_mixnode_pledge(deps.storage)?;
    let pledge = validate_pledge(pledge, minimum_pledge)?;
@@ -484,12 +477,6 @@ pub(crate) fn _try_update_mixnode_cost_params(
    ensure_proxy_match(&proxy, &existing_bond.proxy)?;
    ensure_bonded(&existing_bond)?;

-    // ensure the profit margin is within the defined range
-    ensure_profit_margin_within_range(deps.storage, new_costs.profit_margin_percent)?;
-
-    // ensure the operating cost is within the defined range
-    ensure_operating_cost_within_range(deps.storage, &new_costs.interval_operating_cost)?;
-
    let cosmos_event = new_mixnode_pending_cost_params_update_event(
        existing_bond.mix_id,
        &owner,
@@ -111,14 +111,6 @@ pub(crate) fn try_reward_mixnode(
        );
    }

-    // make sure node's profit margin is within the allowed range,
-    // if not adjust it accordingly
-    let params = mixnet_params_storage::CONTRACT_STATE
-        .load(deps.storage)?
-        .params;
-    mix_rewarding.normalise_profit_margin(params.profit_margin);
-    mix_rewarding.normalise_operating_cost(params.interval_operating_cost);
-
    let rewarding_params = storage::REWARDING_PARAMS.load(deps.storage)?;
    let node_reward_params = NodeRewardParams::new(node_performance, node_status.is_active());

@@ -8,7 +8,6 @@ use cosmwasm_std::{wasm_execute, Addr, BankMsg, Coin, CosmosMsg, MessageInfo, Re
 use mixnet_contract_common::error::MixnetContractError;
 use mixnet_contract_common::mixnode::PendingMixNodeChanges;
 use mixnet_contract_common::{EpochState, EpochStatus, IdentityKeyRef, MixId, MixNodeBond};
-use nym_contracts_common::Percent;
 use vesting_contract_common::messages::ExecuteMsg as VestingContractExecuteMsg;

 // helper trait to attach `Msg` to a response if it's provided
@@ -432,34 +431,3 @@ pub(crate) fn decode_ed25519_identity_key(

    Ok(public_key)
 }
-
-pub(crate) fn ensure_profit_margin_within_range(
-    storage: &dyn Storage,
-    profit_margin: Percent,
-) -> Result<(), MixnetContractError> {
-    let range = mixnet_params_storage::profit_margin_range(storage)?;
-    if !range.within_range(profit_margin) {
-        return Err(MixnetContractError::ProfitMarginOutsideRange {
-            provided: profit_margin,
-            range,
-        });
-    }
-
-    Ok(())
-}
-
-pub fn ensure_operating_cost_within_range(
-    storage: &dyn Storage,
-    operating_cost: &Coin,
-) -> Result<(), MixnetContractError> {
-    let range = mixnet_params_storage::interval_oprating_cost_range(storage)?;
-    if !range.within_range(operating_cost.amount) {
-        return Err(MixnetContractError::OperatingCostOutsideRange {
-            denom: operating_cost.denom.clone(),
-            provided: operating_cost.amount,
-            range,
-        });
-    }
-
-    Ok(())
-}
@@ -1258,8 +1258,6 @@ pub mod test_helpers {
            epochs_in_interval: 720,
            epoch_duration: Duration::from_secs(60 * 60),
            initial_rewarding_params: initial_rewarding_params(),
-            profit_margin: Default::default(),
-            interval_operating_cost: Default::default(),
        };
        let env = mock_env();
        let info = mock_info("creator", &[]);
@@ -3,7 +3,7 @@ title = "Nym Docs"
 authors = ["Max Hampshire, Serinko, Alexia Lorenza Martinel"]
 description = "Nym technical documentation"
 language = "en"
-multilingual = false                                          # for the moment - ideally work on chinese, brazillian ,portugese spanish next
+multilingual = false # for the moment - ideally work on chinese, brazillian ,portugese spanish next
 src = "src"

 [rust]
@@ -14,19 +14,17 @@ edition = "2018"
 #################

 [preprocessor.theme]
-pagetoc = true
-sidebar-width = "280px"
-content-max-width = "80%"
-root-font-size = "70%"
-# if you need to change anything in the index.hbs file you need to turn this to `false`, rebuild the book, 
-# probably remove the additional `comment` that gets appended to the header, and then change this back to `true`. 
-# this is because of a bug in the `mdbook-theme` plugin
-turn-off = true
-
+sidebar-width             = "280px"
+content-max-width         = "70%"
+content-main-margin-left  = "5%"
+content-main-margin-right = "5%"
+root-font-size            = "70%"
+# DO NOT CHANGE or you might overwrite the custom hbs file
+turn-off = false

 [preprocessor.admonish]
 command = "mdbook-admonish"
-assets_version = "3.0.2"    # do not edit: managed by `mdbook-admonish install`
+assets_version = "3.0.2" # do not edit: managed by `mdbook-admonish install`

 # https://gitlab.com/tglman/mdbook-variables/
 [preprocessor.variables.variables]
@@ -55,56 +53,52 @@ renderer = ["html"]
 #########

 [build]
-build-dir = "book"               # the directory where the output is placed
-create-missing = true            # whether or not to create missing pages
-use-default-preprocessors = true # use the default preprocessors
-extra-watch-dirs = []            # directories to watch for triggering builds
+build-dir = "book"                # the directory where the output is placed
+create-missing = true             # whether or not to create missing pages
+use-default-preprocessors = true  # use the default preprocessors
+extra-watch-dirs = []             # directories to watch for triggering builds

 ##########
 # OUTPUT #
 ##########

 [output.html]
-theme = "themes"
+theme         = "nym_themes"
 default-theme = "coal"
 preferred-dark-theme = "coal"
 curly-quotes = true
 copy-fonts = true
 no-section-label = false
-additional-css = [
-  "./themes/custom.css",
-  "./themes/mdbook-admonish.css",
-  "./themes/pagetoc.css",
-]
-additional-js = ["./themes/pagetoc.js"]
+additional-css = ["./nym_themes/custom.css", "./nym_themes/mdbook-admonish.css", "./nym_themes/pagetoc.css"]
+additional-js  = ["./nym_themes/pagetoc.js"]
 git-repository-url = "https://github.com/nymtech/nym"
 git-repository-icon = "fa-github"
 input-404 = "not-found.md"

 [output.html.fold]
-enable = true # whether or not to enable section folding
-level = 0     # the depth to start folding
+enable = true    # whether or not to enable section folding
+level = 0        # the depth to start folding

 # controlling rust sample code blocks
 [output.html.playground]
-editable = false    # allows editing the source code
-copyable = true     # include the copy button for copying code snippets
-copy-js = true      # includes the JavaScript for the code editor
-line-numbers = true # displays line numbers for editable code
-runnable = true     # displays a run button for rust code
+editable = false         # allows editing the source code
+copyable = true          # include the copy button for copying code snippets
+copy-js = true           # includes the JavaScript for the code editor
+line-numbers = true      # displays line numbers for editable code
+runnable = true          # displays a run button for rust code

 # options for the built in text search
 [output.html.search]
-enable = true           # enables the search feature
-limit-results = 30      # maximum number of search results
-teaser-word-count = 30  # number of words used for a search result teaser
-use-boolean-and = true  # multiple search terms must all match
-boost-title = 2         # ranking boost factor for matches in headers
-boost-hierarchy = 1     # ranking boost factor for matches in page names
-boost-paragraph = 1     # ranking boost factor for matches in text
-expand = true           # partial words will match longer terms
-heading-split-level = 3 # link results to heading levels
-copy-js = true          # include Javascript code for search
+enable = true            # enables the search feature
+limit-results = 30       # maximum number of search results
+teaser-word-count = 30   # number of words used for a search result teaser
+use-boolean-and = true   # multiple search terms must all match
+boost-title = 2          # ranking boost factor for matches in headers
+boost-hierarchy = 1      # ranking boost factor for matches in page names
+boost-paragraph = 1      # ranking boost factor for matches in text
+expand = true            # partial words will match longer terms
+heading-split-level = 3  # link results to heading levels
+copy-js = true           # include Javascript code for search

 [output.linkcheck]
 warning-policy = "warn"
@@ -6,7 +6,7 @@
    --sidebar-resize-indicator-width: 8px;
    --sidebar-resize-indicator-space: 2px;
    --page-padding: 15px;
-    --content-max-width: 80%;
+    --content-max-width: 70%;
    --menu-bar-height: 40px;
    --mono-font: "Source Code Pro", Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace, monospace;
    --code-font-size: 0.875em /* please adjust the ace font size accordingly in editor.js */
@@ -8,12 +8,10 @@
  --sidebar-active: #fb6e4e;
  --icons-hover: #fb6e4e;
  --links: #fb6e4e;
-
  ::selection {
    color: #121726;
    background-color: #c5573d;
  }
-
  select option {
    background-color: #121726;
  }
@@ -23,18 +21,17 @@
  --sidebar-active: #fb6e4e;
  --icons-hover: #fb6e4e;
  --links: #fb6e4e;
-
  ::selection {
-    color: #f2f2f2;
+    color:#f2f2f2;
    background-color: #c5573d;
  }
 }

 /*properly centering the title given the additional header items*/
 .menu-title {
-  left: 45%;
+  position: absolute;
+  left: 50%;
 }
-
 .menu-bar .a:hover,

 /*necessary because of ^*/
@@ -159,14 +159,20 @@
                        </ul>

                        <!-- CUSTOM -->
-                        <select id="dropdown-menu" class="icon-button">
+                        <select id="dropdown-menu3" class="icon-button">
+                            <option value="">Network Protocol</option>
                            <option value="https://nymtech.net/docs">Network Docs</option>
                            <option value="https://nymtech.net/learn/papers">Academic Papers</option>
-                            <option value="">--------</option>
+                        </select>
+
+                        <select id="dropdown-menu" class="icon-button">
+                            <option value="">Developer Docs</option>
                            <option value="https://nymtech.net/developers">Dev Portal</option>
                            <option value="https://nymtech.net/docs/sdk/rust/rust.html">Rust SDK</option>
                            <option value="https://sdk.nymtech.net">Typescript SDK</option>
-                            <option value="">--------</option>
+                        </select>
+
+                        <select id="dropdown-menu2" class="icon-button">
                            <option value="">Setup Guides</option>
                            <option value="https://nymtech.net/operators">Operators</option>
                            <option value="https://nymtech.net/developers/nymvpn/intro.html">NymVPN Testing</option>
@@ -180,7 +186,24 @@
                                }
                            });
                        </script>
-                        
+
+                        <script>
+                            document.getElementById('dropdown-menu2').addEventListener('change', function() {
+                                const selected = this.options[this.selectedIndex];
+                                if (selected.value !== '') {
+                                    window.location.href = selected.value;
+                                }
+                            });
+                        </script>
+
+                        <script>
+                            document.getElementById('dropdown-menu3').addEventListener('change', function() {
+                                const selected = this.options[this.selectedIndex];
+                                if (selected.value !== '') {
+                                    window.location.href = selected.value;
+                                }
+                            });
+                        </script>
                        <!-- END CUSTOM -->
                    </div>

@@ -240,8 +263,7 @@
                                <nav class="pagetoc"></nav>
                            </div>
                            <div class="content-wrap">
-
-                        {{{ content }}}
+                                {{{ content }}}
                            </div>
                        </main>
                    </main>
@@ -1,59 +1,94 @@
 #
+# Summary
+
 - [Introduction](introduction.md)
- [Clients Overview - Start Here!](clients-overview.md)

-# SDKs 
- [Rust SDK](sdk/rust/rust.md)
-	- [Message Types](sdk/rust/message-types.md)
-	- [Message Helpers](sdk/rust/message-helpers.md)
-	- [Troubleshooting](sdk/rust/troubleshooting.md)
-	- [Examples](sdk/rust/examples.md)
-		- [Simple Send](sdk/rust/examples/simple.md)
-		- [Create and Store Keys](sdk/rust/examples/keys.md)
-		- [Manual Storage](sdk/rust/examples/storage.md)
-		- [Anonymous Replies](sdk/rust/examples/surbs.md)
-		- [Use Custom Network Topology](sdk/rust/examples/custom-network.md)
-		- [Socks Proxy](sdk/rust/examples/socks.md)
-		- [Split Send and Receive](sdk/rust/examples/split-send.md)
-		- [Testnet Bandwidth Cred](sdk/rust/examples/credential.md)
-		- [Example Cargo file](sdk/rust/examples/cargo.md)
- [Typescript SDK](sdk/typescript.md)
+# Infrastructure

-# Binaries
- [Pre-built Binaries](binaries/pre-built-binaries.md)
- [Building from Source](binaries/building-nym.md)
+- [What is Nym?](infrastructure/nym.md)
+- [Nym vs Other Systems](infrastructure/nym-vs-others.md)
+- [Node Types](infrastructure/node-types.md)

-# Standalone Clients
- [Websocket Client](clients/websocket-client.md)
-	- [Setup & Run](clients/websocket/setup.md)
-	- [Configuration](clients/websocket/config.md)
-	- [Using Your Client](clients/websocket/usage.md)
-	- [Examples](clients/websocket/examples.md)
- [Socks5 Client](clients/socks5-client.md)
-  - [Setup & Run](clients/socks5/setup.md) 
-  - [Using Your Client](clients/socks5/usage.md)
- [Webassembly Client](clients/webassembly-client.md)
+# Quickstart

-# Tutorials
- [Stub: Updates Coming Soon!](./tutorials/coming-soon.md)
+- [Overview](quickstart/overview.md)
+- [Chat demo (webapp)](quickstart/chat-demo.md)
+- [Coconut Credential Playground (webapp)](quickstart/cred-playground.md)
+- [SOCKS Proxy (CLI)](quickstart/socks-proxy.md)
+
+# User Manuals
+
+- [NymVPN alpha](nymvpn/intro.md)
+    - [CLI](nymvpn/cli.md)
+
+<!-- OUTDATED STUFF:
+- [NymConnect X Monero](tutorials/monero.md)
+- [NymConnect X Matrix](tutorials/matrix.md)
+- [NymConnect X Telegram](tutorials/telegram.md)
+- [NymConnect X Electrum](tutorials/electrum.md)
+- [NymConnect X Firo wallet](tutorials/firo.md)
+-->

 # Code Examples
+
 - [Custom Service Providers](examples/custom-services.md)
 - [Apps Using Network Requesters](examples/using-nrs.md)
 - [Browser only](examples/browser-only.md)
 - [Monorepo examples](examples/monorepo-examples.md)

 # Integrations
+
 - [Integration Options](integrations/integration-options.md)
 [//]: # (- [Mixnet Integration]&#40;integrations/mixnet-integration.md&#41;)
 - [Payment Integration](integrations/payment-integration.md)

-# FAQ
- [Integrations](faq/integrations-faq.md)
+# Tutorials

-# User Manuals
- [NymVPN alpha](nymvpn/intro.md)
-    - [CLI](nymvpn/cli.md)
+- [Rust SDK](tutorials/rust-sdk.md)
+	- [Blockchain Service pt1](tutorials/cosmos-service/intro.md)
+		- [Tutorial Overview](tutorials/cosmos-service/overview.md)
+		- [Preparing Your Environment](tutorials/cosmos-service/preparing-env.md)
+		- [Preparing Your Lib](tutorials/cosmos-service/lib.md)
+		- [Preparing Your Client](tutorials/cosmos-service/client.md)
+		- [Preparing Your Client pt2](tutorials/cosmos-service/client-src.md)
+		- [Preparing Your Service](tutorials/cosmos-service/service.md)
+		- [Preparing Your Service pt2](tutorials/cosmos-service/service-src.md)
+		- [Querying the Chain](tutorials/cosmos-service/querying.md)
+
+- [Typescript](tutorials/typescript.md)
+    - [Simple Service Provider](tutorials/simple-service-provider/simple-service-provider.md)
+      	- [Tutorial Overview](tutorials/simple-service-provider/overview.md)
+      	- [Preparing Your User Client Environment](tutorials/simple-service-provider/preparating-env.md)
+      	- [Building Your User Client](tutorials/simple-service-provider/user-client.md)
+      	- [Preparing Your Service Provider Environment](tutorials/simple-service-provider/preparating-env2.md)
+      	- [Building Your Service Provider](tutorials/simple-service-provider/service-provider.md)
+      	- [Sending a Message Through the Mixnet](tutorials/simple-service-provider/sending-message.md)
+
+[//]: # (TODO make generic )
+[//]: # (# Shipyard Builders Hackathon 2023 )
+[//]: # (- [General Info & Resources]&#40;shipyard/general.md&#41;)
+[//]: # (- [Hackathon Challenges]&#40;shipyard/challenges-overview.md&#41;)
+[//]: # (- [A Note on Infrastructure]&#40;shipyard/infra.md&#41;)
+[//]: # (- [Submission Guidelines]&#40;shipyard/guidelines.md&#41;)
+
+<!-- Commenting out as a lot of the stuff is deprecated, can be purged as a part of the large overhaul
+# Events
+
+- [Web3Privacy Now](./events/web3-privacy.md)
+- [HCPP23-serinko](./events/hcpp23-serinko.md)
+- [HCPP23-max](./events/hcpp23-max.md)
+-->
+
+# FAQ
+- [General](faq/general-faq.md)
+- [Integrations](faq/integrations-faq.md)
+- [Rewards & Token](faq/rewards-faq.md)
+
+# Community Resources
+
+- [Nym DevRel AMAs](community-resources/ama.md)
+- [Community Applications and Guides](community-resources/community-applications-and-guides.md)
+- [Change Service Grantee Information](info-request.md)

 ---
 # Misc.
@@ -1,61 +0,0 @@
-# Building from Source
-
-> Nym runs on Mac OS X, Linux, and Windows. All nodes **except the Desktop Wallet and NymConnect** on Windows should be considered experimental - it works fine if you're an app developer but isn't recommended for running nodes.
-
-## Building Nym
-Nym has two main codebases:
-
- the [Nym platform](https://github.com/nymtech/nym), written in Rust. This contains all of our code _except_ for the validators.
- the [Nym validators](https://github.com/nymtech/nyxd), written in Go.
-
-> This page details how to build the main Nym platform code.
-
-## Prerequisites
- Debian/Ubuntu: `pkg-config`, `build-essential`, `libssl-dev`, `curl`, `jq`, `git`
-
-```
-apt install pkg-config build-essential libssl-dev curl jq git
-```
-
- Arch/Manjaro: `base-devel`
-
-```
-pacman -S base-devel
-```
-
- Mac OS X: `pkg-config` , `brew`, `openss1`, `protobuf`, `curl`, `git`
-Running the following the script installs Homebrew and the above dependencies:
-
-```
-/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-```
-
- `Rust & cargo >= {{minimum_rust_version}}`
-
-We recommend using the [Rust shell script installer](https://www.rust-lang.org/tools/install). Installing cargo from your package manager (e.g. `apt`) is not recommended as the packaged versions are usually too old.
-
-If you really don't want to use the shell script installer, the [Rust installation docs](https://forge.rust-lang.org/infra/other-installation-methods.html) contain instructions for many platforms.
-
-## Download and build Nym binaries
-The following commands will compile binaries into the `nym/target/release` directory:
-
-```sh
-rustup update
-git clone https://github.com/nymtech/nym.git
-cd nym
-
-git reset --hard # in case you made any changes on your branch
-git pull # in case you've checked it out before
-
-git checkout master # master branch has the latest release version: `develop` will most likely be incompatible with deployed public networks
-
-cargo build --release # build your binaries with **mainnet** configuration
-```
-
-Quite a bit of stuff gets built. The key working parts for devs are the Client binaries and the CLI tool: 
-
-* [websocket client](../clients/websocket-client.md): `nym-client`
-* [socks5 client](../clients/socks5-client.md): `nym-socks5-client`
-* [nym-cli tool](https://nymtech.net/docs/tools/nym-cli.md): `nym-cli`
-
-> You cannot build from GitHub's .zip or .tar.gz archive files on the releases page - the Nym build scripts automatically include the current git commit hash in the built binary during compilation, so the build will fail if you use the archive code (which isn't a Git repository). Check the code out from github using `git clone` instead.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Simon Wicky	1e74de2d67	domain fronting on the run part	2024-07-18 14:37:12 +02:00
Simon Wicky	a886715948	ugly first try at domain fronting	2024-07-16 15:11:48 +02:00