Address part of PR comments

fmt
Log decoding error
2024-06-25 15:01:18 +02:00 · 2024-06-19 13:11:18 +02:00 · 2024-06-19 13:09:34 +02:00 · 2024-06-18 19:54:39 +02:00 · 2024-06-18 11:58:03 +02:00 · 2024-06-18 10:30:56 +02:00
285 changed files with 3763 additions and 6138 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

@@ -104,9 +104,12 @@ jobs:
          name: nym-binaries-artifacts
          path: |
            target/release/nym-client
+            target/release/nym-gateway
+            target/release/nym-mixnode
            target/release/nym-socks5-client
            target/release/nym-api
            target/release/nym-network-requester
+            target/release/nym-network-statistics
            target/release/nym-cli
            target/release/nymvisor
            target/release/nym-node
@@ -121,9 +124,12 @@ jobs:
          OUTPUT_DIR: ci-builds/${{ github.ref_name }}
        run: |
          cp target/release/nym-client $OUTPUT_DIR
+          cp target/release/nym-gateway $OUTPUT_DIR
+          cp target/release/nym-mixnode $OUTPUT_DIR
          cp target/release/nym-socks5-client $OUTPUT_DIR
          cp target/release/nym-api $OUTPUT_DIR
          cp target/release/nym-network-requester $OUTPUT_DIR
+          cp target/release/nym-network-statistics $OUTPUT_DIR
          cp target/release/nymvisor $OUTPUT_DIR
          cp target/release/nym-node $OUTPUT_DIR
          cp target/release/nym-cli $OUTPUT_DIR
@@ -6,6 +6,7 @@ on:
      - 'clients/**'
      - 'common/**'
      - 'explorer-api/**'
+      - 'ephemera/**'
      - 'gateway/**'
      - 'integrations/**'
      - 'mixnode/**'
@@ -23,6 +24,7 @@ on:
      - 'clients/**'
      - 'common/**'
      - 'explorer-api/**'
+      - 'ephemera/**'
      - 'gateway/**'
      - 'integrations/**'
      - 'mixnode/**'
@@ -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

@@ -27,17 +27,23 @@ jobs:
      release_id: ${{ steps.create-release.outputs.id }}
      release_date: ${{ fromJSON(steps.create-release.outputs.assets)[0].published_at }}
      client_hash: ${{ steps.binary-hashes.outputs.client_hash }}
+      mixnode_hash: ${{ steps.binary-hashes.outputs.mixnode_hash }}
+      gateway_hash: ${{ steps.binary-hashes.outputs.gateway_hash }}
      nymvisor_hash: ${{ steps.binary-hashes.outputs.nymvisor_hash }}
      nymnode_hash: ${{ steps.binary-hashes.outputs.nymnode_hash }}
      socks5_hash: ${{ steps.binary-hashes.outputs.socks5_hash }}
      netreq_hash: ${{ steps.binary-hashes.outputs.netreq_hash }}
      cli_hash: ${{ steps.binary-hashes.outputs.cli_hash }}
+      netstat_hash: ${{ steps.binary-hashes.outputs.netstat_hash }}
      client_version: ${{ steps.binary-versions.outputs.client_version }}
+      mixnode_version: ${{ steps.binary-versions.outputs.mixnode_version }}
+      gateway_version: ${{ steps.binary-versions.outputs.gateway_version }}
      nymvisor_version: ${{ steps.binary-versions.outputs.nymvisor_version }}
      nymnode_version: ${{ steps.binary-versions.outputs.nymnode_version }}
      socks5_version: ${{ steps.binary-versions.outputs.socks5_version }}
      netreq_version: ${{ steps.binary-versions.outputs.netreq_version }}
      cli_version: ${{ steps.binary-versions.outputs.cli_version }}
+      netstat_version: ${{ steps.binary-versions.outputs.netstat_version }}

    steps:
      - uses: actions/checkout@v3
@@ -69,9 +75,12 @@ jobs:
          path: |
            target/release/explorer-api
            target/release/nym-client
+            target/release/nym-gateway
+            target/release/nym-mixnode
            target/release/nym-socks5-client
            target/release/nym-api
            target/release/nym-network-requester
+            target/release/nym-network-statistics
            target/release/nym-cli
            target/release/nymvisor
            target/release/nym-node
@@ -85,9 +94,12 @@ jobs:
          files: |
            target/release/explorer-api
            target/release/nym-client
+            target/release/nym-gateway
+            target/release/nym-mixnode
            target/release/nym-socks5-client
            target/release/nym-api
            target/release/nym-network-requester
+            target/release/nym-network-statistics
            target/release/nym-cli
            target/release/nymvisor
            target/release/nym-node
@@ -4,78 +4,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://

 ## [Unreleased]

-## [2024.7-doubledecker] (2024-07-04)
-
- Add an early return in `parse_raw_str_logs` for empty raw log strings. ([#4686])
- Bump braces from 3.0.2 to 3.0.3 in /wasm/mix-fetch/internal-dev ([#4672])
- add expiry returned on import ([#4670])
- [bugfix] missing rustls feature ([#4666])
- Bump ws from 8.13.0 to 8.17.1 in /wasm/client/internal-dev-node ([#4665])
- Bump braces from 3.0.2 to 3.0.3 in /clients/native/examples/js-examples/websocket ([#4663])
- Bump ws from 8.14.2 to 8.17.1 in /sdk/typescript/packages/nodejs-client ([#4662])
- Update setup.md ([#4661])
- New clippy lints ([#4660])
- Bump braces from 3.0.2 to 3.0.3 in /nym-api/tests ([#4659])
- Bump braces from 3.0.2 to 3.0.3 in /docker/typescript_client/upload_contract ([#4658])
- Update vps-setup.md ([#4656])
- Update configuration.md ([#4655])
- Remove old PR template ([#4639])
-
-[#4686]: https://github.com/nymtech/nym/pull/4686
-[#4672]: https://github.com/nymtech/nym/pull/4672
-[#4670]: https://github.com/nymtech/nym/pull/4670
-[#4666]: https://github.com/nymtech/nym/pull/4666
-[#4665]: https://github.com/nymtech/nym/pull/4665
-[#4663]: https://github.com/nymtech/nym/pull/4663
-[#4662]: https://github.com/nymtech/nym/pull/4662
-[#4661]: https://github.com/nymtech/nym/pull/4661
-[#4660]: https://github.com/nymtech/nym/pull/4660
-[#4659]: https://github.com/nymtech/nym/pull/4659
-[#4658]: https://github.com/nymtech/nym/pull/4658
-[#4656]: https://github.com/nymtech/nym/pull/4656
-[#4655]: https://github.com/nymtech/nym/pull/4655
-[#4639]: https://github.com/nymtech/nym/pull/4639
-
-## [2024.6-chomp] (2024-06-25)
-
- Remove additional code as part of Ephemera Purge and SP and contracts ([#4650])
- bugfix: make sure nym-api can handle non-cw2 (or without detailed build info) compliant contracts ([#4648])
- introduced a flag to accept toc and exposed it via self-described API ([#4647])
- bugfix: make sure to return an error on invalid public ip ([#4646])
- Add ci check for PR having an assigned milestone ([#4644])
- Removed ephemera code ([#4642])
- Remove stale peers ([#4640])
- Add generic wg private network routing ([#4636])
- Feature/new node endpoints ([#4635])
- standarised ContractBuildInformation and added it to all contracts ([#4631])
- validate nym-node public ips on startup ([#4630])
- Bump defguard wg ([#4625])
- Fix cargo warnings ([#4624])
- Update kernel peers on peer modification ([#4622])
- Handle v6 and v7 requests in the IPR, but reply with v6 ([#4620])
- fix typo ([#4619])
- Update crypto and rand crates ([#4607])
- Purge name service and service provider directory contracts ([#4603])
-
-[#4650]: https://github.com/nymtech/nym/pull/4650
-[#4648]: https://github.com/nymtech/nym/pull/4648
-[#4647]: https://github.com/nymtech/nym/pull/4647
-[#4646]: https://github.com/nymtech/nym/pull/4646
-[#4644]: https://github.com/nymtech/nym/pull/4644
-[#4642]: https://github.com/nymtech/nym/pull/4642
-[#4640]: https://github.com/nymtech/nym/pull/4640
-[#4636]: https://github.com/nymtech/nym/pull/4636
-[#4635]: https://github.com/nymtech/nym/pull/4635
-[#4631]: https://github.com/nymtech/nym/pull/4631
-[#4630]: https://github.com/nymtech/nym/pull/4630
-[#4625]: https://github.com/nymtech/nym/pull/4625
-[#4624]: https://github.com/nymtech/nym/pull/4624
-[#4622]: https://github.com/nymtech/nym/pull/4622
-[#4620]: https://github.com/nymtech/nym/pull/4620
-[#4619]: https://github.com/nymtech/nym/pull/4619
-[#4607]: https://github.com/nymtech/nym/pull/4607
-[#4603]: https://github.com/nymtech/nym/pull/4603
-
 ## [2024.5-ragusa] (2024-05-22)

 - Feature/nym node api location ([#4605])
@@ -2093,14 +2093,14 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"

 [[package]]
 name = "explorer-api"
-version = "1.1.36"
+version = "1.1.34"
 dependencies = [
 "chrono",
 "clap 4.5.4",
 "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"
@@ -3849,7 +3858,7 @@ dependencies = [

 [[package]]
 name = "nym-api"
-version = "1.1.40"
+version = "1.1.38"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -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"
@@ -4057,7 +4018,7 @@ dependencies = [

 [[package]]
 name = "nym-cli"
-version = "1.1.38"
+version = "1.1.36"
 dependencies = [
 "anyhow",
 "base64 0.13.1",
@@ -4136,7 +4097,7 @@ dependencies = [

 [[package]]
 name = "nym-client"
-version = "1.1.37"
+version = "1.1.35"
 dependencies = [
 "bs58 0.5.1",
 "clap 4.5.4",
@@ -4177,6 +4138,7 @@ version = "1.1.15"
 dependencies = [
 "async-trait",
 "base64 0.21.7",
+ "bincode",
 "bs58 0.5.1",
 "cfg-if",
 "clap 4.5.4",
@@ -4219,6 +4181,7 @@ dependencies = [
 "tokio",
 "tokio-stream",
 "tokio-tungstenite",
+ "tokio-util",
 "tungstenite",
 "url",
 "wasm-bindgen",
@@ -4292,6 +4255,7 @@ dependencies = [
 "serde-wasm-bindgen 0.6.5",
 "serde_json",
 "thiserror",
+ "tokio",
 "tsify",
 "wasm-bindgen",
 "wasm-bindgen-futures",
@@ -4321,7 +4285,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 +4526,6 @@ dependencies = [
 "ipnetwork 0.16.0",
 "log",
 "nym-api-requests",
- "nym-authenticator",
 "nym-bin-common",
 "nym-config",
 "nym-credentials",
@@ -4577,6 +4540,7 @@ dependencies = [
 "nym-node-http-api",
 "nym-pemstore",
 "nym-sphinx",
+ "nym-statistics-common",
 "nym-task",
 "nym-types",
 "nym-validator-client",
@@ -4672,7 +4636,6 @@ version = "0.1.0"
 dependencies = [
 "async-trait",
 "http 1.1.0",
- "nym-bin-common",
 "reqwest 0.12.4",
 "serde",
 "serde_json",
@@ -4950,7 +4913,7 @@ dependencies = [

 [[package]]
 name = "nym-network-requester"
-version = "1.1.38"
+version = "1.1.36"
 dependencies = [
 "addr",
 "anyhow",
@@ -4979,6 +4942,7 @@ dependencies = [
 "nym-socks5-proxy-helpers",
 "nym-socks5-requests",
 "nym-sphinx",
+ "nym-statistics-common",
 "nym-task",
 "nym-types",
 "pretty_env_logger",
@@ -4995,6 +4959,7 @@ dependencies = [
 "time",
 "tokio",
 "tokio-tungstenite",
+ "tokio-util",
 "url",
 "zeroize",
 ]
@@ -5018,7 +4983,7 @@ dependencies = [

 [[package]]
 name = "nym-node"
-version = "1.1.4"
+version = "1.1.2"
 dependencies = [
 "anyhow",
 "bip39",
@@ -5030,7 +4995,6 @@ dependencies = [
 "cupid",
 "humantime-serde",
 "ipnetwork 0.16.0",
- "nym-authenticator",
 "nym-bin-common",
 "nym-client-core-config-types",
 "nym-config",
@@ -5054,7 +5018,7 @@ dependencies = [
 "sysinfo 0.30.12",
 "thiserror",
 "tokio",
- "toml 0.8.14",
+ "toml 0.8.12",
 "tracing",
 "url",
 "zeroize",
@@ -5200,7 +5164,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",
@@ -5281,7 +5245,7 @@ dependencies = [

 [[package]]
 name = "nym-socks5-client"
-version = "1.1.37"
+version = "1.1.35"
 dependencies = [
 "bs58 0.5.1",
 "clap 4.5.4",
@@ -5300,7 +5264,6 @@ dependencies = [
 "nym-socks5-client-core",
 "nym-sphinx",
 "nym-topology",
- "nym-validator-client",
 "rand 0.8.5",
 "serde",
 "serde_json",
@@ -5341,6 +5304,7 @@ dependencies = [
 "tap",
 "thiserror",
 "tokio",
+ "tokio-util",
 "url",
 ]

@@ -5400,6 +5364,7 @@ dependencies = [
 name = "nym-sphinx"
 version = "0.1.0"
 dependencies = [
+ "bincode",
 "log",
 "nym-crypto",
 "nym-mixnet-contract-common",
@@ -5416,8 +5381,10 @@ dependencies = [
 "nym-topology",
 "rand 0.8.5",
 "rand_distr",
+ "serde",
 "thiserror",
 "tokio",
+ "tokio-util",
 ]

 [[package]]
@@ -5504,6 +5471,7 @@ dependencies = [
 "nym-sphinx-addressing",
 "nym-sphinx-params",
 "nym-sphinx-types",
+ "serde",
 "thiserror",
 ]

@@ -5546,6 +5514,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"
@@ -5567,6 +5549,7 @@ version = "0.1.0"
 dependencies = [
 "futures",
 "log",
+ "serde",
 "thiserror",
 "tokio",
 "wasm-bindgen",
@@ -5620,7 +5603,7 @@ dependencies = [
 "cosmwasm-std",
 "eyre",
 "hmac",
- "itertools 0.12.1",
+ "itertools 0.11.0",
 "log",
 "nym-config",
 "nym-crypto",
@@ -5659,7 +5642,7 @@ dependencies = [
 "eyre",
 "flate2",
 "futures",
- "itertools 0.12.1",
+ "itertools 0.10.5",
 "log",
 "nym-api-requests",
 "nym-coconut",
@@ -5794,7 +5777,7 @@ dependencies = [

 [[package]]
 name = "nymvisor"
-version = "0.1.3"
+version = "0.1.1"
 dependencies = [
 "anyhow",
 "bytes",
@@ -7621,9 +7604,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",
 ]
@@ -8643,21 +8626,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",
 ]
@@ -8677,9 +8660,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://discord.gg/FaTJb8q8)
+* 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.
@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.37"
+version = "1.1.35"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"
@@ -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(())
@@ -114,9 +114,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));
@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.37"
+version = "1.1.35"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
 edition = "2021"
@@ -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,8 @@ license.workspace = true

 [dependencies]
 async-trait = { workspace = true }
-base64 = { workspace = true }
+bincode = { workspace = true }
+base64 = "0.21.2"
 bs58 = { workspace = true }
 cfg-if = { workspace = true }
 clap = { workspace = true, optional = true }
@@ -20,12 +21,13 @@ 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 }
 url = { workspace = true, features = ["serde"] }
 tokio = { workspace = true, features = ["macros"] }
+tokio-util = { workspace = true, features = ["codec"] }
 time = { workspace = true }
 zeroize = { workspace = true }

@@ -47,7 +49,9 @@ nym-validator-client = { path = "../client-libs/validator-client", default-featu
 nym-task = { path = "../task" }
 nym-credential-storage = { path = "../credential-storage" }
 nym-network-defaults = { path = "../network-defaults" }
-nym-client-core-config-types = { path = "./config-types", features = ["disk-persistence"] }
+nym-client-core-config-types = { path = "./config-types", features = [
+    "disk-persistence",
+] }
 nym-client-core-surb-storage = { path = "./surb-storage" }
 nym-client-core-gateways-storage = { path = "./gateways-storage" }

@@ -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).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;

@@ -97,7 +96,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,
@@ -165,8 +163,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).await?
    };

    let gateway_setup = GatewaySetup::New {
@@ -35,6 +35,7 @@ use crate::init::{
 };
 use crate::{config, spawn_future};
 use futures::channel::mpsc;
+use futures::SinkExt;
 use log::{debug, error, info, warn};
 use nym_bandwidth_controller::BandwidthController;
 use nym_client_core_gateways_storage::{GatewayDetails, GatewaysDetailsStore};
@@ -53,12 +54,13 @@ 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;
 use std::path::Path;
 use std::sync::Arc;
+use tokio_util::sync::{PollSendError, PollSender};
 use url::Url;

 #[cfg(all(
@@ -78,10 +80,7 @@ pub struct ClientInput {
 }

 impl ClientInput {
-    pub async fn send(
-        &self,
-        message: InputMessage,
-    ) -> Result<(), tokio::sync::mpsc::error::SendError<InputMessage>> {
+    pub async fn send(&mut self, message: InputMessage) -> Result<(), PollSendError<InputMessage>> {
        self.input_sender.send(message).await
    }
 }
@@ -184,7 +183,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 +206,6 @@ where
            custom_topology_provider: None,
            custom_gateway_transceiver: None,
            shutdown: None,
-            user_agent: None,
            setup_method: GatewaySetup::MustLoad { gateway_id: None },
        }
    }
@@ -252,12 +249,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,7 +466,6 @@ where
        custom_provider: Option<Box<dyn TopologyProvider + Send + Sync>>,
        config_topology: config::Topology,
        nym_api_urls: Vec<Url>,
-        user_agent: Option<UserAgent>,
    ) -> 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 {
@@ -486,7 +476,6 @@ where
                },
                nym_api_urls,
                env!("CARGO_PKG_VERSION").to_string(),
-                user_agent,
            )),
            config::TopologyStructure::GeoAware(group_by) => {
                Box::new(GeoAwareTopologyProvider::new(
@@ -699,7 +688,6 @@ where
            self.custom_topology_provider.take(),
            self.config.debug.topology,
            self.config.get_nym_api_endpoints(),
-            self.user_agent.clone(),
        );

        // needs to be started as the first thing to block if required waiting for the gateway
@@ -815,7 +803,7 @@ where
            client_input: ClientInputStatus::AwaitingProducer {
                client_input: ClientInput {
                    connection_command_sender: client_connection_tx,
-                    input_sender,
+                    input_sender: PollSender::new(input_sender),
                },
            },
            client_output: ClientOutputStatus::AwaitingConsumer {
@@ -1,16 +1,26 @@
 // Copyright 2020-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
-
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
 use nym_sphinx::forwarding::packet::MixPacket;
 use nym_sphinx::params::PacketType;
 use nym_task::connections::TransmissionLane;
+use serde::{Deserialize, Serialize};
+use std::convert::TryInto;
+use tokio_util::{
+    bytes::Buf,
+    bytes::BytesMut,
+    codec::{Decoder, Encoder},
+};

-pub type InputMessageSender = tokio::sync::mpsc::Sender<InputMessage>;
+use crate::error::ClientCoreError;
+
+pub type InputMessageSender = tokio_util::sync::PollSender<InputMessage>;
 pub type InputMessageReceiver = tokio::sync::mpsc::Receiver<InputMessage>;

-#[derive(Debug)]
+const LENGHT_ENCODING_PREFIX_SIZE: usize = 4;
+
+#[derive(Serialize, Deserialize, Debug)]
 pub enum InputMessage {
    /// Fire an already prepared mix packets into the network.
    /// No guarantees are made about it. For example no retransmssion
@@ -64,6 +74,10 @@ pub enum InputMessage {
 }

 impl InputMessage {
+    pub fn simple(data: &[u8], recipient: Recipient) -> Self {
+        InputMessage::new_regular(recipient, data.to_vec(), TransmissionLane::General, None)
+    }
+
    pub fn new_premade(
        msgs: Vec<MixPacket>,
        lane: TransmissionLane,
@@ -197,4 +211,70 @@ impl InputMessage {
            InputMessage::MessageWrapper { message, .. } => message.lane(),
        }
    }
+
+    pub fn serialized_size(&self) -> u64 {
+        bincode::serialized_size(self).expect("failed to get serialized InputMessage size")
+            + LENGHT_ENCODING_PREFIX_SIZE as u64
+    }
+}
+
+// TODO: Tests
+pub struct AdressedInputMessageCodec(pub Recipient);
+
+impl Encoder<&[u8]> for AdressedInputMessageCodec {
+    type Error = ClientCoreError;
+
+    fn encode(&mut self, item: &[u8], buf: &mut BytesMut) -> Result<(), Self::Error> {
+        let mut codec = InputMessageCodec;
+        let input_message = InputMessage::simple(item, self.0.clone());
+        codec.encode(input_message, buf)?;
+        Ok(())
+    }
+}
+
+pub struct InputMessageCodec;
+
+impl Encoder<InputMessage> for InputMessageCodec {
+    type Error = ClientCoreError;
+
+    fn encode(&mut self, item: InputMessage, buf: &mut BytesMut) -> Result<(), Self::Error> {
+        let encoded = bincode::serialize(&item).expect("failed to serialize InputMessage");
+        let encoded_len = encoded.len() as u32;
+        let mut encoded_with_len = encoded_len.to_le_bytes().to_vec();
+        encoded_with_len.extend(encoded);
+        buf.reserve(encoded_with_len.len());
+        buf.extend_from_slice(&encoded_with_len);
+        Ok(())
+    }
+}
+
+impl Decoder for InputMessageCodec {
+    type Item = InputMessage;
+    type Error = ClientCoreError;
+
+    fn decode(&mut self, buf: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
+        if buf.len() < LENGHT_ENCODING_PREFIX_SIZE {
+            return Ok(None);
+        }
+
+        let len = u32::from_le_bytes(
+            buf[0..LENGHT_ENCODING_PREFIX_SIZE]
+                .try_into()
+                .expect("Could not coarce to array"),
+        ) as usize;
+        if buf.len() < len + LENGHT_ENCODING_PREFIX_SIZE {
+            return Ok(None);
+        }
+
+        let decoded = match bincode::deserialize(
+            &buf[LENGHT_ENCODING_PREFIX_SIZE..len + LENGHT_ENCODING_PREFIX_SIZE],
+        ) {
+            Ok(decoded) => decoded,
+            Err(_) => return Ok(None),
+        };
+
+        buf.advance(len + LENGHT_ENCODING_PREFIX_SIZE);
+
+        Ok(Some(decoded))
+    }
 }
@@ -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,6 @@ 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::SliceRandom, Rng};
 use std::{sync::Arc, time::Duration};
 use tungstenite::Message;
@@ -60,16 +59,11 @@ impl<'a> GatewayWithLatency<'a> {
 pub async fn current_gateways<R: Rng>(
    rng: &mut R,
    nym_apis: &[Url],
-    user_agent: Option<UserAgent>,
 ) -> 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 = nym_validator_client::client::NymApiClient::new(nym_api.clone());

    log::debug!("Fetching list of gateways from: {nym_api}");

@@ -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,16 +258,6 @@ 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");
-
-        NymApiClient { nym_api }
-    }
-
    pub fn api_url(&self) -> &Url {
        self.nym_api.current_url()
    }
@@ -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,
@@ -9,12 +9,16 @@ pub use nym_coconut_bandwidth_contract_common::event_attributes::*;
 pub use nym_coconut_dkg_common::event_attributes::*;

 // it seems that currently validators just emit stringified events (which are also returned as part of deliverTx response)
-// as their logs
+// as theirs logs
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Log {
    #[serde(default)]
    // weird thing is that the first msg_index seems to always be undefined on the raw logs
    pub msg_index: usize,
+    // unless I'm missing something obvious, the "log" type in cosmjs is always an empty string
+    // and launchpad cosmos validator was setting it to what essentially is just the raw version of what
+    // we received (and we don't care about launchpad, we, as the time of writing this, work on the stargate)
+    // log: String,
    pub events: Vec<cosmwasm_std::Event>,
 }

@@ -33,13 +37,8 @@ pub fn find_attribute<'a>(
        .find(|attr| attr.key == attribute_key)
 }

-// these two functions were separated so that the internal logic could actually be tested
+// those 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());
-    }
-
    let logs: Vec<Log> = serde_json::from_str(raw).map_err(|_| NyxdError::MalformedLogString)?;
    if logs.len() != logs.iter().unique_by(|log| log.msg_index).count() {
        // this check is only here because I don't yet fully understand raw log string generation and
@@ -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,

@@ -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]
@@ -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
@@ -14,10 +14,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];
@@ -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 }
@@ -31,6 +31,8 @@ pub struct NymContracts {
    pub group_contract_address: Option<String>,
    pub multisig_contract_address: Option<String>,
    pub coconut_dkg_contract_address: Option<String>,
+    pub service_provider_directory_contract_address: Option<String>,
+    pub name_service_contract_address: Option<String>,
 }

 // I wanted to use the simpler `NetworkDetails` name, but there's a clash
@@ -125,6 +127,10 @@ impl NymNetworkDetails {
            .with_group_contract(get_optional_env(var_names::GROUP_CONTRACT_ADDRESS))
            .with_multisig_contract(get_optional_env(var_names::MULTISIG_CONTRACT_ADDRESS))
            .with_coconut_dkg_contract(get_optional_env(var_names::COCONUT_DKG_CONTRACT_ADDRESS))
+            .with_service_provider_directory_contract(get_optional_env(
+                var_names::SERVICE_PROVIDER_DIRECTORY_CONTRACT_ADDRESS,
+            ))
+            .with_name_service_contract(get_optional_env(var_names::NAME_SERVICE_CONTRACT_ADDRESS))
            .with_explorer_api(get_optional_env(var_names::EXPLORER_API))
    }

@@ -153,6 +159,8 @@ impl NymNetworkDetails {
                coconut_dkg_contract_address: parse_optional_str(
                    mainnet::COCONUT_DKG_CONTRACT_ADDRESS,
                ),
+                service_provider_directory_contract_address: None,
+                name_service_contract_address: None,
            },
            explorer_api: parse_optional_str(mainnet::EXPLORER_API),
        }
@@ -258,6 +266,21 @@ impl NymNetworkDetails {
        self
    }

+    #[must_use]
+    pub fn with_service_provider_directory_contract<S: Into<String>>(
+        mut self,
+        contract: Option<S>,
+    ) -> Self {
+        self.contracts.service_provider_directory_contract_address = contract.map(Into::into);
+        self
+    }
+
+    #[must_use]
+    pub fn with_name_service_contract<S: Into<String>>(mut self, contract: Option<S>) -> Self {
+        self.contracts.name_service_contract_address = contract.map(Into::into);
+        self
+    }
+
    #[must_use]
    pub fn with_explorer_api<S: Into<String>>(mut self, endpoint: Option<S>) -> Self {
        self.explorer_api = endpoint.map(Into::into);
@@ -421,13 +444,22 @@ pub fn setup_env<P: AsRef<Path>>(config_env_file: Option<P>) {
    }
 }

+// Name of the event triggered by the eth contract. If the event name is changed,
+// this would also need to be changed; It is currently tested against the json abi
+pub const ETH_EVENT_NAME: &str = "BBCredentialPurchased";
+pub const ETH_BURN_FUNCTION_NAME: &str = "generateBasicBandwidthCredential";
+pub const ETH_ERC20_APPROVE_FUNCTION_NAME: &str = "approve";
+
+// Ethereum constants used for token bridge
 /// How much bandwidth (in bytes) one token can buy
 pub const BYTES_PER_UTOKEN: u64 = 1024;
+
 /// How much bandwidth (in bytes) one freepass provides
 pub const BYTES_PER_FREEPASS: u64 = 1024 * 1024 * 1024; // 1GB
+
 /// Threshold for claiming more bandwidth: 1 MB
 pub const REMAINING_BANDWIDTH_THRESHOLD: i64 = 1024 * 1024;
-/// How many tokens should be burned to buy bandwidth
+/// How many ERC20 tokens should be burned to buy bandwidth
 pub const TOKENS_TO_BURN: u64 = 1;
 /// How many ERC20 utokens should be burned to buy bandwidth
 pub const UTOKENS_TO_BURN: u64 = TOKENS_TO_BURN * 1000000;
@@ -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,10 @@ 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 SERVICE_PROVIDER_DIRECTORY_CONTRACT_ADDRESS: &str =
+    "SERVICE_PROVIDER_DIRECTORY_CONTRACT_ADDRESS";
+pub const NAME_SERVICE_CONTRACT_ADDRESS: &str = "NAME_SERVICE_CONTRACT_ADDRESS";
 pub const NYXD: &str = "NYXD";
 pub const NYM_API: &str = "NYM_API";
 pub const NYXD_WEBSOCKET: &str = "NYXD_WS";
@@ -6,7 +6,6 @@ use nym_credential_storage::models::StorableIssuedCredential;
 use nym_credential_storage::storage::Storage;
 use nym_credentials::coconut::bandwidth::issued::BandwidthCredentialIssuedDataVariant;
 use nym_credentials::IssuedBandwidthCredential;
-use time::OffsetDateTime;
 use tracing::{debug, warn};
 use zeroize::Zeroizing;

@@ -14,7 +13,7 @@ pub async fn import_credential<S>(
    credentials_store: S,
    raw_credential: Vec<u8>,
    credential_version: impl Into<Option<u8>>,
-) -> Result<Option<OffsetDateTime>, NymIdError>
+) -> Result<(), NymIdError>
 where
    S: Storage,
    <S as Storage>::StorageError: Send + Sync + 'static,
@@ -30,10 +29,9 @@ where
        credential.typ()
    );

-    let expiry_date = match credential.variant_data() {
+    match credential.variant_data() {
        BandwidthCredentialIssuedDataVariant::Voucher(voucher_info) => {
-            debug!("with value of {}", voucher_info.value());
-            None
+            debug!("with value of {}", voucher_info.value())
        }
        BandwidthCredentialIssuedDataVariant::FreePass(freepass_info) => {
            debug!("with expiry at {}", freepass_info.expiry_date());
@@ -44,11 +42,9 @@ where
                return Err(NymIdError::ExpiredCredentialImport {
                    expiration: freepass_info.expiry_date(),
                });
-            } else {
-                Some(freepass_info.expiry_date())
            }
        }
-    };
+    }

    // SAFETY:
    // for the epoch to run over u32::MAX, we'd have to advance it for few centuries every block...
@@ -71,5 +67,5 @@ where
        .map_err(|source| NymIdError::StorageError {
            source: Box::new(source),
        })?;
-    Ok(expiry_date)
+    Ok(())
 }
@@ -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"
@@ -12,6 +12,9 @@ log = { workspace = true }
 rand = { workspace = true }
 rand_distr = { workspace = true }
 thiserror = { workspace = true }
+serde = { workspace = true }
+bincode = { workspace = true }
+tokio-util = { workspace = true, features = ["codec"] }

 nym-sphinx-acknowledgements = { path = "acknowledgements" }
 nym-sphinx-addressing = { path = "addressing" }
@@ -30,7 +33,9 @@ nym-topology = { path = "../topology" }

 [dev-dependencies]
 nym-mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" }
-nym-crypto = { path = "../crypto", version = "0.4.0", features = ["asymmetric"] }
+nym-crypto = { path = "../crypto", version = "0.4.0", features = [
+    "asymmetric",
+] }

 # do not include this when compiling into wasm as it somehow when combined together with reqwest, it will require
 # net2 via tokio-util -> tokio -> mio -> net2
@@ -43,5 +48,13 @@ features = ["sync"]

 [features]
 default = ["sphinx"]
-sphinx = ["nym-crypto/sphinx", "nym-sphinx-params/sphinx", "nym-sphinx-types/sphinx"]
-outfox = ["nym-crypto/outfox", "nym-sphinx-params/outfox", "nym-sphinx-types/outfox"]
+sphinx = [
+    "nym-crypto/sphinx",
+    "nym-sphinx-params/sphinx",
+    "nym-sphinx-types/sphinx",
+]
+outfox = [
+    "nym-crypto/outfox",
+    "nym-sphinx-params/outfox",
+    "nym-sphinx-types/outfox",
+]
@@ -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"
@@ -4,6 +4,7 @@
 use crate::{ReplySurb, ReplySurbError};
 use nym_sphinx_addressing::clients::{Recipient, RecipientFormattingError};
 use rand::{CryptoRng, RngCore};
+use serde::{Deserialize, Serialize};
 use std::fmt::{Display, Formatter};
 use std::mem;
 use thiserror::Error;
@@ -24,7 +25,7 @@ pub enum InvalidAnonymousSenderTagRepresentation {
    InvalidLength { received: usize, expected: usize },
 }

-#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)]
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen)]
 pub struct AnonymousSenderTag([u8; SENDER_TAG_SIZE]);

@@ -13,3 +13,4 @@ nym-sphinx-params = { path = "../params" }
 nym-sphinx-types = { path = "../types", features = ["sphinx", "outfox"] }
 nym-outfox = { path = "../../../nym-outfox" }
 thiserror = { workspace = true }
+serde = { workspace = true }
@@ -4,6 +4,10 @@
 use nym_sphinx_addressing::nodes::{NymNodeRoutingAddress, NymNodeRoutingAddressError};
 use nym_sphinx_params::{PacketSize, PacketType};
 use nym_sphinx_types::{NymPacket, NymPacketError};
+use serde::{
+    de::{self, Visitor},
+    Deserialize, Deserializer, Serialize, Serializer,
+};

 use std::fmt::{self, Debug, Formatter};
 use thiserror::Error;
@@ -110,6 +114,39 @@ impl MixPacket {
            .chain(self.packet.to_bytes()?)
            .collect())
    }
+
+    pub fn to_bytes(&self) -> Result<Vec<u8>, MixPacketFormattingError> {
+        Ok(std::iter::once(self.packet_type as u8)
+            .chain(self.next_hop.as_bytes())
+            .chain(self.packet.to_bytes()?)
+            .collect())
+    }
+}
+
+impl Serialize for MixPacket {
+    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        serializer.serialize_bytes(&self.to_bytes().map_err(serde::ser::Error::custom)?)
+    }
+}
+
+struct MixPacketVisitor;
+
+impl<'de> Visitor<'de> for MixPacketVisitor {
+    type Value = MixPacket;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter.write_str("a byte array representing a mix packet")
+    }
+
+    fn visit_bytes<E: de::Error>(self, v: &[u8]) -> Result<Self::Value, E> {
+        MixPacket::try_from_bytes(v).map_err(serde::de::Error::custom)
+    }
+}
+
+impl<'de> Deserialize<'de> for MixPacket {
+    fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        deserializer.deserialize_bytes(MixPacketVisitor)
+    }
 }

 // TODO: test for serialization and errors!
@@ -1,7 +1,10 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

+use std::io;
+
 use crate::message::{NymMessage, NymMessageError, PaddedMessage, PlainMessage};
+use log::debug;
 use nym_crypto::aes::cipher::{KeyIvInit, StreamCipher};
 use nym_crypto::asymmetric::encryption;
 use nym_crypto::shared_key::recompute_shared_key;
@@ -16,10 +19,13 @@ use nym_sphinx_params::{
    PacketEncryptionAlgorithm, PacketHkdfAlgorithm, ReplySurbEncryptionAlgorithm,
    DEFAULT_NUM_MIX_HOPS,
 };
+use serde::{Deserialize, Serialize};
 use thiserror::Error;
+use tokio_util::bytes::{Buf, BytesMut};
+use tokio_util::codec::{Decoder, Encoder};

 // TODO: should this live in this file?
-#[derive(Debug)]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct ReconstructedMessage {
    /// The actual plaintext message that was received.
    pub message: Vec<u8>,
@@ -57,6 +63,62 @@ impl From<PlainMessage> for ReconstructedMessage {
    }
 }

+pub struct ReconstructedMessageCodec;
+const LENGHT_ENCODING_PREFIX_SIZE: usize = 4;
+
+impl Encoder<ReconstructedMessage> for ReconstructedMessageCodec {
+    type Error = MessageRecoveryError;
+
+    fn encode(
+        &mut self,
+        item: ReconstructedMessage,
+        buf: &mut BytesMut,
+    ) -> Result<(), Self::Error> {
+        let encoded = bincode::serialize(&item).expect("failed to serialize ReconstructedMessage");
+        let encoded_len = encoded.len() as u32;
+        let mut encoded_with_len = encoded_len.to_le_bytes().to_vec();
+        encoded_with_len.extend(encoded);
+        buf.reserve(encoded_with_len.len());
+        buf.extend_from_slice(&encoded_with_len);
+        Ok(())
+    }
+}
+
+impl Decoder for ReconstructedMessageCodec {
+    type Item = ReconstructedMessage;
+    type Error = MessageRecoveryError;
+
+    fn decode(&mut self, buf: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
+        if buf.len() < LENGHT_ENCODING_PREFIX_SIZE {
+            return Ok(None);
+        }
+
+        let len = u32::from_le_bytes(
+            buf[0..LENGHT_ENCODING_PREFIX_SIZE]
+                .try_into()
+                .expect("We know that we have at least LENGHT_ENCODING_PREFIX_SIZE bytes in there"),
+        ) as usize;
+
+        if buf.len() < len + LENGHT_ENCODING_PREFIX_SIZE {
+            return Ok(None);
+        }
+
+        let decoded = match bincode::deserialize(
+            &buf[LENGHT_ENCODING_PREFIX_SIZE..len + LENGHT_ENCODING_PREFIX_SIZE],
+        ) {
+            Ok(decoded) => decoded,
+            Err(e) => {
+                debug!("Failed to decode the message - {:?}", e);
+                return Ok(None);
+            }
+        };
+
+        buf.advance(len + LENGHT_ENCODING_PREFIX_SIZE);
+
+        Ok(Some(decoded))
+    }
+}
+
 #[derive(Debug, Error)]
 pub enum MessageRecoveryError {
    #[error("The received message did not contain enough bytes to recover the ephemeral public key. Got {provided}. required: {required}")]
@@ -74,6 +136,9 @@ pub enum MessageRecoveryError {

    #[error("Failed to recover message fragment - {0}")]
    FragmentRecoveryError(#[from] ChunkingError),
+
+    #[error("Failed to recover message fragment - {0}")]
+    MessageRecoveryError(#[from] io::Error),
 }

 pub trait MessageReceiver {
@@ -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 }
@@ -19,6 +19,7 @@ serde = { workspace = true, features = ["derive"] } # for config serialization/d
 tap = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread", "net", "signal"] }
+tokio-util = { workspace = true }
 url = { workspace = true }

 nym-bandwidth-controller = { path = "../../common/bandwidth-controller" }
@@ -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)?;
@@ -7,6 +7,7 @@ use super::{SocksVersion, RESERVED, SOCKS4_VERSION, SOCKS5_VERSION};
 use crate::config;
 use futures::channel::mpsc;
 use futures::task::{Context, Poll};
+use futures::SinkExt;
 use log::*;
 use nym_client_core::client::inbound_messages::{InputMessage, InputMessageSender};
 use nym_service_providers_common::interface::{ProviderInterfaceVersion, RequestVersion};
@@ -3,11 +3,12 @@

 use crate::proxy_runner::MixProxySender;
 use bytes::Bytes;
+use futures::SinkExt;
 use log::{debug, error};
 use nym_socks5_requests::{ConnectionId, SocketData};
 use std::io;

-pub(crate) struct OrderedMessageSender<F, S> {
+pub(crate) struct OrderedMessageSender<F, S: Send + 'static> {
    connection_id: ConnectionId,
    // addresses are provided for better logging
    local_destination_address: String,
@@ -18,7 +19,7 @@ pub(crate) struct OrderedMessageSender<F, S> {
    mix_message_adapter: F,
 }

-impl<F, S> OrderedMessageSender<F, S>
+impl<F, S: Send + 'static> OrderedMessageSender<F, S>
 where
    F: Fn(SocketData) -> S,
 {
@@ -55,7 +56,7 @@ where
        (self.mix_message_adapter)(data)
    }

-    async fn send_message(&self, message: S) {
+    async fn send_message(&mut self, message: S) {
        if self.mixnet_sender.send(message).await.is_err() {
            panic!("BatchRealMessageReceiver has stopped receiving!")
        }
@@ -74,7 +74,7 @@ async fn wait_for_lane(
    }
 }

-pub(super) async fn run_inbound<F, S>(
+pub(super) async fn run_inbound<F, S: Send>(
    mut reader: OwnedReadHalf,
    mut message_sender: OrderedMessageSender<F, S>,
    connection_id: ConnectionId,
@@ -9,6 +9,7 @@ use nym_task::TaskClient;
 use std::fmt::Debug;
 use std::{sync::Arc, time::Duration};
 use tokio::{net::TcpStream, sync::Notify};
+use tokio_util::sync::PollSender;

 mod inbound;
 mod outbound;
@@ -35,7 +36,7 @@ impl From<(Vec<u8>, bool)> for ProxyMessage {
    }
 }

-pub type MixProxySender<S> = tokio::sync::mpsc::Sender<S>;
+pub type MixProxySender<S> = PollSender<S>;
 pub type MixProxyReader<S> = tokio::sync::mpsc::Receiver<S>;

 // TODO: when we finally get to implementing graceful shutdown,
@@ -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(&mut 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,
+        }
+    }
+}
@@ -12,6 +12,7 @@ futures = { workspace = true }
 log = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["macros", "sync"] }
+serde = { workspace = true }

 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio]
 workspace = true
@@ -2,11 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0

 use futures::channel::mpsc;
+use serde::{Deserialize, Serialize};
 use std::collections::HashMap;

 pub type ConnectionId = u64;

-#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq)]
+#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, Serialize, Deserialize)]
 pub enum TransmissionLane {
    General,
    // we need to treat surb-related requests and responses at higher priority
@@ -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 }
@@ -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)
    }
 }

@@ -122,7 +122,7 @@ pub async fn setup_gateway_from_api(
    nym_apis: &[Url],
 ) -> Result<InitialisationResult, WasmCoreError> {
    let mut rng = thread_rng();
-    let gateways = current_gateways(&mut rng, nym_apis, None).await?;
+    let gateways = current_gateways(&mut rng, nym_apis).await?;
    setup_gateway_wasm(client_store, force_tls, chosen_gateway, &gateways).await
 }

@@ -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"] }
@@ -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 ^*/
@@ -47,6 +44,8 @@ select {
  font-size: 16px;
 }

+
+
 footer {
  font-size: 0.8em;
  text-align: center;
@@ -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>
@@ -46,4 +46,4 @@ If you have successfully completed KYC on Synaps earlier and provided your Nym w

 Using the Nym network is free for now, but user fees will be introduced in the future and those will be paid in NYM tokens, so set them aside! And until then, you can contribute to running our decentralized infrastructure and earn mix mining rewards by setting up Nym mix nodes and bonding your tokens to them. You don't need to run nodes to contribute to the security and performance of the Nym network though. You can pledge your trust in someone else's node by delegating your NYM tokens to it, and receive a share of their mix mining rewards.

-You can find out more about how staking works in [this](https://www.youtube.com/watch?v=PcNGcTwlm0I) video from our Chief Scientist Claudia Diaz and if you need help setting up your mix node, choosing one to delegate your tokens to, or anything else, our community is there to help on [Discord](https://discord.gg/FaTJb8q8) and [Telegram](https://t.me/nymchan). 
+You can find out more about how staking works in [this](https://www.youtube.com/watch?v=PcNGcTwlm0I) video from our Chief Scientist Claudia Diaz and if you need help setting up your mix node, choosing one to delegate your tokens to, or anything else, our community is there to help on [Discord](https://discord.gg/nym) and [Telegram](https://t.me/nymchan). 
@@ -39,5 +39,5 @@ Follow this [video](https://youtu.be/quj8H2qeOwY?t=97) to see the steps on Teleg

 **Now your Telegram runs over NymConnect.**

-NymConnect is currently available for several applications and service providers. Support for more apps is on the way. For any bug reports or feedback please reach out to us on Telegram or our [Discord](http://discord.gg/FaTJb8q8) server.
+NymConnect is currently available for several applications and service providers. Support for more apps is on the way. For any bug reports or feedback please reach out to us on Telegram or our [Discord](http://discord.gg/nym) server.

@@ -1,5 +1,6 @@
 # mdbook files
 book/
+theme/

 # Compiled assets
 .sass-cache
@@ -11,7 +11,7 @@ Since these docs autogenerate command output and import docs from binaries in `t
 Changes merged to `master` will be autodeployed to the production site.

 ### Contributing a new translation
-To contribute tranlsations in a new language, please get in touch via [Matrix](https://matrix.to/#/#general:nymtech.chat) or [Discord](https://discord.gg/FaTJb8q8).
+To contribute tranlsations in a new language, please get in touch via [Matrix](https://matrix.to/#/#general:nymtech.chat) or [Discord](discord.gg/nym).

 ### Variables
 There are some variables that are shared across the entire docs site, such as the current latest software version.
@@ -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,18 +14,18 @@ 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
+pagetoc                   = 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 = true

 [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]
@@ -50,56 +50,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"]
-git-repository-url = "https://github.com/nymtech/nym/documentation/"
+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>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
durch	1b33d8e2c9	Address part of PR comments	2024-06-25 15:01:18 +02:00
durch	2fe282d774	fmt	2024-06-19 13:11:18 +02:00
durch	abfd121d4e	Log decoding error	2024-06-19 13:09:34 +02:00
durch	46ebb7039a	Cleanup prints	2024-06-18 19:54:39 +02:00
durch	bc28cc70b7	Update IPR sig	2024-06-18 11:58:03 +02:00
durch	36e8468b73	WASM changes	2024-06-18 10:30:56 +02:00
durch	cefb217c25	AsyncWrite	2024-06-18 10:30:56 +02:00
durch	4adcd32ebf	Use tokio AsyncRead	2024-06-18 10:30:56 +02:00
durch	7820b816b5	ReconstructedMessageCodec	2024-06-18 10:30:56 +02:00
Drazen	f54cee786c	InputMessageCodec, Serde for MixPacket	2024-06-18 10:30:56 +02:00
Drazen	edd9fef468	Use Sink always	2024-06-18 10:30:56 +02:00
Drazen	eed87ff4c9	Switch to PollSender	2024-06-18 10:30:56 +02:00
durch	575056ac67	AsyncRead for MixnetClient	2024-06-18 10:30:56 +02:00
durch	34e9822f1d	serde for ReconstructedMessage	2024-06-18 10:30:56 +02:00